x
/
fuel-ccp-cinder
Code Issues Proposed changes

Use "address" func when it's possible 

Change-Id: I2e75e1a3269d7fe07b1583434934ebfe531d3708
This commit is contained in:
Andrey Pavlov 2016-12-05 09:09:04 +00:00
parent fef6e0a097
commit 098e19677c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
service/cinder-api.yaml
View File

@ -50,12 +50,12 @@ service:
dependencies:
- cinder-service-create
type: single
command: openstack endpoint create --region RegionOne volumev2 internal http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
command: openstack endpoint create --region RegionOne volumev2 internal {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/%\(tenant_id\)s
- name: cinder-admin-endpoint-create
dependencies:
- cinder-service-create
type: single
command: openstack endpoint create --region RegionOne volumev2 admin http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
command: openstack endpoint create --region RegionOne volumev2 admin {{ address('cinder-api', cinder.api_port, with_scheme=True) }}/v2/%\(tenant_id\)s
daemon:
command: cinder-api --config-file /etc/cinder/cinder.conf
files:

8
service/files/cinder.conf.j2
View File

@ -5,7 +5,7 @@ use_stderr = True
volume_name_template = volume-%s
glance_api_servers = {{ address('glance-api') }}:{{ glance.api_port.cont }}
glance_api_servers = {{ address('glance-api', glance.api_port) }}
glance_num_retries = 3
glance_api_version = 2
@ -30,15 +30,15 @@ max_retries = -1
[keystone_authtoken]
auth_version = v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/v3
auth_uri = {{ address('keystone', keystone.public_port, with_scheme=True) }}/v3
auth_url = {{ address('keystone', keystone.admin_port, with_scheme=True) }}/v3
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ cinder.username }}
password = {{ cinder.password }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
memcached_servers = {{ address('memcached', memcached.port) }}
[oslo_concurrency]
lock_path = /var/lib/cinder/tmp