openstack
/
openstack-ansible-os_glance
Code Issues Proposed changes

Merge "Define keystone region name."

This commit is contained in:
Jenkins 2016-07-25 15:19:34 +00:00 committed by Gerrit Code Review
parent ef55a3436d bc860bf5a4
commit b82e9ea3d2
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/glance-api.conf.j2
View File

@ -50,6 +50,7 @@ user_domain_id = {{ glance_service_user_domain_id }}
project_name = {{ glance_service_project_name }}
username = {{ glance_service_user_name }}
password = {{ glance_service_password }}
region_name = {{ keystone_service_region }}
memcached_servers = {{ memcached_servers }}

1
templates/glance-registry.conf.j2
View File

@ -31,6 +31,7 @@ user_domain_id = {{ glance_service_user_domain_id }}
project_name = {{ glance_service_project_name }}
username = {{ glance_service_user_name }}
password = {{ glance_service_password }}
region_name = {{ keystone_service_region }}
memcached_servers = {{ memcached_servers }}

3
tests/test-vars.yml
View File

@ -54,9 +54,10 @@ keystone_service_internaluri: "http://{{ internal_lb_vip_address }}:5000"
keystone_service_internaluri_insecure: false
keystone_service_internalurl: "{{ keystone_service_internaluri }}/v3"
keystone_service_password: "secrete"
keystone_service_region: RegionOne
keystone_venv_tag: "testing"
memcached_encryption_key: "secrete"
memcached_servers: 127.0.0.1
openrc_os_auth_url: "http://127.0.0.1:5000/v3"
openrc_os_domain_name: "Default"
openrc_os_password: "{{ keystone_auth_admin_password }}"
openrc_os_password: "{{ keystone_auth_admin_password }}"