Update the default namespace

Signed-off-by: Kevin Carter <kecarter@redhat.com>
Change-Id: I44f38a8a3e80fa6a65e36f10db78c9c3493fbc9a
Depends-On: I839298c177ef27852d0dcfc58cb7b62c161299c0

container-images/container_image_prepare_defaults.yaml

@@ -13,7 +13,7 @@ parameter_defaults:
     # <prefix>/share/tripleo-common/container-images/tripleo_containers.yaml.j2
     set:
       # Container image name components for OpenStack images.
-      namespace: quay.io/tripleomaster
+      namespace: quay.io/tripleomastercentos9
       name_prefix: openstack-
       name_suffix: ''
       tag: current-tripleo

container-images/tripleo_containers.yaml

@@ -1,173 +1,173 @@
 container_images:
-- imagename: quay.io/tripleomaster/openstack-aodh-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-aodh-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-aodh-evaluator:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-aodh-evaluator:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-aodh-listener:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-aodh-listener:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-aodh-notifier:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-aodh-notifier:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-barbican-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-barbican-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-barbican-keystone-listener:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-barbican-keystone-listener:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-barbican-worker:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-barbican-worker:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ceilometer-central:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ceilometer-central:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ceilometer-compute:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ceilometer-compute:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ceilometer-notification:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ceilometer-notification:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ceilometer-ipmi:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ceilometer-ipmi:current-tripleo
   image_source: tripleo
 - imagename: quay.io/prometheus/pushgateway:v1.4.2
   image_source: prom
-- imagename: quay.io/tripleomaster/openstack-cinder-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-cinder-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-cinder-backup:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-cinder-backup:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-cinder-scheduler:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-cinder-scheduler:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-cinder-volume:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-cinder-volume:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-collectd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-collectd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-cron:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-cron:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-base:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-base:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-backend-bind9:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-backend-bind9:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-central:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-central:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-mdns:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-mdns:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-producer:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-producer:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-sink:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-sink:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-designate-worker:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-designate-worker:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-etcd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-etcd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-frr:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-frr:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ovn-bgp-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ovn-bgp-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-glance-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-glance-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-gnocchi-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-gnocchi-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-gnocchi-metricd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-gnocchi-metricd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-gnocchi-statsd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-gnocchi-statsd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-haproxy:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-haproxy:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-heat-all:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-heat-all:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-heat-api-cfn:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-heat-api-cfn:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-heat-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-heat-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-heat-engine:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-heat-engine:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-horizon:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-horizon:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ironic-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ironic-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ironic-conductor:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ironic-conductor:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ironic-inspector:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ironic-inspector:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ironic-pxe:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ironic-pxe:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ironic-neutron-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ironic-neutron-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-iscsid:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-iscsid:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-keystone:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-keystone:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-manila-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-manila-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-manila-scheduler:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-manila-scheduler:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-manila-share:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-manila-share:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-mariadb:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-mariadb:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-memcached:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-memcached:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-multipathd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-multipathd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-dhcp-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-dhcp-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-l3-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-l3-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-metadata-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-metadata-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-openvswitch-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-openvswitch-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-sriov-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-sriov-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-mlnx-agent:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-mlnx-agent:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-server:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-server:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-neutron-metadata-agent-ovn:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-neutron-metadata-agent-ovn:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-compute-ironic:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-compute-ironic:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-compute:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-compute:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-conductor:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-conductor:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-libvirt:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-libvirt:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-novncproxy:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-novncproxy:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-nova-scheduler:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-nova-scheduler:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-novajoin-notifier:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-novajoin-notifier:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-novajoin-server:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-novajoin-server:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-octavia-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-octavia-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-octavia-health-manager:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-octavia-health-manager:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-octavia-housekeeping:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-octavia-housekeeping:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-octavia-worker:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-octavia-worker:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ovn-controller:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ovn-controller:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ovn-nb-db-server:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ovn-nb-db-server:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ovn-northd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ovn-northd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-ovn-sb-db-server:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-ovn-sb-db-server:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-placement-api:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-placement-api:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-qdrouterd:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-qdrouterd:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-rabbitmq:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-rabbitmq:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-redis:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-redis:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-swift-account:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-swift-account:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-swift-container:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-swift-container:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-swift-object:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-swift-object:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-swift-proxy-server:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-swift-proxy-server:current-tripleo
   image_source: tripleo
 - imagename: quay.io/ceph/daemon:v6.0.7-stable-6.0-pacific-centos-stream8
   image_source: ceph
@@ -185,11 +185,11 @@ container_images:
   image_source: keepalived
 - imagename: quay.io/ceph/haproxy:2.3
   image_source: haproxy
-- imagename: quay.io/tripleomaster/openstack-rsyslog:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-rsyslog:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-unbound:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-unbound:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-tempest:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-tempest:current-tripleo
   image_source: tripleo
-- imagename: quay.io/tripleomaster/openstack-tripleoclient:current-tripleo
+- imagename: quay.io/tripleomastercentos9/openstack-tripleoclient:current-tripleo
   image_source: tripleo

tripleo_common/tests/image/fakes.py

@@ -29,16 +29,16 @@ def create_disk_images():
 
 def create_parsed_upload_images():
     uploads = [
-        {'imagename': 'docker.io/tripleomaster/'
+        {'imagename': 'docker.io/tripleomastercentos9/'
                       'heat-docker-agents-centos:latest',
          'push_destination': 'localhost:8787'},
-        {'imagename': 'docker.io/tripleomaster/'
+        {'imagename': 'docker.io/tripleomastercentos9/'
                       'centos-binary-nova-compute:liberty',
          'push_destination': 'localhost:8787'},
-        {'imagename': 'docker.io/tripleomaster/'
+        {'imagename': 'docker.io/tripleomastercentos9/'
                       'centos-binary-nova-libvirt:liberty',
          'push_destination': '192.0.2.0:8787'},
-        {'imagename': 'docker.io/tripleomaster/'
+        {'imagename': 'docker.io/tripleomastercentos9/'
                       'image-with-missing-tag',
          'push_destination': 'localhost:8787'},
     ]

tripleo_common/tests/image/test_image_uploader.py

@@ -33,14 +33,14 @@ from tripleo_common.tests.image import fakes
 
 filedata = str(
     """container_images:
-    - imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest
+    - imagename: docker.io/tripleomastercentos9/heat-docker-agents-centos:latest
       push_destination: localhost:8787
-    - imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty
+    - imagename: docker.io/tripleomastercentos9/centos-binary-nova-compute:liberty
       push_destination: localhost:8787
-    - imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:liberty
-    - imagename: docker.io/tripleomaster/image-with-missing-tag
+    - imagename: docker.io/tripleomastercentos9/centos-binary-nova-libvirt:liberty
+    - imagename: docker.io/tripleomastercentos9/image-with-missing-tag
       push_destination: localhost:8787
-""")
+""")  # noqa
 
 
 class TestRegistrySessionHelper(base.TestCase):
@@ -1325,10 +1325,9 @@ class TestPythonImageUploader(base.TestCase):
         })
         _fetch_manifest.return_value = manifest
 
-        image = 'docker.io/tripleomaster/heat-docker-agents-centos'
+        image = 'docker.io/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         push_destination = 'localhost:8787'
-        # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
         task = image_uploader.UploadTask(
             image_name=image + ':' + tag,
             pull_source=None,
@@ -1344,9 +1343,9 @@ class TestPythonImageUploader(base.TestCase):
             [],
             self.uploader.upload_image(task)
         )
-        source_url = urlparse('docker://docker.io/tripleomaster/'
+        source_url = urlparse('docker://docker.io/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
-        target_url = urlparse('docker://localhost:8787/tripleomaster/'
+        target_url = urlparse('docker://localhost:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
 
         authenticate.assert_has_calls([
@@ -1421,10 +1420,9 @@ class TestPythonImageUploader(base.TestCase):
         })
         _fetch_manifest.return_value = manifest
 
-        image = 'docker.io/tripleomaster/heat-docker-agents-centos'
+        image = 'docker.io/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         push_destination = 'localhost:8787'
-        # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
         task = image_uploader.UploadTask(
             image_name=image + ':' + tag,
             pull_source=None,
@@ -1440,9 +1438,9 @@ class TestPythonImageUploader(base.TestCase):
             [],
             self.uploader.upload_image(task)
         )
-        source_url = urlparse('docker://docker.io/tripleomaster/'
+        source_url = urlparse('docker://docker.io/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
-        target_url = urlparse('docker://localhost:8787/tripleomaster/'
+        target_url = urlparse('docker://localhost:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
 
         authenticate.assert_has_calls([
@@ -1489,10 +1487,9 @@ class TestPythonImageUploader(base.TestCase):
         })
         _fetch_manifest.return_value = manifest
 
-        image = '192.0.2.0:8787/tripleomaster/heat-docker-agents-centos'
+        image = '192.0.2.0:8787/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         push_destination = 'localhost:8787'
-        # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
         task = image_uploader.UploadTask(
             image_name=image + ':' + tag,
             pull_source=None,
@@ -1508,9 +1505,9 @@ class TestPythonImageUploader(base.TestCase):
             [],
             self.uploader.upload_image(task)
         )
-        source_url = urlparse('docker://192.0.2.0:8787/tripleomaster/'
+        source_url = urlparse('docker://192.0.2.0:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
-        target_url = urlparse('docker://localhost:8787/tripleomaster/'
+        target_url = urlparse('docker://localhost:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
 
         authenticate.assert_has_calls([
@@ -1556,10 +1553,9 @@ class TestPythonImageUploader(base.TestCase):
         })
         _fetch_manifest.return_value = manifest
 
-        image = 'docker.io/tripleomaster/heat-docker-agents-centos'
+        image = 'docker.io/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         push_destination = 'localhost:8787'
-        # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
         task = image_uploader.UploadTask(
             image_name=image + ':' + tag,
             pull_source=None,
@@ -1575,9 +1571,9 @@ class TestPythonImageUploader(base.TestCase):
             [],
             self.uploader.upload_image(task)
         )
-        source_url = urlparse('docker://docker.io/tripleomaster/'
+        source_url = urlparse('docker://docker.io/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
-        target_url = urlparse('docker://localhost:8787/tripleomaster/'
+        target_url = urlparse('docker://localhost:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
 
         authenticate.assert_has_calls([
@@ -1661,11 +1657,10 @@ class TestPythonImageUploader(base.TestCase):
         })
         _fetch_manifest.return_value = manifest
 
-        image = 'docker.io/tripleomaster/heat-docker-agents-centos'
+        image = 'docker.io/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         append_tag = 'modify-123'
         push_destination = 'localhost:8787'
-        # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos'
         task = image_uploader.UploadTask(
             image_name=image + ':' + tag,
             pull_source=None,
@@ -1678,22 +1673,22 @@ class TestPythonImageUploader(base.TestCase):
         )
 
         source_url = urlparse(
-            'docker://docker.io/tripleomaster/'
+            'docker://docker.io/tripleomastercentos9/'
             'heat-docker-agents-centos:latest')
         unmodified_target_url = urlparse(
-            'docker://localhost:8787/tripleomaster/'
+            'docker://localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latest')
         local_modified_url = urlparse(
-            'containers-storage:localhost:8787/tripleomaster/'
+            'containers-storage:localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latestmodify-123')
         target_url = urlparse(
-            'docker://localhost:8787/tripleomaster/'
+            'docker://localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latestmodify-123')
 
         self.assertEqual([
-            'localhost:8787/tripleomaster/'
+            'localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latest',
-            'localhost:8787/tripleomaster/'
+            'localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latestmodify-123'],
             self.uploader.upload_image(task)
         )
@@ -1749,9 +1744,9 @@ class TestPythonImageUploader(base.TestCase):
         run_modify_playbook.assert_called_once_with(
             'add-foo-plugin',
             {'foo_version': '1.0.1'},
-            'localhost:8787/tripleomaster/'
+            'localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latest',
-            'localhost:8787/tripleomaster/'
+            'localhost:8787/tripleomastercentos9/'
             'heat-docker-agents-centos:latest',
             'modify-123',
             container_build_tool='buildah'
@@ -1779,7 +1774,7 @@ class TestPythonImageUploader(base.TestCase):
             target_session
         ]
 
-        image = 'docker.io/tripleomaster/heat-docker-agents-centos'
+        image = 'docker.io/tripleomastercentos9/heat-docker-agents-centos'
         tag = 'latest'
         push_destination = 'localhost:8787'
         source_image = 'containers-storage:%s:%s' % (image, tag)
@@ -1799,7 +1794,7 @@ class TestPythonImageUploader(base.TestCase):
             self.uploader.upload_image(task)
         )
         source_url = urlparse(source_image)
-        target_url = urlparse('docker://localhost:8787/tripleomaster/'
+        target_url = urlparse('docker://localhost:8787/tripleomastercentos9/'
                               'heat-docker-agents-centos:latest')
         authenticate.assert_has_calls([
             mock.call(

tripleo_common/tests/image/test_kolla_builder.py

@@ -45,20 +45,20 @@ CONTAINER_DEFAULTS_ENVIRONMENT = ('environments/'
                                   'containers-default-parameters.yaml')
 
 filedata = str("""container_images:
-- imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest
+- imagename: docker.io/tripleomastercentos9/heat-docker-agents-centos:latest
   image_source: kolla
   push_destination: localhost:8787
-- imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty
+- imagename: docker.io/tripleomastercentos9/centos-binary-nova-compute:liberty
   image_source: kolla
   uploader: docker
   push_destination: localhost:8787
-- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:liberty
+- imagename: docker.io/tripleomastercentos9/centos-binary-nova-libvirt:liberty
   image_source: kolla
   uploader: docker
-- imagename: docker.io/tripleomaster/image-with-missing-tag
+- imagename: docker.io/tripleomastercentos9/image-with-missing-tag
   image_source: kolla
   push_destination: localhost:8787
-- imagename: docker.io/tripleomaster/skip-build
+- imagename: docker.io/tripleomastercentos9/skip-build
   image_source: foo
   push_destination: localhost:8787
 """)
@@ -225,7 +225,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
         result = builder.container_images_from_template(
             push_destination='localhost:8787',
             name_prefix='centos-binary-',
-            namespace='docker.io/tripleomaster',
+            namespace='docker.io/tripleomastercentos9',
             tag='liberty'
         )
         # template substitution on the container_images_template section should
@@ -283,7 +283,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
         )
 
         expected = {
-            'namespace': '192.0.2.0:5000/tripleomaster',
+            'namespace': '192.0.2.0:5000/tripleomastercentos9',
             'ceph_namespace': 'quay.ceph.io/ceph-ci',
             'ceph_image': 'ceph-daemon',
             'ceph_tag': 'latest',
@@ -322,7 +322,7 @@ class TestKollaImageBuilderTemplate(base.TestCase):
         self.assertEqual(
             expected,
             builder.container_images_template_inputs(
-                namespace='192.0.2.0:5000/tripleomaster',
+                namespace='192.0.2.0:5000/tripleomastercentos9',
                 ceph_namespace='quay.ceph.io/ceph-ci',
                 ceph_image='ceph-daemon',
                 ceph_tag='latest',