Merge "Bump ansible-core version to 2.13.4"
This commit is contained in:
commit
e01385fb78
@ -308,8 +308,8 @@
|
|||||||
- name: ceph-ansible
|
- name: ceph-ansible
|
||||||
scm: git
|
scm: git
|
||||||
src: https://github.com/ceph/ceph-ansible
|
src: https://github.com/ceph/ceph-ansible
|
||||||
version: stable-6.0
|
version: stable-7.0
|
||||||
trackbranch: stable-6.0
|
trackbranch: stable-7.0
|
||||||
shallow_since: '2022-06-14'
|
shallow_since: '2022-06-14'
|
||||||
- name: opendaylight
|
- name: opendaylight
|
||||||
scm: git
|
scm: git
|
||||||
|
@ -27,7 +27,7 @@ ceph_repository: community
|
|||||||
# The _stable_release var is used by both the OSA ceph_client role and the
|
# The _stable_release var is used by both the OSA ceph_client role and the
|
||||||
# ceph-ansible roles. It is defaulted in ceph_client but set here to keep the
|
# ceph-ansible roles. It is defaulted in ceph_client but set here to keep the
|
||||||
# OSA/ceph-ansible integrations in sync.
|
# OSA/ceph-ansible integrations in sync.
|
||||||
ceph_stable_release: pacific
|
ceph_stable_release: quincy
|
||||||
fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/"
|
fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/"
|
||||||
# tries to create /var/log/ceph as a directory and fails if the log link already
|
# tries to create /var/log/ceph as a directory and fails if the log link already
|
||||||
# exists. we handle the log dir creation so this is not something we need
|
# exists. we handle the log dir creation so this is not something we need
|
||||||
|
@ -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-core==2.12.6"}
|
export ANSIBLE_PACKAGE=${ANSIBLE_PACKAGE:-"ansible-core==2.13.4"}
|
||||||
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"}
|
||||||
|
@ -83,12 +83,12 @@
|
|||||||
nova_virt_type: 'qemu'
|
nova_virt_type: 'qemu'
|
||||||
# NOTE(jrosser)
|
# NOTE(jrosser)
|
||||||
# we only run ceph jobs on ubuntu in CI so this is sufficient
|
# we only run ceph jobs on ubuntu in CI so this is sufficient
|
||||||
ceph_stable_repo: "http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-octopus"
|
ceph_stable_repo: "http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-quincy"
|
||||||
# we must set the ceph repo seperatley for the ceph_client role
|
# we must set the ceph repo seperatley for the ceph_client role
|
||||||
ceph_apt_repos:
|
ceph_apt_repos:
|
||||||
ceph:
|
ceph:
|
||||||
state: "present"
|
state: "present"
|
||||||
repo: "deb http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-octopus {{ ansible_facts['distribution_release'] }} main"
|
repo: "deb http://{{ nodepool_vars.NODEPOOL_MIRROR_HOST }}/ceph-deb-quincy {{ ansible_facts['distribution_release'] }} main"
|
||||||
copy:
|
copy:
|
||||||
dest: /etc/openstack_deploy/user_openstackci.yml
|
dest: /etc/openstack_deploy/user_openstackci.yml
|
||||||
content: "{{ nodepool_overrides | to_nice_yaml }}"
|
content: "{{ nodepool_overrides | to_nice_yaml }}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user