x
/
fuel-ccp-glance
Code Issues Proposed changes

Adjust urls with new 'address' functionality 

* explisit scheme replaced with with_scheme flag
* ports provided to address function

Change-Id: I961bee5545e86dd4956a22106ca92bc0d0033bdf
This commit is contained in:
Andrey Pavlov 2016-11-16 11:03:25 +00:00
parent 4165bc7522
commit c2fd1873e5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,15 +22,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = {{ openstack.project_name }}
username = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
memcached_servers = {{ address('memcached', memcached.port) }}
[paste_deploy]

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

@ -19,15 +19,15 @@ connection = mysql+pymysql://{{ glance.db.username }}:{{ glance.db.password }}@{
max_retries = -1
[keystone_authtoken]
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ glance.user }}
password = {{ glance.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
memcached_servers = {{ address('memcached', memcached.port) }}
[paste_deploy]
flavor = keystone

2
service/files/glance-swift-store.conf.j2
View File

@ -1,6 +1,6 @@
[swift]
auth_version = 3
auth_address = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
auth_address = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
user = {{ openstack.project_name }}:{{ glance.user }}
key = {{ glance.password }}
project_domain_id = default

4
service/glance-api.yaml
View File

@ -50,12 +50,12 @@ service:
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image internal http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
command: openstack endpoint create --region RegionOne image internal {{ address('glance-api', glance.api_port, with_scheme=True) }}
- name: glance-admin-endpoint-create
dependencies:
- glance-service-create
type: single
command: openstack endpoint create --region RegionOne image admin http://{{ address('glance-api') }}:{{ glance.api_port.cont }}
command: openstack endpoint create --region RegionOne image admin {{ address('glance-api', glance.api_port, with_scheme=True) }}
daemon:
files:
- glance-api