diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-12 16:05:11 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2015-03-16 17:33:42 +0000 |
| commit | d62eab2521529f16633f3b1611ab8639f5a16d5d (patch) | |
| tree | ef9636a58072d71bd27b8f87e8d4d923bbdda482 /openstack/usr/share/openstack/glance | |
| parent | 214370e6a56856b78352449c420c6a4d8ace4b56 (diff) | |
| download | definitions-d62eab2521529f16633f3b1611ab8639f5a16d5d.tar.gz | |
Minimize glance conf variables
Diffstat (limited to 'openstack/usr/share/openstack/glance')
| -rw-r--r-- | openstack/usr/share/openstack/glance/glance-api.conf | 6 | ||||
| -rw-r--r-- | openstack/usr/share/openstack/glance/glance-registry.conf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/openstack/usr/share/openstack/glance/glance-api.conf b/openstack/usr/share/openstack/glance/glance-api.conf index 197dca8c..038ab877 100644 --- a/openstack/usr/share/openstack/glance/glance-api.conf +++ b/openstack/usr/share/openstack/glance/glance-api.conf @@ -586,7 +586,7 @@ image_cache_dir = /var/lib/glance/image-cache/ # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST }}/glance +connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To @@ -667,8 +667,8 @@ connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROL #db_max_retries = 20 [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ GLANCE_SERVICE_USER }} admin_password = {{ GLANCE_SERVICE_PASSWORD }} diff --git a/openstack/usr/share/openstack/glance/glance-registry.conf b/openstack/usr/share/openstack/glance/glance-registry.conf index 6679c278..a759385d 100644 --- a/openstack/usr/share/openstack/glance/glance-registry.conf +++ b/openstack/usr/share/openstack/glance/glance-registry.conf @@ -99,7 +99,7 @@ limit_param_default = 25 # Deprecated group/name - [DATABASE]/sql_connection # Deprecated group/name - [sql]/connection #connection = <None> -connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST}}/glance +connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROLLER_HOST_ADDRESS }}/glance # The SQL mode to be used for MySQL sessions. This option, # including the default, overrides any server-set SQL mode. To @@ -180,8 +180,8 @@ connection=postgresql://{{ GLANCE_DB_USER }}:{{ GLANCE_DB_PASSWORD }}@{{ CONTROL #db_max_retries = 20 [keystone_authtoken] -auth_uri = {{ KEYSTONE_PUBLIC_URL }} -identity_uri = {{ IDENTITY_URI }} +auth_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:5000/v2.0 +identity_uri = http://{{ CONTROLLER_HOST_ADDRESS }}:35357 admin_tenant_name = service admin_user = {{ GLANCE_SERVICE_USER }} admin_password = {{ GLANCE_SERVICE_PASSWORD }} |