Merge branch 'master' of /git/ansible

roles/bodhi2/base/templates/staging.ini.j2

@@ -355,6 +355,14 @@ openid.provider = https://id.stg.fedoraproject.org/openid/
 openid.url = https://id.stg.fedoraproject.org/
 openid_template = {username}.id.fedoraproject.org
 
+# CORS allowed origins for cornice services
+# This can be wide-open.  read-only, we don't care as much about.
+cors_origins_ro = *
+# This should be more locked down to avoid cross-site request forgery.
+cors_origins_rw = bodhi.stg.fedoraproject.org
+cors_connect_src = https://*.fedoraproject.org/ wss://hub.fedoraproject.org:9939/
+
+
 ##
 ## Pyramid settings
 ##

roles/cloud_compute/tasks/main.yml

@@ -19,9 +19,6 @@
 - meta: flush_handlers
 
 # this two step can be done in one, but Ansible will then always show the action as changed
-- name: download RDO release package
-  get_url: url=https://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-4.noarch.rpm dest=/root/
-- yum: state=present name=/root/rdo-release-icehouse-4.noarch.rpm
 - yum: state=present pkg=openstack-nova-common
 - name: create logical volume for ephemeral storage
   lvol: vg=vg_guests lv=nova size=100%FREE