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-01-22 12:46:30 +0000 |
| commit | 52d479690a1ec8a546ccc64fcef48ad9938f61f0 (patch) | |
| tree | be6f8152940ed7565f0a923282d64c7deafdc7d1 /openstack | |
| parent | 4bfee8b106cfb0d8151c3322227b36282a0dbf30 (diff) | |
| download | definitions-52d479690a1ec8a546ccc64fcef48ad9938f61f0.tar.gz | |
FIXUPME: Replace authentication parameters in glance and neutron
Diffstat (limited to 'openstack')
| -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 |
3 files changed, 5 insertions, 10 deletions
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## |