From 214370e6a56856b78352449c420c6a4d8ace4b56 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 12 Mar 2015 15:34:13 +0000
Subject: Minimize keystone conf variables

---
 openstack-keystone.configure                       | 24 +++-------------------
 openstack/usr/share/openstack/keystone.yml         | 16 +++++++--------
 .../usr/share/openstack/keystone/keystone.conf     |  2 +-
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/openstack-keystone.configure b/openstack-keystone.configure
index 8cdc8e64..c8a7e9ff 100644
--- a/openstack-keystone.configure
+++ b/openstack-keystone.configure
@@ -30,38 +30,26 @@ ln -s "/etc/systemd/system/openstack-keystone-setup.service" \
 
 if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -a \
      -z "$KEYSTONE_ADMIN_PASSWORD" -a \
-     -z "$KEYSTONE_PUBLIC_URL" -a \
-     -z "$KEYSTONE_INTERNAL_URL" -a \
-     -z "$KEYSTONE_ADMIN_URL" -a \
-     -z "$OPENSTACK_AUTH_HOST" -a \
-     -z "$OPENSTACK_AUTH_PORT" -a \
-     -z "$IDENTITY_URI" -a \
      -z "$KEYSTONE_DB_USER" -a \
      -z "$KEYSTONE_DB_PASSWORD" -a \
      -z "$RABBITMQ_HOST" -a \
      -z "$RABBITMQ_PORT" -a \
      -z "$RABBITMQ_USER" -a \
      -z "$RABBITMQ_PASSWORD" -a \
-     -z "$CONTROLLER_HOST" ]; then
+     -z "$CONTROLLER_HOST_ADDRESS" ]; then
      # No Keystone options defined, do nothing.
     exit 0
 fi
 
 if [ -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" -o \
      -z "$KEYSTONE_ADMIN_PASSWORD" -o \
-     -z "$KEYSTONE_PUBLIC_URL" -o \
-     -z "$KEYSTONE_INTERNAL_URL" -o \
-     -z "$KEYSTONE_ADMIN_URL" -o \
-     -z "$OPENSTACK_AUTH_HOST" -o \
-     -z "$OPENSTACK_AUTH_PORT" -o \
-     -z "$IDENTITY_URI" -a \
      -z "$KEYSTONE_DB_USER" -o \
      -z "$KEYSTONE_DB_PASSWORD" -o \
      -z "$RABBITMQ_HOST" -o \
      -z "$RABBITMQ_PORT" -o \
      -z "$RABBITMQ_USER" -o \
      -z "$RABBITMQ_PASSWORD" -o \
-     -z "$CONTROLLER_HOST" ]; then
+     -z "$CONTROLLER_HOST_ADDRESS" ]; then
     echo Some options required for Keystone were defined, but not all.
     exit 1
 fi
@@ -79,15 +67,9 @@ import os, sys, yaml
 keystone_configuration={
     'KEYSTONE_TEMPORARY_ADMIN_TOKEN': os.environ['KEYSTONE_TEMPORARY_ADMIN_TOKEN'],
     'KEYSTONE_ADMIN_PASSWORD': os.environ['KEYSTONE_ADMIN_PASSWORD'],
-    'KEYSTONE_PUBLIC_URL': os.environ['KEYSTONE_PUBLIC_URL'],
-    'KEYSTONE_INTERNAL_URL': os.environ['KEYSTONE_INTERNAL_URL'],
-    'KEYSTONE_ADMIN_URL': os.environ['KEYSTONE_ADMIN_URL'],
-    'OPENSTACK_AUTH_HOST': os.environ['OPENSTACK_AUTH_HOST'],
-    'OPENSTACK_AUTH_PORT': os.environ['OPENSTACK_AUTH_PORT'],
-    'IDENTITY_URI': os.environ['IDENTITY_URI'],
     'KEYSTONE_DB_USER': os.environ['KEYSTONE_DB_USER'],
     'KEYSTONE_DB_PASSWORD': os.environ['KEYSTONE_DB_PASSWORD'],
-    'CONTROLLER_HOST': os.environ['CONTROLLER_HOST'],
+    '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'],
diff --git a/openstack/usr/share/openstack/keystone.yml b/openstack/usr/share/openstack/keystone.yml
index 76d33adc..1a21f2df 100644
--- a/openstack/usr/share/openstack/keystone.yml
+++ b/openstack/usr/share/openstack/keystone.yml
@@ -89,35 +89,35 @@
         tenant=admin
         tenant_description="Admin Tenant"
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-        endpoint={{ KEYSTONE_ADMIN_URL }}
+        endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
 
   - keystone_user: >
         user=admin
         tenant=admin
         password={{ KEYSTONE_ADMIN_PASSWORD }}
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-        endpoint={{ KEYSTONE_ADMIN_URL }}
+        endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
 
   - keystone_user: >
         role=admin
         user=admin
         tenant=admin
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-        endpoint={{ KEYSTONE_ADMIN_URL }}
+        endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
 
   - keystone_user: >
         tenant=service
         tenant_description="Service Tenant"
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-        endpoint={{ KEYSTONE_ADMIN_URL }}
+        endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
 
   - keystone_service: >
         name=keystone
         type=identity
         description="Keystone Identity Service"
-        publicurl={{ KEYSTONE_PUBLIC_URL }}
-        internalurl={{ KEYSTONE_INTERNAL_URL }}
-        adminurl={{ KEYSTONE_ADMIN_URL }}
+        publicurl=http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
+        internalurl=http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0
+        adminurl=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
         region='RegionOne'
         token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }}
-        endpoint={{ KEYSTONE_ADMIN_URL }}
+        endpoint=http://{{ CONTROLLER_HOST_ADDRESS }}:35357/v2.0
diff --git a/openstack/usr/share/openstack/keystone/keystone.conf b/openstack/usr/share/openstack/keystone/keystone.conf
index c35ecc15..154a6a18 100644
--- a/openstack/usr/share/openstack/keystone/keystone.conf
+++ b/openstack/usr/share/openstack/keystone/keystone.conf
@@ -628,7 +628,7 @@ rpc_backend=rabbit
 # Deprecated group/name - [DATABASE]/sql_connection
 # Deprecated group/name - [sql]/connection
 #connection=<None>
-connection=postgresql://{{ KEYSTONE_DB_USER }}:{{ KEYSTONE_DB_PASSWORD }}@{{ CONTROLLER_HOST }}/keystone
+connection=postgresql://{{ KEYSTONE_DB_USER }}:{{ KEYSTONE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/keystone
 
 # The SQLAlchemy connection string to use to connect to the
 # slave database. (string value)
-- 
cgit v1.2.1