Switch defaults/tests to use master branch

Change-Id: I4b728bdc30b646ef7b2381095f8537dbe1f70fdd
This commit is contained in:
Jesse Pretorius 2016-04-03 12:58:51 +01:00
parent a42fa2656c
commit 101d2aead8

View File

@ -20,12 +20,12 @@ glance_container_mysql_password: "SuperSecrete"
glance_developer_mode: true
glance_galera_address: 10.100.100.2
glance_galera_database: glance
glance_git_install_branch: stable/mitaka
glance_git_install_branch: master
glance_profiler_hmac_key: "secrete"
glance_rabbitmq_password: "secrete"
glance_rabbitmq_userid: glance
glance_rabbitmq_vhost: /glance
glance_requirements_git_install_branch: stable/mitaka
glance_requirements_git_install_branch: master
glance_service_password: "secrete"
glance_venv_tag: "testing"
internal_lb_vip_address: 10.100.100.3
@ -36,14 +36,14 @@ keystone_container_mysql_password: "SuperSecrete"
keystone_developer_mode: true
keystone_galera_address: 10.100.100.2
keystone_galera_database: keystone
keystone_git_install_branch: stable/mitaka
keystone_git_install_branch: master
keystone_rabbitmq_password: "secrete"
keystone_rabbitmq_port: 5671
keystone_rabbitmq_servers: 10.100.100.2
keystone_rabbitmq_use_ssl: true
keystone_rabbitmq_userid: keystone
keystone_rabbitmq_vhost: /keystone
keystone_requirements_git_install_branch: stable/mitaka
keystone_requirements_git_install_branch: master
keystone_service_adminuri: "http://{{ internal_lb_vip_address }}:35357"
keystone_service_adminuri_insecure: false
keystone_service_adminurl: "{{ keystone_service_adminuri }}/v3"