x
/
fuel-ccp-glance
Code Issues Proposed changes

Add "address" to all services 

Replace all <some_service> occurences with
{{ address('<some_service>') }}

Change-Id: Ife7e62245cc76a52557df145cd141b53fad50a7a
Depends-on: I163857fa0c671e21725d7276540f5fbba09619d2
Depends-on: Ibbb12e016570936468effbbd0648d4690abe3aab
This commit is contained in:
Andrey 2016-09-20 12:36:02 +00:00 committed by Andrey Pavlov
parent f24dbea4bc
commit 39fce942e3
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
service/files/glance-api.conf.j2
View File

@ -14,19 +14,19 @@ registry_host = glance-registry
cinder_catalog_info = volume:cinder:internalURL cinder_catalog_info = volume:cinder:internalURL
[database] [database]
connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@mariadb/{{ glance_db_name }} connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
max_retries = -1 max_retries = -1
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://keystone:{{ keystone_public_port }} auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
auth_url = http://keystone:{{ keystone_admin_port }} auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = {{ openstack_project_name }} project_name = {{ openstack_project_name }}
username = {{ glance_user }} username = {{ glance_user }}
password = {{ glance_password }} password = {{ glance_password }}
memcached_servers = memcached:{{ memcached_port }} memcached_servers = {{ address('memcached') }}:{{ memcached_port }}
[paste_deploy] [paste_deploy]

8
service/files/glance-registry.conf.j2
View File

@ -13,19 +13,19 @@ registry_host = glance-registry
cinder_catalog_info = volume:cinder:internalURL cinder_catalog_info = volume:cinder:internalURL
[database] [database]
connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@mariadb/{{ glance_db_name }} connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{{ address('mariadb') }}/{{ glance_db_name }}
max_retries = -1 max_retries = -1
[keystone_authtoken] [keystone_authtoken]
auth_uri = http://keystone:{{ keystone_public_port }} auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
auth_url = http://keystone:{{ keystone_admin_port }} auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
auth_type = password auth_type = password
project_domain_id = default project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service project_name = service
username = {{ glance_user }} username = {{ glance_user }}
password = {{ glance_password }} password = {{ glance_password }}
memcached_servers = memcached:{{ memcached_port }} memcached_servers = {{ address('memcached') }}:{{ memcached_port }}
[paste_deploy] [paste_deploy]
flavor = keystone flavor = keystone

6
service/glance-api.yaml
View File

@ -43,17 +43,17 @@ service:
dependencies: dependencies:
- glance-service-create - glance-service-create
type: single type: single
command: openstack endpoint create --region RegionOne image public http://glance-api:{{ glance_api_port }} command: openstack endpoint create --region RegionOne image public http://{{ address('glance-api') }}:{{ glance_api_port }}
- name: glance-internal-endpoint-create - name: glance-internal-endpoint-create
dependencies: dependencies:
- glance-service-create - glance-service-create
type: single type: single
command: openstack endpoint create --region RegionOne image internal http://glance-api:{{ glance_api_port }} command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance_api_port }}
- name: glance-admin-endpoint-create - name: glance-admin-endpoint-create
dependencies: dependencies:
- glance-service-create - glance-service-create
type: single type: single
command: openstack endpoint create --region RegionOne image admin http://glance-api:{{ glance_api_port }} command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance_api_port }}
daemon: daemon:
files: files:
- glance-api - glance-api