x
/
fuel-ccp-cinder
Code Issues Proposed changes

Ports configuration refactoring 

Ports configuration has been changed:

before:

  port: 123:3333

after:

  port:
    cont: 123
    node: 3333

Change-Id: I97c91ce500718ececae68f060cf5a87b44d272f3
Depends-On: I54ab8dd02fc88b821a1f0d05c08f98b618730150
This commit is contained in:
Andrey Pavlov 2016-10-26 13:15:07 +00:00
parent c995ae3e46
commit bdde470ba7
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
service/cinder-api.yaml
View File

@ -44,17 +44,17 @@ service:
dependencies:
- cinder-service-create
type: single
command: openstack endpoint create --region RegionOne volumev2 public http://{{ address('cinder-api') }}:{{ cinder.api_port }}/v2/%\(tenant_id\)s
command: openstack endpoint create --region RegionOne volumev2 public http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
- name: cinder-internal-endpoint-create
dependencies:
- cinder-service-create
type: single
command: openstack endpoint create --region RegionOne volumev2 internal http://{{ address('cinder-api') }}:{{ cinder.api_port }}/v2/%\(tenant_id\)s
command: openstack endpoint create --region RegionOne volumev2 internal http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/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 }}/v2/%\(tenant_id\)s
command: openstack endpoint create --region RegionOne volumev2 admin http://{{ address('cinder-api') }}:{{ cinder.api_port.cont }}/v2/%\(tenant_id\)s
daemon:
command: cinder-api --config-file /etc/cinder/cinder.conf
files:

10
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 }}
glance_api_servers = {{ address('glance-api') }}:{{ glance.api_port.cont }}
glance_num_retries = 3
glance_api_version = 2
@ -15,7 +15,7 @@ os_region_name = RegionOne
enabled_backends = {{ cinder.enabled_backends }}
osapi_volume_listen = {{ network_topology["private"]["address"] }}
osapi_volume_listen_port = {{ cinder.api_port }}
osapi_volume_listen_port = {{ cinder.api_port.cont }}
api_paste_config = /etc/cinder/api-paste.ini
nova_catalog_info = compute:nova:internalURL
@ -30,15 +30,15 @@ max_retries = -1
[keystone_authtoken]
auth_version = v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port }}/v3
auth_uri = http://{{ address('keystone') }}:{{ keystone.public_port.cont }}/v3
auth_url = http://{{ address('keystone') }}:{{ keystone.admin_port.cont }}/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 }}
memcached_servers = {{ address('memcached') }}:{{ memcached.port.cont }}
[oslo_concurrency]
lock_path = /var/lib/cinder/tmp

3
service/files/defaults.yaml
View File

@ -1,6 +1,7 @@
configs:
cinder:
api_port: 8776
api_port:
cont: 8776
debug: false
username: "cinder"
password: "password"