From afa10407e6a9d0cb318c40abef049c90f0f37e61 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 26 Feb 2015 13:51:51 +0000 Subject: Fixes?? --- openstack-rabbitmq.configure | 5 ----- openstack/usr/share/openstack/glance.yml | 4 ++-- systems/openstack-server.morph | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/openstack-rabbitmq.configure b/openstack-rabbitmq.configure index 40c37698..289770a0 100644 --- a/openstack-rabbitmq.configure +++ b/openstack-rabbitmq.configure @@ -31,11 +31,6 @@ s/##RABBITMQ_PASSWORD##/$RABBITMQ_PASSWORD/g EOF sed -f "$ROOT"/etc/openstack-rabbitmq-setup.sed -i \ - "$ROOT"/etc/keystone/keystone.conf \ - "$ROOT"/etc/nova/nova.conf \ - "$ROOT"/etc/cinder/cinder.conf \ - "$ROOT"/etc/neutron/neutron.conf \ - "$ROOT"/etc/glance/glance-api.conf \ "$ROOT"/usr/share/openstack/openstack-rabbitmq-setup ########################################################################## diff --git a/openstack/usr/share/openstack/glance.yml b/openstack/usr/share/openstack/glance.yml index 9533e564..3eb7c45c 100644 --- a/openstack/usr/share/openstack/glance.yml +++ b/openstack/usr/share/openstack/glance.yml @@ -42,10 +42,10 @@ region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - postgresql_user: name={{ GLANCE_DB_USER }} + - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} sudo: yes sudo_user: glance - - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} + - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} sudo: yes sudo_user: glance diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index fe4c229c..5f97c17c 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -62,6 +62,7 @@ configuration-extensions: - openstack-glance - openstack-nova - openstack-cinder +- openstack-rabbitmq - openvswitch - postgres - apache-httpd-server -- cgit v1.2.1