diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 2e171b724..fb5325b7a 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -13,7 +13,7 @@ parameter_defaults: # /share/tripleo-common/container-images/overcloud_containers.yaml.j2 set: # Container image name components for OpenStack images. - namespace: docker.io/tripleomaster + namespace: docker.io/tripleotrain name_prefix: centos-binary- name_suffix: '' tag: current-tripleo diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 7e55388b6..0ff5c0e73 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -1,203 +1,203 @@ container_images: -- imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-aodh-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-aodh-evaluator:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-aodh-listener:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-barbican-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-barbican-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ceilometer-compute:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-cinder-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-cinder-backup:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-cinder-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-cinder-volume:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-collectd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-cron:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-backend-bind9:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-central:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-central:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-mdns:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-mdns:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-producer:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-producer:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-sink:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-sink:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-designate-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ec2-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ec2-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-etcd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-fluentd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-fluentd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-glance-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-gnocchi-metricd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-haproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-heat-all:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-heat-api-cfn:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-heat-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-heat-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-horizon:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ironic-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ironic-conductor:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ironic-inspector:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ironic-pxe:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-neutron-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ironic-neutron-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-iscsid:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-keepalived:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-keystone:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-manila-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-manila-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-manila-share:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-mariadb:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-memcached:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-mistral-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-mistral-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-mistral-executor:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-mistral-event-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-multipathd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-l3-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-openvswitch-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-mlnx-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-mlnx-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-server-opendaylight:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-server-opendaylight:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-server-ovn:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-server-ovn:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent-ovn:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-compute-ironic:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-compute:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-conductor:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-libvirt:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-novncproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-novajoin-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-octavia-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-octavia-health-manager:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-octavia-housekeeping:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-octavia-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-opendaylight:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-opendaylight:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ovn-controller:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ovn-nb-db-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ovn-northd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-ovn-sb-db-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-panko-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-panko-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-placement-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-placement-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-qdrouterd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-rabbitmq:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-redis:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sahara-api:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-sahara-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-sahara-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sensu-client:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-skydive-agent:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-skydive-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-skydive-analyzer:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-skydive-analyzer:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-swift-object:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-swift-proxy-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-tripleoclient:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-tripleoclient:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo image_source: kolla - imagename: docker.io/ceph/daemon:v4.0.4-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph @@ -209,7 +209,7 @@ container_images: image_source: prom - imagename: docker.io/grafana/grafana:latest image_source: grafana -- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-tempest:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo +- imagename: docker.io/tripleotrain/centos-binary-rsyslog:current-tripleo image_source: kolla diff --git a/tripleo_common/tests/image/fakes.py b/tripleo_common/tests/image/fakes.py index 0a1daf83f..d1f5e2b5f 100644 --- a/tripleo_common/tests/image/fakes.py +++ b/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/tripleotrain/' 'heat-docker-agents-centos:latest', 'push_destination': 'localhost:8787'}, - {'imagename': 'docker.io/tripleomaster/' + {'imagename': 'docker.io/tripleotrain/' 'centos-binary-nova-compute:liberty', 'push_destination': 'localhost:8787'}, - {'imagename': 'docker.io/tripleomaster/' + {'imagename': 'docker.io/tripleotrain/' 'centos-binary-nova-libvirt:liberty', 'push_destination': '192.0.2.0:8787'}, - {'imagename': 'docker.io/tripleomaster/' + {'imagename': 'docker.io/tripleotrain/' 'image-with-missing-tag', 'push_destination': 'localhost:8787'}, ] diff --git a/tripleo_common/tests/image/test_image_uploader.py b/tripleo_common/tests/image/test_image_uploader.py index a7d0d10ad..b3bb15d74 100644 --- a/tripleo_common/tests/image/test_image_uploader.py +++ b/tripleo_common/tests/image/test_image_uploader.py @@ -36,12 +36,12 @@ from tripleo_common.tests.image import fakes filedata = six.u( """container_images: - - imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest + - imagename: docker.io/tripleotrain/heat-docker-agents-centos:latest push_destination: localhost:8787 - - imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty + - imagename: docker.io/tripleotrain/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/tripleotrain/centos-binary-nova-libvirt:liberty + - imagename: docker.io/tripleotrain/image-with-missing-tag push_destination: localhost:8787 """) @@ -1260,10 +1260,10 @@ class TestPythonImageUploader(base.TestCase): }) _fetch_manifest.return_value = manifest - image = 'docker.io/tripleomaster/heat-docker-agents-centos' + image = 'docker.io/tripleotrain/heat-docker-agents-centos' tag = 'latest' push_destination = 'localhost:8787' - # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos' + # push_image = 'localhost:8787/tripleotrain/heat-docker-agents-centos' task = image_uploader.UploadTask( image_name=image + ':' + tag, pull_source=None, @@ -1280,9 +1280,9 @@ class TestPythonImageUploader(base.TestCase): [], self.uploader.upload_image(task) ) - source_url = urlparse('docker://docker.io/tripleomaster/' + source_url = urlparse('docker://docker.io/tripleotrain/' 'heat-docker-agents-centos:latest') - target_url = urlparse('docker://localhost:8787/tripleomaster/' + target_url = urlparse('docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest') authenticate.assert_has_calls([ @@ -1358,10 +1358,10 @@ class TestPythonImageUploader(base.TestCase): }) _fetch_manifest.return_value = manifest - image = 'docker.io/tripleomaster/heat-docker-agents-centos' + image = 'docker.io/tripleotrain/heat-docker-agents-centos' tag = 'latest' push_destination = 'localhost:8787' - # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos' + # push_image = 'localhost:8787/tripleotrain/heat-docker-agents-centos' task = image_uploader.UploadTask( image_name=image + ':' + tag, pull_source=None, @@ -1378,9 +1378,9 @@ class TestPythonImageUploader(base.TestCase): [], self.uploader.upload_image(task) ) - source_url = urlparse('docker://docker.io/tripleomaster/' + source_url = urlparse('docker://docker.io/tripleotrain/' 'heat-docker-agents-centos:latest') - target_url = urlparse('docker://localhost:8787/tripleomaster/' + target_url = urlparse('docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest') authenticate.assert_has_calls([ @@ -1427,10 +1427,10 @@ 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/tripleotrain/heat-docker-agents-centos' tag = 'latest' push_destination = 'localhost:8787' - # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos' + # push_image = 'localhost:8787/tripleotrain/heat-docker-agents-centos' task = image_uploader.UploadTask( image_name=image + ':' + tag, pull_source=None, @@ -1447,9 +1447,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/tripleotrain/' 'heat-docker-agents-centos:latest') - target_url = urlparse('docker://localhost:8787/tripleomaster/' + target_url = urlparse('docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest') authenticate.assert_has_calls([ @@ -1495,10 +1495,10 @@ class TestPythonImageUploader(base.TestCase): }) _fetch_manifest.return_value = manifest - image = 'docker.io/tripleomaster/heat-docker-agents-centos' + image = 'docker.io/tripleotrain/heat-docker-agents-centos' tag = 'latest' push_destination = 'localhost:8787' - # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos' + # push_image = 'localhost:8787/tripleotrain/heat-docker-agents-centos' task = image_uploader.UploadTask( image_name=image + ':' + tag, pull_source=None, @@ -1515,9 +1515,9 @@ class TestPythonImageUploader(base.TestCase): [], self.uploader.upload_image(task) ) - source_url = urlparse('docker://docker.io/tripleomaster/' + source_url = urlparse('docker://docker.io/tripleotrain/' 'heat-docker-agents-centos:latest') - target_url = urlparse('docker://localhost:8787/tripleomaster/' + target_url = urlparse('docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest') authenticate.assert_has_calls([ @@ -1602,11 +1602,11 @@ class TestPythonImageUploader(base.TestCase): }) _fetch_manifest.return_value = manifest - image = 'docker.io/tripleomaster/heat-docker-agents-centos' + image = 'docker.io/tripleotrain/heat-docker-agents-centos' tag = 'latest' append_tag = 'modify-123' push_destination = 'localhost:8787' - # push_image = 'localhost:8787/tripleomaster/heat-docker-agents-centos' + # push_image = 'localhost:8787/tripleotrain/heat-docker-agents-centos' task = image_uploader.UploadTask( image_name=image + ':' + tag, pull_source=None, @@ -1620,22 +1620,22 @@ class TestPythonImageUploader(base.TestCase): ) source_url = urlparse( - 'docker://docker.io/tripleomaster/' + 'docker://docker.io/tripleotrain/' 'heat-docker-agents-centos:latest') unmodified_target_url = urlparse( - 'docker://localhost:8787/tripleomaster/' + 'docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest') local_modified_url = urlparse( - 'containers-storage:localhost:8787/tripleomaster/' + 'containers-storage:localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latestmodify-123') target_url = urlparse( - 'docker://localhost:8787/tripleomaster/' + 'docker://localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latestmodify-123') self.assertEqual([ - 'localhost:8787/tripleomaster/' + 'localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest', - 'localhost:8787/tripleomaster/' + 'localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latestmodify-123'], self.uploader.upload_image(task) ) @@ -1692,9 +1692,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/tripleotrain/' 'heat-docker-agents-centos:latest', - 'localhost:8787/tripleomaster/' + 'localhost:8787/tripleotrain/' 'heat-docker-agents-centos:latest', 'modify-123', container_build_tool='buildah' @@ -1722,7 +1722,7 @@ class TestPythonImageUploader(base.TestCase): target_session ] - image = 'docker.io/tripleomaster/heat-docker-agents-centos' + image = 'docker.io/tripleotrain/heat-docker-agents-centos' tag = 'latest' push_destination = 'localhost:8787' source_image = 'containers-storage:%s:%s' % (image, tag) @@ -1743,7 +1743,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/tripleotrain/' 'heat-docker-agents-centos:latest') authenticate.assert_has_calls([ mock.call( diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index c6f4c502f..00001a632 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -39,20 +39,20 @@ kb.init_prepare_defaults(DEFAULTS_PATH) filedata = six.u("""container_images: -- imagename: docker.io/tripleomaster/heat-docker-agents-centos:latest +- imagename: docker.io/tripleotrain/heat-docker-agents-centos:latest image_source: kolla push_destination: localhost:8787 -- imagename: docker.io/tripleomaster/centos-binary-nova-compute:liberty +- imagename: docker.io/tripleotrain/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/tripleotrain/centos-binary-nova-libvirt:liberty image_source: kolla uploader: docker -- imagename: docker.io/tripleomaster/image-with-missing-tag +- imagename: docker.io/tripleotrain/image-with-missing-tag image_source: kolla push_destination: localhost:8787 -- imagename: docker.io/tripleomaster/skip-build +- imagename: docker.io/tripleotrain/skip-build image_source: foo push_destination: localhost:8787 """) @@ -233,7 +233,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): self.assertEqual( { - 'namespace': 'docker.io/tripleomaster', + 'namespace': 'docker.io/tripleotrain', 'ceph_namespace': 'docker.io/ceph', 'ceph_image': 'daemon', 'ceph_tag': 'v4.0.4-stable-4.0-nautilus-centos-7-x86_64', @@ -260,7 +260,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): self.assertEqual( { - 'namespace': '192.0.2.0:5000/tripleomaster', + 'namespace': '192.0.2.0:5000/tripleotrain', 'ceph_namespace': 'docker.io/cephh', 'ceph_image': 'ceph-daemon', 'ceph_tag': 'latest', @@ -283,7 +283,7 @@ class TestKollaImageBuilderTemplate(base.TestCase): 'neutron_driver': 'ovn', }, builder.container_images_template_inputs( - namespace='192.0.2.0:5000/tripleomaster', + namespace='192.0.2.0:5000/tripleotrain', ceph_namespace='docker.io/cephh', ceph_image='ceph-daemon', ceph_tag='latest', @@ -314,23 +314,23 @@ class TestKollaImageBuilderTemplate(base.TestCase): ) container_images = [{ 'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/' + 'imagename': 'docker.io/tripleotrain/' 'centos-binary-nova-compute:liberty', 'push_destination': 'localhost:8787', 'uploader': 'docker' }, { 'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/' + 'imagename': 'docker.io/tripleotrain/' 'centos-binary-nova-libvirt:liberty', 'push_destination': 'localhost:8787', 'uploader': 'docker' }, { 'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/image-with-missing-tag', + 'imagename': 'docker.io/tripleotrain/image-with-missing-tag', 'push_destination': 'localhost:8787' }, { 'image_source': 'foo', - 'imagename': 'docker.io/tripleomaster/skip-build', + 'imagename': 'docker.io/tripleotrain/skip-build', 'push_destination': 'localhost:8787' }] self.assertEqual(container_images, result) @@ -375,28 +375,28 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync(self): remove_images = [ {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server-ovn:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-ovn-northd:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'controller:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( remove_images=remove_images) @@ -405,25 +405,25 @@ class TestKollaImageBuilderTemplate(base.TestCase): # remove neutron-server image reference from overcloud_containers.yaml remove_images = [ {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server-ovn:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-ovn-northd:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'controller:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary-ovn-' + 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='odl', remove_images=remove_images) @@ -432,13 +432,13 @@ class TestKollaImageBuilderTemplate(base.TestCase): # remove neutron-server image reference from overcloud_containers.yaml remove_images = [ {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='ovn', remove_images=remove_images) @@ -446,25 +446,25 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync_for_rhel(self): remove_images = [ {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-fluentd:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-sensu-client:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-skydive-agent:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' + 'imagename': 'docker.io/tripleotrain/centos-binary' '-skydive-analyzer:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( rhel_containers=True, neutron_driver='ovn',