From d62eab2521529f16633f3b1611ab8639f5a16d5d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 12 Mar 2015 16:05:11 +0000 Subject: Minimize glance conf variables --- openstack/usr/share/openstack/glance.yml | 10 +++++----- openstack/usr/share/openstack/glance/glance-api.conf | 6 +++--- openstack/usr/share/openstack/glance/glance-registry.conf | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'openstack') diff --git a/openstack/usr/share/openstack/glance.yml b/openstack/usr/share/openstack/glance.yml index 83d73428..618af958 100644 --- a/openstack/usr/share/openstack/glance.yml +++ b/openstack/usr/share/openstack/glance.yml @@ -38,16 +38,16 @@ name=glance type=image description="Openstack Image Service" - publicurl={{ GLANCE_PUBLIC_URL }} - internalurl={{ GLANCE_INTERNAL_URL }} - adminurl={{ GLANCE_ADMIN_URL }} + publicurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 + internalurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 + adminurl=http://{{ CONTROLLER_HOST_ADDRESS }}:9292 region='RegionOne' token={{ KEYSTONE_TEMPORARY_ADMIN_TOKEN }} - - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} password={{ GLANCE_DB_PASSWORD }} + - postgresql_user: name={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} password={{ GLANCE_DB_PASSWORD }} sudo: yes sudo_user: glance - - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST }} + - postgresql_db: name=glance owner={{ GLANCE_DB_USER }} login_host={{ CONTROLLER_HOST_ADDRESS }} sudo: yes sudo_user: glance 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 = -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 = -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 }} -- cgit v1.2.1