Merge "Do not use glance servers variable"

This commit is contained in:
Zuul 2018-07-12 15:43:48 +00:00 committed by Gerrit Code Review
commit 831465d1ee
1 changed files with 3 additions and 3 deletions

View File

@ -175,11 +175,10 @@ glance_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
glance_service_password: "secrete"
glance_venv_tag: "testing"
glance_host: "{{ test_glance_host }}"
glance_api_servers: "http://{{ test_glance_host }}:9292"
# Nova specific settings
nova_api_container_mysql_password: "SuperSecrete"
nova_glance_api_servers: "{{ glance_api_servers }}"
nova_glance_api_servers: "http://{{ test_glance_host }}:9292"
nova_container_mysql_password: "SuperSecrete"
nova_developer_mode: true
nova_git_install_branch: "{{ test_branch }}"
@ -291,7 +290,7 @@ cinder_ceph_client: cinder
cinder_container_mysql_password: "SuperSecrete"
cinder_developer_mode: true
cinder_git_install_branch: "{{ test_branch }}"
cinder_glance_api_servers: "{{ glance_api_servers }}"
cinder_glance_api_servers: "http://{{ test_glance_host }}:9292"
cinder_profiler_hmac_key: "secrete"
cinder_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
cinder_oslomsg_rpc_userid: cinder
@ -448,6 +447,7 @@ ironic_rabbitmq_port: "{{ rabbitmq_port }}"
ironic_standalone: False
ironic_swift_temp_url_secret_key: secrete
ironic_keystone_auth_plugin: password
ironic_glance_api_servers: "http://{{ test_glance_host }}:9292"
# Sahara vars
sahara_venv_tag: "testing"