From 3b7dc169ef9d465bb5d3304ba043976e74e05f27 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 13 Sep 2022 21:28:48 +0200 Subject: [PATCH] Bump ansible-core version to 2.13.4 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-galera_server/+/858555 Depends-On: https://review.opendev.org/c/openstack/ansible-hardening/+/860276 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/860277 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_cinder/+/860349 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_neutron/+/860356 Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-os_tempest/+/860358 Change-Id: I4686b456247994863b829c2da35ddf099fcbb748 --- ansible-role-requirements.yml | 4 ++-- inventory/group_vars/all/ceph.yml | 2 +- scripts/bootstrap-ansible.sh | 2 +- tests/roles/bootstrap-host/tasks/prepare_aio_config.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 9daec7bb27..15b34f296e 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -308,8 +308,8 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: stable-6.0 - trackbranch: stable-6.0 + version: stable-7.0 + trackbranch: stable-7.0 shallow_since: '2022-06-14' - name: opendaylight scm: git diff --git a/inventory/group_vars/all/ceph.yml b/inventory/group_vars/all/ceph.yml index 6915b035cf..1db8c8c9a4 100644 --- a/inventory/group_vars/all/ceph.yml +++ b/inventory/group_vars/all/ceph.yml @@ -27,7 +27,7 @@ ceph_repository: community # 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 # OSA/ceph-ansible integrations in sync. -ceph_stable_release: pacific +ceph_stable_release: quincy fetch_directory: "{{ openstack_config_dir }}/ceph-fetch/" # 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 diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 5bc7ce0988..7b08bca167 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -22,7 +22,7 @@ set -e -u -x export HTTP_PROXY=${HTTP_PROXY:-""} export HTTPS_PROXY=${HTTPS_PROXY:-""} # 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_COLLECTION_FILE=${ANSIBLE_COLLECTION_FILE:-"ansible-collection-requirements.yml"} export USER_ROLE_FILE=${USER_ROLE_FILE:-"user-role-requirements.yml"} diff --git a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml index 9b8a1ac241..d960b640a4 100644 --- a/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml +++ b/tests/roles/bootstrap-host/tasks/prepare_aio_config.yml @@ -83,12 +83,12 @@ nova_virt_type: 'qemu' # NOTE(jrosser) # 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 ceph_apt_repos: ceph: 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: dest: /etc/openstack_deploy/user_openstackci.yml content: "{{ nodepool_overrides | to_nice_yaml }}"