openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Switch defaults/tests to use master branch

Browse Source 
Change-Id: I43d68b2953846b6c220d4fadca55ac34824fbcd6
This commit is contained in:
Jesse Pretorius 2016-04-03 12:59:43 +01:00
parent 703402addb
commit d10448c3b6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -24,9 +24,9 @@ verbose: True
cache_timeout: 600
nova_git_repo: https://git.openstack.org/openstack/nova
nova_git_install_branch: stable/mitaka
nova_git_install_branch: master
nova_requirements_git_repo: https://git.openstack.org/openstack/requirements
nova_requirements_git_install_branch: stable/mitaka
nova_requirements_git_install_branch: master
nova_developer_mode: false
nova_developer_constraints:
- "git+{{ nova_git_repo }}@{{ nova_git_install_branch }}#egg=nova"

16
tests/test-vars.yml
View File

@ -23,13 +23,13 @@ glance_container_mysql_password: "SuperSecrete"
glance_developer_mode: true
glance_galera_address: 10.100.100.101
glance_galera_database: glance
glance_git_install_branch: stable/mitaka
glance_git_install_branch: master
glance_host: "{{ internal_lb_vip_address }}"
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_service_port: 9292
glance_venv_tag: "testing"
@ -41,14 +41,14 @@ keystone_container_mysql_password: "SuperSecrete"
keystone_developer_mode: true
keystone_galera_address: 10.100.100.101
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.101
keystone_rabbitmq_use_ssl: false
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"
@ -64,7 +64,7 @@ neutron_container_mysql_password: SuperSecrete
neutron_developer_mode: true
neutron_galera_address: 10.100.100.101
neutron_galera_database: neutron
neutron_git_install_branch: stable/mitaka
neutron_git_install_branch: master
neutron_ha_vrrp_auth_password: secrete
neutron_management_address: "{{ internal_lb_vip_address }}"
neutron_provider_networks:
@ -73,7 +73,7 @@ neutron_provider_networks:
neutron_rabbitmq_password: secrete
neutron_rabbitmq_userid: neutron
neutron_rabbitmq_vhost: /neutron
neutron_requirements_git_install_branch: stable/mitaka
neutron_requirements_git_install_branch: master
neutron_service_adminurl: http://{{ internal_lb_vip_address }}:9696
neutron_service_password: "secrete"
neutron_service_project_name: service
@ -86,7 +86,7 @@ nova_container_mysql_password: "SuperSecrete"
nova_developer_mode: true
nova_galera_address: 10.100.100.101
nova_galera_database: nova
nova_git_install_branch: stable/mitaka
nova_git_install_branch: master
nova_keystone_auth_plugin: password
nova_management_address: "10.100.100.1"
nova_metadata_port: 8775
@ -96,7 +96,7 @@ nova_novncproxy_vncserver_proxyclient_address: localhost
nova_rabbitmq_password: "secrete"
nova_rabbitmq_userid: nova
nova_rabbitmq_vhost: /nova
nova_requirements_git_install_branch: stable/mitaka
nova_requirements_git_install_branch: master
nova_service_adminurl: "http://{{ internal_lb_vip_address }}:8774"
nova_service_password: "secrete"
nova_service_project_domain_id: default