openstack
/
openstack-ansible-os_sahara
Code Issues Proposed changes

Update repo for stable/ocata 

Change-Id: Ie8450aff657d93aeb4df91ab1dbf9abdddfe8b9a
This commit is contained in:
Jesse Pretorius 2017-02-08 10:48:04 +00:00 committed by Jesse Pretorius (odyssey4me)
parent c25b7d950c
commit e051fe7493
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -20,7 +20,7 @@ sahara_package_state: "latest"
sahara_pip_package_state: "latest" sahara_pip_package_state: "latest"
sahara_git_repo: https://git.openstack.org/openstack/sahara sahara_git_repo: https://git.openstack.org/openstack/sahara
sahara_git_install_branch: master sahara_git_install_branch: stable/ocata
sahara_developer_mode: false sahara_developer_mode: false
sahara_developer_constraints: sahara_developer_constraints:
- "git+{{ sahara_git_repo }}@{{ sahara_git_install_branch }}#egg=sahara" - "git+{{ sahara_git_repo }}@{{ sahara_git_install_branch }}#egg=sahara"

26
tests/ansible-role-requirements.yml
View File

@ -1,52 +1,52 @@
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- 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: origin/stable/ocata
- name: os_nova - name: os_nova
src: https://git.openstack.org/openstack/openstack-ansible-os_nova src: https://git.openstack.org/openstack/openstack-ansible-os_nova
scm: git scm: git
version: master version: origin/stable/ocata
- name: os_tempest - name: os_tempest
src: https://git.openstack.org/openstack/openstack-ansible-os_tempest src: https://git.openstack.org/openstack/openstack-ansible-os_tempest
scm: git scm: git
version: master version: origin/stable/ocata

4
tox.ini
View File

@ -56,7 +56,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 -b stable/ocata https://git.openstack.org/openstack/openstack-ansible-tests {toxinidir}/tests/common; \
fi" fi"
@ -83,7 +83,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/ocata
[testenv:ansible-syntax] [testenv:ansible-syntax]