Merge "Adjust urls with new 'address' functionality"
This commit is contained in:
commit
f0fcada181
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue