CentOS: Fix duplicated ceph repository

Code Issues Proposed changes

The ceph repository is also included by delorean-deps.repo .
The version in the file is better aligned with the OpenStack packages.
Change-Id: I48cc74a20d8210fe36437ecf022a7276634476fe
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

This commit is contained in:

Takashi Kajinami

2025年09月27日 22:19:02 +09:00

parent 6579031b52

commit cc12213c1e

7 changed files with 1 additions and 33 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

13
configure_facts.sh

View File

@@ -24,7 +24,6 @@ export DLRN_ROOT=${DLRN_ROOT:-${OS_NAME_VERS}-${OPENSTACK_VERSION}}

export DLRN_BASE=${DLRN_BASE:-${DLRN_ROOT}/${DLRN_TAG}}

export DLRN_BASE_URL=${DLRN_BASE_URL:-${DLRN_BASE}/delorean.repo}

export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${DLRN_ROOT}/delorean-deps.repo}

export CEPH_VERSION=${CEPH_VERSION:-reef}

export SCRIPT_DIR=$(cd `dirname 0ドル` && pwd -P)

source $SCRIPT_DIR/functions

@@ -34,10 +33,8 @@ if [ -f /etc/ci/mirror_info.sh ]; then

CENTOS_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/centos-stream"

if uses_debs; then

CEPH_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}/ceph-deb-${CEPH_VERSION}"

NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/apt-puppetlabs"

else

CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"

NODEPOOL_PUPPETLABS_MIRROR="http://${NODEPOOL_MIRROR_HOST}/yum-puppetlabs"

fi

else

@@ -45,22 +42,15 @@ else

NODEPOOL_RDO_PROXY='https://trunk.rdoproject.org'

NODEPOOL_UCA_MIRROR='http://ubuntu-cloud.archive.canonical.com/ubuntu'

if uses_debs; then

CEPH_MIRROR_HOST="https://download.ceph.com/debian-${CEPH_VERSION}"

NODEPOOL_PUPPETLABS_MIRROR='https://apt.puppetlabs.com'

else

CEPH_MIRROR_HOST="${CENTOS_MIRROR_HOST}/SIGs/${VERSION_ID}-stream/storage/x86_64/ceph-${CEPH_VERSION}/"

NODEPOOL_PUPPETLABS_MIRROR="https://yum.puppetlabs.com"

fi

export FACTER_openstack_version=${OPENSTACK_VERSION}

export FACTER_ceph_mirror_host=${CEPH_MIRROR_HOST}

export FACTER_ceph_version=${CEPH_VERSION}

COMMON_MIRROR_FACTS="\

openstack_version=${FACTER_openstack_version}

ceph_mirror_host=${FACTER_ceph_mirror_host}

ceph_version=${FACTER_ceph_version}"

COMMON_MIRROR_FACTS="openstack_version=${FACTER_openstack_version}"

if uses_debs; then

export FACTER_uca_mirror_host=${NODEPOOL_UCA_MIRROR}

@@ -73,7 +63,6 @@ else

curl -o /tmp/delorean-deps.repo "${NODEPOOL_RDO_PROXY}/${DLRN_DEPS_URL}"

sed -i -e "s|https://trunk.rdoproject.org|${NODEPOOL_RDO_PROXY}|g" /tmp/delorean-deps.repo

sed -i -e "s|http://mirror.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo

sed -i -e "s|http://mirror.stream.centos.org|${CENTOS_MIRROR_HOST}|g" /tmp/delorean-deps.repo

export FACTER_centos_mirror_host=${CENTOS_MIRROR_HOST}

14
manifests/repos.pp

View File

@@ -48,20 +48,6 @@ class openstack_integration::repos {

update_packages=>true,

}

$ceph_version_real=pick($facts['ceph_version'],'reef')

$ceph_mirror=pick(

$facts['ceph_mirror_host'],

"${centos_mirror}/SIGs/${facts['os']['release']['major']}-stream/storage/x86_64/ceph-${ceph_version_real}/"

)

#OnCentOS,deployCephusingSIGrepositoryandgetridofEPEL.

#https://wiki.centos.org/SpecialInterestGroup/Storage/

class{ 'ceph::repo':

enable_sig => true,

enable_epel => false,

ceph_mirror => $ceph_mirror,

}

yumrepo{ 'crb':

enabled => true,

}

1
playbooks/run-integration-tests.yaml

View File

@@ -5,7 +5,6 @@

set -ex

trap "./copy_logs.sh" EXIT

export USE_OPENVOX={{ use_openvox }}

export CEPH_VERSION={{ ceph }}

export PUPPET_MAJ_VERSION={{ puppet }}

export SCENARIO={{ scenario }}

export GEM_HOME=`pwd`/.bundled_gems

1
playbooks/run-libraries-litmus-tests.yaml

View File

@@ -5,7 +5,6 @@

set -e

set -x

trap "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/copy_logs.sh" EXIT

export CEPH_VERSION={{ ceph }}

if [ "{{ puppet_gem_version }}" != "latest" ]; then

export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'

fi

1
playbooks/run-litmus-tests.yaml

View File

@@ -11,7 +11,6 @@

$GEM_BIN_DIR/bundle exec rake spec_clean

}

trap trap_exit_sig EXIT

export CEPH_VERSION={{ ceph }}

if [ "{{ puppet_gem_version }}" != "latest" ]; then

export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'

fi

2
zuul.d/base.yaml

View File

@@ -73,8 +73,6 @@

- ^tox.ini$

roles:

- zuul:zuul/zuul-jobs

vars:

ceph:reef

- job:

name:puppet-openstack-base

2
zuul.d/litmus.yaml

View File

@@ -28,8 +28,6 @@

- ^setup.cfg$

- ^setup.py$

- ^tox.ini$

vars:

ceph:reef

- job:

name:puppet-openstack-litmus-module-base