Switch defaults/tests to use master branch

Change-Id: I10c1b94122c023f70c3818732cd79fbfaf5f0ad5
This commit is contained in:
Jesse Pretorius 2016-04-15 12:39:36 +01:00 committed by Jesse Pretorius (odyssey4me)
parent e3d39b7228
commit 9b268e9ffc
2 changed files with 6 additions and 6 deletions

View File

@ -22,9 +22,9 @@ debug: False
# to build an environment directly from a git source without the presence
# of an OpenStack-Ansible repo_server.
ironic_git_repo: https://git.openstack.org/openstack/ironic
ironic_git_install_branch: stable/mitaka
ironic_git_install_branch: master
ironic_requirements_git_repo: https://git.openstack.org/openstack/requirements
ironic_requirements_git_install_branch: stable/mitaka
ironic_requirements_git_install_branch: master
ironic_developer_mode: false
ironic_developer_constraints:
- "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic"

View File

@ -24,8 +24,8 @@ memcached_servers: 127.0.0.1
memcached_encryption_key: "secrete"
keystone_venv_tag: "testing"
keystone_developer_mode: true
keystone_git_install_branch: stable/mitaka
keystone_requirements_git_install_branch: stable/mitaka
keystone_git_install_branch: master
keystone_requirements_git_install_branch: master
keystone_service_password: "secrete"
keystone_galera_address: 10.100.100.101
keystone_galera_database: keystone
@ -54,8 +54,8 @@ openrc_os_password: "{{ keystone_auth_admin_password }}"
openrc_os_domain_name: "Default"
ironic_venv_tag: "testing"
ironic_developer_mode: true
ironic_git_install_branch: stable/mitaka
ironic_requirements_git_install_branch: stable/mitaka
ironic_git_install_branch: master
ironic_requirements_git_install_branch: master
ironic_service_publicuri: "http://10.100.100.102:6385"
ironic_service_adminuri: "{{ ironic_service_publicuri }}"
ironic_service_internaluri: "{{ ironic_service_publicuri }}"