Merge "Bump ansible-base and OpenStack collections" into stable/victoria

This commit is contained in:
Zuul 2021-02-04 12:30:29 +00:00 committed by Gerrit Code Review
commit 29e61f8d1e
2 changed files with 4 additions and 5 deletions

View File

@ -1,8 +1,7 @@
collections: collections:
# NOTE(noonedeadpunk): needs galaxy.yml to be able to pull from git - name: https://opendev.org/openstack/ansible-collections-openstack
- name: openstack.cloud version: 1.2.1
version: 1.2.0 type: git
source: https://galaxy.ansible.com
- name: https://github.com/ansible-collections/community.general - name: https://github.com/ansible-collections/community.general
version: 1.2.0 version: 1.2.0
type: git type: git

View File

@ -22,7 +22,7 @@ set -e -u -x
export HTTP_PROXY=${HTTP_PROXY:-""} export HTTP_PROXY=${HTTP_PROXY:-""}
export HTTPS_PROXY=${HTTPS_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""}
# The Ansible version used for testing # The Ansible version used for testing
export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-base==2.10.4"} export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-base==2.10.5"}
export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"} export ANSIBLE_ROLE_FILE=${ANSIBLE_ROLE_FILE:-"ansible-role-requirements.yml"}
export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"} export ANSIBLE_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"}
export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"} export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"}