From f82b2acaab7fba2f7e71ce6597d5bfd0fc4d428e Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 25 Mar 2016 00:06:51 +0000 Subject: [PATCH] Switch defaults/tests to use stable/mitaka branch Change-Id: I2fb25f03c6ccd00db06a895fde422399b2be9108 --- defaults/main.yml | 4 ++-- tests/test.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b3f447a8..f90c1624 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -24,9 +24,9 @@ verbose: True cache_timeout: 600 nova_git_repo: https://git.openstack.org/openstack/nova -nova_git_install_branch: master +nova_git_install_branch: stable/mitaka nova_requirements_git_repo: https://git.openstack.org/openstack/requirements -nova_requirements_git_install_branch: master +nova_requirements_git_install_branch: stable/mitaka nova_developer_mode: false nova_developer_constraints: - "git+{{ nova_git_repo }}@{{ nova_git_install_branch }}#egg=nova" diff --git a/tests/test.yml b/tests/test.yml index bb3c96b0..f22091af 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -201,7 +201,7 @@ keystone_venv_tag: "testing" keystone_developer_mode: true keystone_git_install_branch: stable/mitaka - keystone_requirements_git_install_branch: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 + keystone_requirements_git_install_branch: stable/mitaka keystone_auth_admin_token: "SuperSecreteTestToken" keystone_auth_admin_password: "SuperSecretePassword" keystone_service_password: "secrete" @@ -298,7 +298,7 @@ nova_venv_tag: "testing" nova_developer_mode: true nova_git_install_branch: stable/mitaka - nova_requirements_git_install_branch: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 + nova_requirements_git_install_branch: stable/mitaka nova_service_password: "secrete" nova_container_mysql_password: "SuperSecrete" nova_api_container_mysql_password: "SuperSecrete"