From d8267d62d42018d18c7927a6dbea619cea504de0 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Mon, 1 Feb 2021 12:15:56 -0500 Subject: [PATCH] Hard code jobs to Nautilus before setting new default to Octopus The jobs being changed in this patch would break when Ocotpus becomes the default Ceph container for the future Wallaby [1][2]. This patch configures these jobs to use Nautilus as an exception, not the rule, so that these jobs may then be migrated to Octopus one by one (i.e. migrated to deploying Ceph via cephadm). This patches change for 001-standalone will be undone first via [3]. [1] https://review.opendev.org/c/openstack/tripleo-common/+/771424 [2] https://review.opendev.org/c/openstack/tripleo-quickstart-extras/+/772371 [3] https://review.opendev.org/c/openstack/tripleo-heat-templates/+/767294 Change-Id: If9d51a2412c6b20ca3d86d2905831b754cc0622f --- ci/environments/scenario001-multinode-containers.yaml | 2 ++ ci/environments/scenario001-standalone.yaml | 2 ++ ci/environments/scenario004-standalone.yaml | 4 +++- ci/environments/scenario010-multinode-containers.yaml | 2 ++ ci/environments/scenario010-standalone.yaml | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml index 2039af0860..62e4ba549c 100644 --- a/ci/environments/scenario001-multinode-containers.yaml +++ b/ci/environments/scenario001-multinode-containers.yaml @@ -190,3 +190,5 @@ parameter_defaults: - tty6 # Remove ContainerCli once this scenario is tested on CentOS8 ContainerCli: podman + # octopus is default but use nautilus until this job is migrated + ContainerCephDaemonImage: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 diff --git a/ci/environments/scenario001-standalone.yaml b/ci/environments/scenario001-standalone.yaml index 8200098056..4c8c298254 100644 --- a/ci/environments/scenario001-standalone.yaml +++ b/ci/environments/scenario001-standalone.yaml @@ -197,3 +197,5 @@ parameter_defaults: - /dev/loop4 MultipathdEnable: true NovaLibvirtVolumeUseMultipath: true + # octopus is default but use nautilus until this job is migrated + ContainerCephDaemonImage: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 56c8b6604b..5e7fc0922e 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -98,4 +98,6 @@ parameter_defaults: ManilaCephFSCephFSProtocolHelperType: 'NFS' # Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022 ExtraConfig: - ganesha_vip: 192.168.24.3 \ No newline at end of file + ganesha_vip: 192.168.24.3 + # octopus is default but use nautilus until this job is migrated + ContainerCephDaemonImage: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 diff --git a/ci/environments/scenario010-multinode-containers.yaml b/ci/environments/scenario010-multinode-containers.yaml index 719486ea34..0eb72c589b 100644 --- a/ci/environments/scenario010-multinode-containers.yaml +++ b/ci/environments/scenario010-multinode-containers.yaml @@ -119,3 +119,5 @@ parameter_defaults: OctaviaCaKeyPassphrase: 'upstreamci' OctaviaGenerateCerts: true ContainerCli: podman + # octopus is default but use nautilus until this job is migrated + ContainerCephDaemonImage: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 diff --git a/ci/environments/scenario010-standalone.yaml b/ci/environments/scenario010-standalone.yaml index bd13545161..d6afd9a202 100644 --- a/ci/environments/scenario010-standalone.yaml +++ b/ci/environments/scenario010-standalone.yaml @@ -92,3 +92,5 @@ parameter_defaults: - tty5 - tty6 ContainerCli: podman + # octopus is default but use nautilus until this job is migrated + ContainerCephDaemonImage: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64