Include both Ceph Octopus and Pacific in the content provider

I9d38c1dbadb968f8c7721c69c57002f159cea619 changed the default
Ceph container to Pacific but it took time for multiple patches
to merge so there was a period of time a job was asking for a
container which was different from what was available. This patch
makes both available in the content provider (brings Ocotpus back)
until the transition is complete and then it can be reverted. It
establishes a pattern for how to make these transitions in the
future.

Closes-Bug: #1923529
Change-Id: Ia00caf064921da362395afbfeb1b0259ff244c4a

container-images/tripleo_containers.yaml

@@ -189,3 +189,5 @@ container_images:
   image_source: tripleo
 - imagename: quay.io/tripleomaster/openstack-unbound:current-tripleo
   image_source: tripleo
+- imagename: quay.ceph.io/ceph-ci/daemon:v5.0.7-stable-5.0-octopus-centos-8-x86_64
+  image_source: ceph

tripleo_common/tests/image/test_kolla_builder.py

@@ -388,6 +388,17 @@ class TestKollaImageBuilderTemplate(base.TestCase):
         for image in remove_images:
             container_images.remove(image)
 
+        # todo(fultonj): remove kluge of this aspect of the test
+        # added extra ceph image only for side effect of having
+        # both ceph containers in content provider for transition
+        # https://bugs.launchpad.net/tripleo/+bug/1923529
+        extra_tag = 'v5.0.7-stable-5.0-octopus-centos-8-x86_64'
+        extra = {
+            'imagename': 'quay.ceph.io/ceph-ci/daemon:' + extra_tag,
+            'image_source': 'ceph'
+        }
+        result.append(extra)
+
         self.assertSequenceEqual(container_images, result)
 
     def test_container_images_yaml_in_sync(self):