Update roles & vars for stable/pike

Change-Id: I1483889e01b994a77e6d101cdf0f435fae457ae9
This commit is contained in:
Andy McCrae 2017-08-30 15:55:44 +01:00
parent 58855a0e63
commit cff34226fe
3 changed files with 17 additions and 17 deletions

View File

@ -26,9 +26,9 @@ tacker_package_state: "latest"
tacker_pip_package_state: "latest" tacker_pip_package_state: "latest"
tacker_git_repo: https://git.openstack.org/openstack/tacker tacker_git_repo: https://git.openstack.org/openstack/tacker
tacker_git_install_branch: master tacker_git_install_branch: stable/pike
tacker_requirements_git_repo: https://git.openstack.org/openstack/requirements tacker_requirements_git_repo: https://git.openstack.org/openstack/requirements
tacker_requirements_git_install_branch: master tacker_requirements_git_install_branch: stable/pike
tacker_developer_mode: false tacker_developer_mode: false
tacker_developer_constraints: tacker_developer_constraints:
- "git+{{ tacker_git_repo }}@{{ tacker_git_install_branch }}#egg=tacker" - "git+{{ tacker_git_repo }}@{{ tacker_git_install_branch }}#egg=tacker"
@ -136,7 +136,7 @@ heat_service_adminurl: "{{ tacker_service_publicuri_proto }}://{{ external_lb_vi
#NOTE: these default should be updated approprietly #NOTE: these default should be updated approprietly
# tacker-horizon uses this # tacker-horizon uses this
tackerclient_git_url: https://github.com/openstack/python-tackerclient.git tackerclient_git_url: https://github.com/openstack/python-tackerclient.git
tacker_git_branch: "master" tacker_git_branch: "stable/pike"
# tacker horizon vars # tacker horizon vars
tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}" tacker_horizon_venv: "/openstack/venvs/horizon-{{ openstack_release }}"

View File

@ -1,44 +1,44 @@
- name: apt_package_pinning - name: apt_package_pinning
src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
scm: git scm: git
version: master version: stable/pike
- name: pip_install - name: pip_install
src: https://git.openstack.org/openstack/openstack-ansible-pip_install src: https://git.openstack.org/openstack/openstack-ansible-pip_install
scm: git scm: git
version: master version: stable/pike
- name: memcached_server - name: memcached_server
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
scm: git scm: git
version: master version: stable/pike
- name: openstack_hosts - name: openstack_hosts
src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
scm: git scm: git
version: master version: stable/pike
- name: lxc_hosts - name: lxc_hosts
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
scm: git scm: git
version: master version: stable/pike
- name: lxc_container_create - name: lxc_container_create
src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
scm: git scm: git
version: master version: stable/pike
- name: galera_client - name: galera_client
src: https://git.openstack.org/openstack/openstack-ansible-galera_client src: https://git.openstack.org/openstack/openstack-ansible-galera_client
scm: git scm: git
version: master version: stable/pike
- name: galera_server - name: galera_server
src: https://git.openstack.org/openstack/openstack-ansible-galera_server src: https://git.openstack.org/openstack/openstack-ansible-galera_server
scm: git scm: git
version: master version: stable/pike
- name: rabbitmq_server - name: rabbitmq_server
src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server
scm: git scm: git
version: master version: stable/pike
- name: os_keystone - name: os_keystone
src: https://git.openstack.org/openstack/openstack-ansible-os_keystone src: https://git.openstack.org/openstack/openstack-ansible-os_keystone
scm: git scm: git
version: master version: stable/pike
- name: openstack_openrc - name: openstack_openrc
src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
scm: git scm: git
version: master version: stable/pike

View File

@ -7,7 +7,7 @@ envlist = docs,linters,functional
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = install_command =
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands = commands =
@ -55,7 +55,7 @@ commands =
[testenv:tests_clone] [testenv:tests_clone]
commands = commands =
bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \ bash -c "if [ ! -d "{toxinidir}/tests/common" ]; then \
git clone https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \ git clone https://git.openstack.org/openstack/openstack-ansible-tests -b stable/pike {toxinidir}/tests/common; \
fi" fi"
@ -82,7 +82,7 @@ commands =
[testenv:ansible] [testenv:ansible]
deps = deps =
{[testenv]deps} {[testenv]deps}
-rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt -rhttp://git.openstack.org/cgit/openstack/openstack-ansible-tests/plain/test-ansible-deps.txt?h=stable/pike
commands = commands =
{[testenv:tests_clone]commands} {[testenv:tests_clone]commands}
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"