From 5d5e2a3d8bc95969e4e4cbe4d765ac3bf4aa949a Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Sun, 3 Apr 2016 12:58:41 +0100 Subject: [PATCH] Switch defaults/tests to use master branch Change-Id: I7e7cf1e514ad717b7f64d11e466932a54708f480 --- extras/repo_designate.yml | 2 +- tests/test-vars.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extras/repo_designate.yml b/extras/repo_designate.yml index 274cc10..1eec753 100644 --- a/extras/repo_designate.yml +++ b/extras/repo_designate.yml @@ -1,4 +1,4 @@ ## Designate service designate_git_repo: https://git.openstack.org/openstack/designate -designate_git_install_branch: 6622e9493668f5bf3178bfc0a7c6fe53d1e2d89e # HEAD of "stable/liberty" as of 07.03.2016 +designate_git_install_branch: master designate_git_dest: "/opt/designate_{{ designate_git_install_branch | replace('/', '_') }}" diff --git a/tests/test-vars.yml b/tests/test-vars.yml index 7c6c081..414b2d4 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -26,8 +26,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: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 +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" designate_venv_tag: "testing" designate_developer_mode: true -designate_git_install_branch: stable/mitaka -designate_requirements_git_install_branch: f8cf7eba898a1424549c730d6692ec4e9573c0ed # HEAD of "master" as of 23.03.2016 +designate_git_install_branch: master +designate_requirements_git_install_branch: master designate_service_password: "secrete" designate_galera_address: 10.100.100.101 designate_galera_database: designate