From 0a6737c82bfa3cc098dcb8525dde52197b9cc610 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Sun, 3 Apr 2016 12:59:25 +0100 Subject: [PATCH] Switch defaults/tests to use master branch Change-Id: I52bc3145f006d0b48b69d08c12f619f281a3bde5 --- README.rst | 2 +- defaults/main.yml | 4 ++-- tests/test-vars.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 0e6727bd..4eaa4651 100644 --- a/README.rst +++ b/README.rst @@ -54,7 +54,7 @@ Example Playbook keystone_galera_database: keystone keystone_venv_tag: "testing" keystone_developer_mode: true - keystone_git_install_branch: stable/mitaka + keystone_git_install_branch: master keystone_auth_admin_password: "SuperSecretePassword" keystone_service_password: "secrete" keystone_rabbitmq_password: "secrete" diff --git a/defaults/main.yml b/defaults/main.yml index 67efe7bb..2702132b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,9 +21,9 @@ verbose: True # to build an environment directly from a git source without the presence # of an OpenStack-Ansible repo_server. keystone_git_repo: https://git.openstack.org/openstack/keystone -keystone_git_install_branch: stable/mitaka +keystone_git_install_branch: master keystone_requirements_git_repo: https://git.openstack.org/openstack/requirements -keystone_requirements_git_install_branch: stable/mitaka +keystone_requirements_git_install_branch: master keystone_developer_mode: false keystone_developer_constraints: - "git+{{ keystone_git_repo }}@{{ keystone_git_install_branch }}#egg=keystone" diff --git a/tests/test-vars.yml b/tests/test-vars.yml index d34122fc..e8e40e79 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -23,14 +23,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_adminurl: "{{ keystone_service_adminuri }}/v3" keystone_service_password: "secrete"