diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-01-14 15:06:58 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-02-11 18:30:34 +0000 |
commit | 60db4380355641491b558b6ceef16aeb6d118a07 (patch) | |
tree | 3b7b427e4ae46b803696670e332969be3c703f89 | |
parent | 581e99269ef49c034bdd7d7c83c756184b680504 (diff) | |
download | definitions-60db4380355641491b558b6ceef16aeb6d118a07.tar.gz |
FIXUPME: Replace authentication parameters in glance and neutron
-rw-r--r-- | clusters/openstack-cluster.morph | 1 | ||||
-rw-r--r-- | openstack/etc/glance/glance-api.conf | 5 | ||||
-rw-r--r-- | openstack/etc/glance/glance-registry.conf | 5 | ||||
-rw-r--r-- | openstack/etc/neutron/neutron.conf | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph index df2bea61..efd9c4c4 100644 --- a/clusters/openstack-cluster.morph +++ b/clusters/openstack-cluster.morph @@ -22,6 +22,7 @@ systems: KEYSTONE_PUBLIC_URL: http:\/\/localhost:5000\/v2.0 KEYSTONE_INTERNAL_URL: http:\/\/localhost:5000\/v2.0 KEYSTONE_ADMIN_URL: http:\/\/localhost:35357\/v2.0 + IDENTITY_URI: http:\/\/localhost:35357 OPENSTACK_AUTH_HOST: localhost OPENSTACK_AUTH_PORT: 35357 GLANCE_SERVICE_USER: glance diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf index 15b88532..bec62075 100644 --- a/openstack/etc/glance/glance-api.conf +++ b/openstack/etc/glance/glance-api.conf @@ -667,9 +667,8 @@ connection=sqlite:////var/lib/glance/glance.sqlite #db_max_retries = 20 [keystone_authtoken] -auth_host = ##OPENSTACK_AUTH_HOST## -auth_port = 35357 -auth_protocol = http +auth_uri = ##KEYSTONE_PUBLIC_URL## +identity_uri = ##IDENTITY_URI## admin_tenant_name = service admin_user = ##GLANCE_SERVICE_USER## admin_password = ##GLANCE_SERVICE_PASSWORD## diff --git a/openstack/etc/glance/glance-registry.conf b/openstack/etc/glance/glance-registry.conf index 0c41f3f3..988c2e79 100644 --- a/openstack/etc/glance/glance-registry.conf +++ b/openstack/etc/glance/glance-registry.conf @@ -180,9 +180,8 @@ connection=sqlite:////var/lib/glance/glance.sqlite #db_max_retries = 20 [keystone_authtoken] -auth_host = ##OPENSTACK_AUTH_HOST## -auth_port = 35357 -auth_protocol = http +auth_uri = ##KEYSTONE_PUBLIC_URL## +identity_uri = ##IDENTITY_URI## admin_tenant_name = service admin_user = ##GLANCE_SERVICE_USER## admin_password = ##GLANCE_SERVICE_PASSWORD## diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf index ba10b760..03764625 100644 --- a/openstack/etc/neutron/neutron.conf +++ b/openstack/etc/neutron/neutron.conf @@ -558,10 +558,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf [keystone_authtoken] auth_uri = ##KEYSTONE_PUBLIC_URL## -identity_uri = http://localhost:35357 -#auth_host = ##OPENSTACK_AUTH_HOST## -#auth_port = ##OPENSTACK_AUTH_PORT## -#auth_protocol = http +identity_uri = ##IDENTITY_URI## admin_tenant_name = service admin_user = ##NEUTRON_SERVICE_USER## admin_password = ##NEUTRON_SERVICE_PASSWORD## |