Merge "Revert "Hard code jobs to Nautilus before setting new default to Octopus""

ci/environments/scenario001-multinode-containers.yaml

@@ -190,5 +190,3 @@ 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

ci/environments/scenario001-standalone.yaml

@@ -198,5 +198,3 @@ 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

ci/environments/scenario004-standalone.yaml

@@ -99,6 +99,4 @@ parameter_defaults:
   ManilaCephFSCephFSProtocolHelperType: 'NFS'
   # Workaround for https://bugs.launchpad.net/tripleo/+bug/1911022
   ExtraConfig:
-    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
+    ganesha_vip: 192.168.24.3

ci/environments/scenario010-multinode-containers.yaml

@@ -119,5 +119,3 @@ 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

ci/environments/scenario010-standalone.yaml

@@ -92,5 +92,3 @@ 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