diff options
author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-01 09:16:32 +0000 |
---|---|---|
committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2015-04-10 20:17:45 +0100 |
commit | 5fe9988195c5e0043ac0e138604816157a58d32f (patch) | |
tree | 25ed06ff91c92123bbe6e5af1185f85305cf6145 /openstack-glance.configure | |
parent | 1f87b1fe2fa926ac4cfa106bea5617ddd1e10a3f (diff) | |
download | definitions-5fe9988195c5e0043ac0e138604816157a58d32f.tar.gz |
12 patch comments
Diffstat (limited to 'openstack-glance.configure')
-rw-r--r-- | openstack-glance.configure | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/openstack-glance.configure b/openstack-glance.configure index 7051f156..c75949eb 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -37,6 +37,7 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \ -z "$RABBITMQ_PORT" -a \ -z "$RABBITMQ_USER" -a \ -z "$RABBITMQ_PASSWORD" -a \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \ -z "$CONTROLLER_HOST_ADDRESS" ]; then # No Glance options defined, do nothing. exit 0 @@ -51,13 +52,14 @@ if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \ -z "$RABBITMQ_PORT" -o \ -z "$RABBITMQ_USER" -o \ -z "$RABBITMQ_PASSWORD" -o \ + -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -o \ -z "$CONTROLLER_HOST_ADDRESS" ]; then echo Some options required for Glance were defined, but not all. exit 1 fi ########################################################################## -# Generate config variable shell snippet +# Generate configuration file ########################################################################## OPENSTACK_DATA="$ROOT/etc/openstack" @@ -72,11 +74,12 @@ glance_configuration={ 'GLANCE_SERVICE_USER': os.environ['GLANCE_SERVICE_USER'], 'GLANCE_DB_USER': os.environ['GLANCE_DB_USER'], 'GLANCE_DB_PASSWORD': os.environ['GLANCE_DB_PASSWORD'], - 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'], 'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'], 'RABBITMQ_PORT': os.environ['RABBITMQ_PORT'], 'RABBITMQ_USER': os.environ['RABBITMQ_USER'], 'RABBITMQ_PASSWORD': os.environ['RABBITMQ_PASSWORD'], + 'MANAGEMENT_INTERFACE_IP_ADDRESS': os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS'], + 'CONTROLLER_HOST_ADDRESS': os.environ['CONTROLLER_HOST_ADDRESS'], } yaml.dump(glance_configuration, sys.stdout, default_flow_style=False) |