diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-31 16:55:01 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-04-01 08:54:12 +0000 |
| commit | 6d4bb954c856b168ef4925e2529b16425156050e (patch) | |
| tree | 1295dc0b44f0f74432d1e85c1b119616193f54e5 /openstack-keystone.configure | |
| parent | 8811234dad5261dfb88ffecdb30c1f2ebf677268 (diff) | |
| download | definitions-6d4bb954c856b168ef4925e2529b16425156050e.tar.gz | |
08 patch comments
Diffstat (limited to 'openstack-keystone.configure')
| -rw-r--r-- | openstack-keystone.configure | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/openstack-keystone.configure b/openstack-keystone.configure index c8a7e9ff..fb37b3ac 100644 --- a/openstack-keystone.configure +++ b/openstack-keystone.configure @@ -36,6 +36,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 Keystone options defined, do nothing. exit 0 @@ -49,13 +50,28 @@ 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 Keystone were defined, but not all. exit 1 fi + +python <<'EOF' +import socket +import sys +import os + +try: + socket.inet_pton(socket.AF_INET, os.environ['MANAGEMENT_INTERFACE_IP_ADDRESS']) +except: + print "Error: MANAGEMENT_INTERFACE_IP_ADDRESS is not a valid IP" + sys.exit(1) +EOF + + ########################################################################## -# Generate config variable shell snippet +# Generate configuration file ########################################################################## OPENSTACK_DATA="$ROOT/etc/openstack" @@ -69,11 +85,12 @@ keystone_configuration={ 'KEYSTONE_ADMIN_PASSWORD': os.environ['KEYSTONE_ADMIN_PASSWORD'], 'KEYSTONE_DB_USER': os.environ['KEYSTONE_DB_USER'], 'KEYSTONE_DB_PASSWORD': os.environ['KEYSTONE_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(keystone_configuration, sys.stdout, default_flow_style=False) |