x
/
fuel-ccp-glance
Code Issues Proposed changes

Convert all Keystone-specific configs to nested 

Depends-On: I393f8898657543a8c4536159e9a6d773b13cefbf
Change-Id: I8efa0b559f12f71e9d7b806b1500b5fcaec3dcf9
This commit is contained in:
Yuriy Taraday 2016-10-03 11:21:23 +03:00
parent 6a95c87a58
commit b555ae7f1d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,12 +18,12 @@ connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = {{ openstack_project_name }}
project_name = {{ openstack.project_name }}
username = {{ glance_user }}
password = {{ glance_password }}
memcached_servers = {{ address('memcached') }}:{{ memcached_port }}

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

@ -17,8 +17,8 @@ connection = mysql+pymysql://{{ glance_db_username }}:{{ glance_db_password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone_public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone_admin_port }}
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}
auth_type = password
project_domain_id = default
user_domain_id = default

2
service/glance-api.yaml
View File

@ -33,7 +33,7 @@ service:
dependencies:
- glance-user-create
type: single
command: openstack role add --project {{ openstack_project_name }} --user {{ glance_user }} admin
command: openstack role add --project {{ openstack.project_name }} --user {{ glance_user }} admin
- name: glance-service-create
dependencies:
- keystone