diff options
| author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2014-11-26 18:01:36 +0000 |
|---|---|---|
| committer | Richard Ipsum <richardipsum@fastmail.co.uk> | 2014-11-27 18:12:15 +0000 |
| commit | f4e9f03a3054062b05614df2fff19fc2e429c8af (patch) | |
| tree | dd7f9748cdc2af53cdb742d3989ecff0c2ed1dce | |
| parent | d4b7a2d87e8b589705571f2ed739962a24c17298 (diff) | |
| download | definitions-f4e9f03a3054062b05614df2fff19fc2e429c8af.tar.gz | |
FIXUPME: Move the authentication port and host to keystone configure
| -rw-r--r-- | openstack-glance.configure | 1 | ||||
| -rw-r--r-- | openstack-keystone.configure | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/openstack-glance.configure b/openstack-glance.configure index 5ef72651..7a84c5e3 100644 --- a/openstack-glance.configure +++ b/openstack-glance.configure @@ -30,7 +30,6 @@ s/##GLANCE_SERVICE_PASSWORD##/$GLANCE_SERVICE_PASSWORD/g s/##GLANCE_PUBLIC_URL##/$GLANCE_PUBLIC_URL/g s/##GLANCE_INTERNAL_URL##/$GLANCE_INTERNAL_URL/g s/##GLANCE_ADMIN_URL##/$GLANCE_ADMIN_URL/g -s/##OPENSTACK_AUTH_HOST##/$OPENSTACK_AUTH_HOST/g EOF sed -f "$ROOT"/etc/openstack-glance-setup.sed -i \ diff --git a/openstack-keystone.configure b/openstack-keystone.configure index 445c041e..2c59e45e 100644 --- a/openstack-keystone.configure +++ b/openstack-keystone.configure @@ -29,10 +29,14 @@ s/##KEYSTONE_TEMPORARY_ADMIN_PASSWORD##/$KEYSTONE_TEMPORARY_ADMIN_PASSWORD/g s/##KEYSTONE_PUBLIC_URL##/$KEYSTONE_PUBLIC_URL/g s/##KEYSTONE_INTERNAL_URL##/$KEYSTONE_INTERNAL_URL/g s/##KEYSTONE_ADMIN_URL##/$KEYSTONE_ADMIN_URL/g +s/##OPENSTACK_AUTH_HOST##/$OPENSTACK_AUTH_HOST/g +s/##OPENSTACK_AUTH_PORT##/$OPENSTACK_AUTH_PORT/g EOF sed -f "$ROOT"/etc/openstack-keystone-setup.sed -i \ "$ROOT"/etc/keystone/keystone.conf \ + "$ROOT"/etc/glance/glance-api.conf \ + "$ROOT"/etc/glance/glance-registry.conf \ "$ROOT"/usr/share/openstack/openstack-keystone-setup ########################################################################## |