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
This commit is contained in:
John Fulton
2021-02-01 12:15:56 -05:00
parent 787b765118
commit d8267d62d4
5 changed files with 11 additions and 1 deletions
@@ -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
@@ -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
+3 -1
View File
@@ -98,4 +98,6 @@ parameter_defaults:
ManilaCephFSCephFSProtocolHelperType: 'NFS'
# Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022
ExtraConfig:
ganesha_vip: 192.168.24.3
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
@@ -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
@@ -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