summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-23 16:41:28 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-03-25 10:23:49 +0000
commitbfdbc2f08b4d4e99d85e3cd00dfac3285c898cef (patch)
treeda4f49a9b00c83009680dfa670f093474d93bb9a
parent9e0f98d3bd443709432c3955c761edb600be905d (diff)
downloaddefinitions-bfdbc2f08b4d4e99d85e3cd00dfac3285c898cef.tar.gz
neutron.configure NOVA_SERVICE_USER and PASSWORD needed
-rw-r--r--openstack-neutron.configure6
1 files changed, 6 insertions, 0 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure
index 67b56376..ac98e0cb 100644
--- a/openstack-neutron.configure
+++ b/openstack-neutron.configure
@@ -43,6 +43,8 @@ if [ -z "$NEUTRON_SERVICE_USER" -a \
-z "$NEUTRON_DB_USER" -a \
-z "$NEUTRON_DB_PASSWORD" -a \
-z "$METADATA_PROXY_SHARED_SECRET" -a \
+ -z "$NOVA_SERVICE_USER" -a \
+ -z "$NOVA_SERVICE_PASSWORD" -a \
-z "$RABBITMQ_HOST" -a \
-z "$RABBITMQ_USER" -a \
-z "$RABBITMQ_PASSWORD" -a \
@@ -58,6 +60,8 @@ if [ -z "$NEUTRON_SERVICE_USER" -o \
-z "$NEUTRON_DB_USER" -o \
-z "$NEUTRON_DB_PASSWORD" -o \
-z "$METADATA_PROXY_SHARED_SECRET" -o \
+ -z "$NOVA_SERVICE_USER" -o \
+ -z "$NOVA_SERVICE_PASSWORD" -o \
-z "$RABBITMQ_HOST" -o \
-z "$RABBITMQ_USER" -o \
-z "$RABBITMQ_PASSWORD" -o \
@@ -84,6 +88,8 @@ nova_configuration={
'NEUTRON_DB_USER': os.environ['NEUTRON_DB_USER'],
'NEUTRON_DB_PASSWORD': os.environ['NEUTRON_DB_PASSWORD'],
'METADATA_PROXY_SHARED_SECRET': os.environ['METADATA_PROXY_SHARED_SECRET'],
+ 'NOVA_SERVICE_USER': os.environ['NOVA_SERVICE_USER'],
+ 'NOVA_SERVICE_PASSWORD': os.environ['NOVA_SERVICE_PASSWORD'],
'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'],
'RABBITMQ_USER': os.environ['RABBITMQ_USER'],
'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'],