diff options
Diffstat (limited to 'openstack')
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-api-paste.ini (renamed from openstack/etc/glance/glance-api-paste.ini) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-api.conf (renamed from openstack/etc/glance/glance-api.conf) | 18 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-cache.conf (renamed from openstack/etc/glance/glance-cache.conf) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-registry-paste.ini (renamed from openstack/etc/glance/glance-registry-paste.ini) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-registry.conf (renamed from openstack/etc/glance/glance-registry.conf) | 10 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/glance-scrubber.conf (renamed from openstack/etc/glance/glance-scrubber.conf) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/logging.conf (renamed from openstack/etc/glance/logging.conf) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/policy.json (renamed from openstack/etc/glance/policy.json) | 0 | ||||
-rw-r--r-- | openstack/usr/share/openstack/glance/schema-image.json (renamed from openstack/etc/glance/schema-image.json) | 0 |
9 files changed, 14 insertions, 14 deletions
diff --git a/openstack/etc/glance/glance-api-paste.ini b/openstack/usr/share/openstack/glance/glance-api-paste.ini index e4baa269..e4baa269 100644 --- a/openstack/etc/glance/glance-api-paste.ini +++ b/openstack/usr/share/openstack/glance/glance-api-paste.ini diff --git a/openstack/etc/glance/glance-api.conf b/openstack/usr/share/openstack/glance/glance-api.conf index c30ce62f..038ab877 100644 --- a/openstack/etc/glance/glance-api.conf +++ b/openstack/usr/share/openstack/glance/glance-api.conf @@ -238,11 +238,11 @@ rpc_backend=rabbit # Configuration options if sending notifications via rabbitmq (these are # the defaults) -rabbit_host = ##RABBITMQ_HOST## -rabbit_port = ##RABBITMQ_PORT## +rabbit_host = {{ RABBITMQ_HOST }} +rabbit_port = {{ RABBITMQ_PORT }} rabbit_use_ssl = false -rabbit_userid = ##RABBITMQ_USER## -rabbit_password = ##RABBITMQ_PASSWORD## +rabbit_userid = {{ RABBITMQ_USER }} +rabbit_password = {{ RABBITMQ_PASSWORD }} rabbit_virtual_host = / rabbit_notification_exchange = glance rabbit_notification_topic = notifications @@ -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##@onenode/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,11 +667,11 @@ connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance #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## +admin_user = {{ GLANCE_SERVICE_USER }} +admin_password = {{ GLANCE_SERVICE_PASSWORD }} [paste_deploy] # Name of the paste configuration file that defines the available pipelines diff --git a/openstack/etc/glance/glance-cache.conf b/openstack/usr/share/openstack/glance/glance-cache.conf index a4453353..a4453353 100644 --- a/openstack/etc/glance/glance-cache.conf +++ b/openstack/usr/share/openstack/glance/glance-cache.conf diff --git a/openstack/etc/glance/glance-registry-paste.ini b/openstack/usr/share/openstack/glance/glance-registry-paste.ini index ab8c2856..ab8c2856 100644 --- a/openstack/etc/glance/glance-registry-paste.ini +++ b/openstack/usr/share/openstack/glance/glance-registry-paste.ini diff --git a/openstack/etc/glance/glance-registry.conf b/openstack/usr/share/openstack/glance/glance-registry.conf index fbfe7c8d..a759385d 100644 --- a/openstack/etc/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##@onenode/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,11 +180,11 @@ connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance #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## +admin_user = {{ GLANCE_SERVICE_USER }} +admin_password = {{ GLANCE_SERVICE_PASSWORD }} [paste_deploy] # Name of the paste configuration file that defines the available pipelines diff --git a/openstack/etc/glance/glance-scrubber.conf b/openstack/usr/share/openstack/glance/glance-scrubber.conf index 5c5e8d4c..5c5e8d4c 100644 --- a/openstack/etc/glance/glance-scrubber.conf +++ b/openstack/usr/share/openstack/glance/glance-scrubber.conf diff --git a/openstack/etc/glance/logging.conf b/openstack/usr/share/openstack/glance/logging.conf index 8de2ffd1..8de2ffd1 100644 --- a/openstack/etc/glance/logging.conf +++ b/openstack/usr/share/openstack/glance/logging.conf diff --git a/openstack/etc/glance/policy.json b/openstack/usr/share/openstack/glance/policy.json index 8b7e6871..8b7e6871 100644 --- a/openstack/etc/glance/policy.json +++ b/openstack/usr/share/openstack/glance/policy.json diff --git a/openstack/etc/glance/schema-image.json b/openstack/usr/share/openstack/glance/schema-image.json index 5aafd6b3..5aafd6b3 100644 --- a/openstack/etc/glance/schema-image.json +++ b/openstack/usr/share/openstack/glance/schema-image.json |