openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Switch to Ceph Quincy from Pacific 

Change-Id: I1fd10e3a25d26f69ffb386661446d5629af925f3
This commit is contained in:
Alfredo Moralejo 2022-08-19 12:06:07 +02:00 committed by Joel Capitao
parent 7aa8ea9e38
commit 00d2805a44
7 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure_facts.sh
View File

@ -22,7 +22,7 @@ export DLRN_BASE=${DLRN_BASE:-${OS_NAME_VERS}-master/puppet-passed-ci}
export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
export CEPH_VERSION=${CEPH_VERSION:-pacific}
export CEPH_VERSION=${CEPH_VERSION:-quincy}
export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source $SCRIPT_DIR/functions

5
manifests/ceph.pp
View File

@ -43,6 +43,11 @@ test -b /dev/ceph_vg/lv_data
Exec['lvm_create'] -> Class['Ceph::Osds']
class { 'ceph::params':
# Since Quincy, the ceph-volume command is provided by the separate package
packages => ['ceph', 'ceph-volume']
}
class { 'ceph::profile::params':
fsid => '7200aea0-2ddd-4a32-aa2a-d49f66ab554c',
manage_repo => false, # repo already managed in openstack_integration::repo

2
manifests/repos.pp
View File

@ -4,7 +4,7 @@ class openstack_integration::repos {
if defined('$::ceph_version') and $::ceph_version != '' {
$ceph_version_real = $::ceph_version
} else {
$ceph_version_real = 'pacific'
$ceph_version_real = 'quincy'
}
case $::osfamily {
'Debian': {

2
run_tests.sh
View File

@ -17,7 +17,7 @@ export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
source ${SCRIPT_DIR}/functions
export WORKSPACE=${WORKSPACE:-/tmp}
export CEPH_VERSION=${CEPH_VERSION:-pacific}
export CEPH_VERSION=${CEPH_VERSION:-quincy}
export PUPPET_MAJ_VERSION=${PUPPET_MAJ_VERSION:-6}
export SCENARIO=${SCENARIO:-scenario001}
export MANAGE_PUPPET_MODULES=${MANAGE_PUPPET_MODULES:-true}

2
zuul.d/base.yaml
View File

@ -77,7 +77,7 @@
roles:
- zuul: zuul/zuul-jobs
vars:
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-base

12
zuul.d/integration.yaml
View File

@ -41,7 +41,7 @@
abstract: true
vars:
scenario: scenario001
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-7-scenario001
@ -49,7 +49,7 @@
abstract: true
vars:
scenario: scenario001
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
@ -127,7 +127,7 @@
abstract: true
vars:
scenario: scenario004
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-7-scenario004
@ -135,7 +135,7 @@
abstract: true
vars:
scenario: scenario004
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
@ -157,7 +157,7 @@
abstract: true
vars:
scenario: scenario005
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-7-scenario005
@ -165,7 +165,7 @@
abstract: true
vars:
scenario: scenario005
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-integration-6-scenario005-tempest-ubuntu-focal

8
zuul.d/litmus.yaml
View File

@ -44,7 +44,7 @@
nodeset: centos-9-stream
vars:
puppet_gem_version: 7.16.0
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-litmus-6.28-ubuntu-focal
@ -53,7 +53,7 @@
voting: false
vars:
puppet_gem_version: 6.28.0
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-litmus-7.16-ubuntu-focal
@ -62,7 +62,7 @@
voting: false
vars:
puppet_gem_version: 7.16.0
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-litmus-latest-ubuntu-focal
@ -71,7 +71,7 @@
voting: false
vars:
puppet_gem_version: latest
ceph: pacific
ceph: quincy
- job:
name: puppet-openstack-libraries-litmus-7.16-centos-9-stream