openstack/openstack-ansible-os_cinder
Code Issues Proposed changes

Merge "Define keystone region name."

Browse Source
This commit is contained in:
Jenkins 2016-07-25 15:20:52 +00:00 committed by Gerrit Code Review
commit 967076ecf0
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/cinder.conf.j2
View File

@ -61,6 +61,8 @@ quota_backup_gigabytes = {{ cinder_quota_backup_gigabytes }}
nova_catalog_info = {{ cinder_nova_catalog_info }} nova_catalog_info = {{ cinder_nova_catalog_info }}
nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }} nova_catalog_admin_info = {{ cinder_nova_catalog_admin_info }}
os_region_name = {{ cinder_service_region }}
## Glance ## Glance
glance_api_servers = {{ cinder_glance_api_servers }} glance_api_servers = {{ cinder_glance_api_servers }}
glance_num_retries = 0 glance_num_retries = 0
@ -140,6 +142,7 @@ user_domain_id = {{ cinder_service_user_domain_id }}
project_name = {{ cinder_service_project_name }} project_name = {{ cinder_service_project_name }}
username = {{ cinder_service_user_name }} username = {{ cinder_service_user_name }}
password = {{ cinder_service_password }} password = {{ cinder_service_password }}
region_name = {{ keystone_service_region }}
memcached_servers = {{ memcached_servers }} memcached_servers = {{ memcached_servers }}

1
tests/test-vars.yml
View File

@ -48,6 +48,7 @@ keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000"
keystone_service_internaluri_insecure: false keystone_service_internaluri_insecure: false
keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3" keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
keystone_service_password: "secrete" keystone_service_password: "secrete"
keystone_service_region: RegionOne
keystone_venv_tag: "testing" keystone_venv_tag: "testing"
memcached_encryption_key: "secrete" memcached_encryption_key: "secrete"
memcached_servers: 127.0.0.1 memcached_servers: 127.0.0.1