ソースを参照

switch to registry.redhat.io for infra images

Ben Parees 6 年 前
コミット
b867895c4b
27 ファイル変更55 行追加55 行削除
  1. 3 3
      README_CONTAINERIZED_INSTALLATION.md
  2. 9 9
      inventory/hosts.example
  3. 1 1
      playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml
  4. 1 1
      roles/ansible_service_broker/defaults/main.yml
  5. 1 1
      roles/ansible_service_broker/vars/openshift-enterprise.yml
  6. 2 2
      roles/container_runtime/defaults/main.yml
  7. 1 1
      roles/container_runtime/templates/registries.conf
  8. 1 1
      roles/etcd/defaults/main.yaml
  9. 1 1
      roles/openshift_autoheal/defaults/main.yml
  10. 1 1
      roles/openshift_examples/defaults/main.yml
  11. 2 2
      roles/openshift_examples/tasks/main.yml
  12. 2 2
      roles/openshift_facts/defaults/main.yml
  13. 3 3
      roles/openshift_health_checker/openshift_checks/docker_image_availability.py
  14. 1 1
      roles/openshift_health_checker/test/docker_image_availability_test.py
  15. 1 1
      roles/openshift_hosted/README.md
  16. 1 1
      roles/openshift_hosted/defaults/main.yml
  17. 1 1
      roles/openshift_hosted_templates/defaults/main.yml
  18. 2 2
      roles/openshift_hosted_templates/tasks/main.yml
  19. 1 1
      roles/openshift_logging/README.md
  20. 1 1
      roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml
  21. 1 1
      roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml
  22. 5 5
      roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml
  23. 6 6
      roles/openshift_management/files/templates/cloudforms/cfme-template.yaml
  24. 1 1
      roles/openshift_metrics/README.md
  25. 1 1
      roles/openshift_node_problem_detector/defaults/main.yaml
  26. 1 1
      roles/openshift_provisioners/defaults/main.yaml
  27. 4 4
      roles/openshift_storage_glusterfs/defaults/main.yml

+ 3 - 3
README_CONTAINERIZED_INSTALLATION.md

@@ -47,14 +47,14 @@ before attempting to pull any of the following images.
         docker.io/openshift/origin
         docker.io/openshift/node (node + openshift-sdn + openvswitch rpm for client tools)
         docker.io/openshift/openvswitch (centos7 + openvswitch rpm, runs ovsdb ovsctl processes)
-        registry.access.redhat.com/rhel7/etcd
+        registry.redhat.io/rhel7/etcd
     OpenShift Enterprise
         registry.access.redhat.com/openshift3/ose
         registry.access.redhat.com/openshift3/node
         registry.access.redhat.com/openshift3/openvswitch
-        registry.access.redhat.com/rhel7/etcd
+        registry.redhat.io/rhel7/etcd
 
-  * note openshift3/* images come from registry.access.redhat.com and
+  * note openshift3/* images come from registry.redhat.io and
 rely on the --additional-repository flag being set appropriately.
 
 ### Starting and Stopping Containers

+ 9 - 9
inventory/hosts.example

@@ -83,7 +83,7 @@ debug_level=2
 # If using Atomic Host, you may specify system container image registry for the nodes:
 #system_images_registry="docker.io"
 # when openshift_deployment_type=='openshift-enterprise'
-#system_images_registry="registry.access.redhat.com"
+#system_images_registry="registry.redhat.io"
 
 # Manage openshift example imagestreams and templates during install and upgrade
 #openshift_install_examples=true
@@ -171,7 +171,7 @@ debug_level=2
 # openshift-enterprise default is 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
 # origin default is 'docker.io/openshift/origin-${component}:${version}'
 #oreg_url=example.com/openshift3/ose-${component}:${version}
-# If oreg_url points to a registry other than registry.access.redhat.com we can
+# If oreg_url points to a registry other than registry.redhat.io we can
 # modify image streams to point at that registry by setting the following to true
 #openshift_examples_modify_imagestreams=true
 # Add insecure and blocked registries to global docker configuration
@@ -193,7 +193,7 @@ debug_level=2
 #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}]
 #openshift_repos_enable_testing=false
 
-# If the image for etcd needs to be pulled from anywhere else than registry.access.redhat.com, e.g. in
+# If the image for etcd needs to be pulled from anywhere else than registry.redhat.io, e.g. in
 # a disconnected and containerized installation, use osm_etcd_image to specify the image to use:
 #osm_etcd_image=registry.example.com/rhel7/etcd
 
@@ -602,11 +602,11 @@ debug_level=2
 #openshift_metrics_schema_installer_image="docker.io/openshift/origin-metrics-schema-installer:{{ openshift_image_tag }}"
 #openshift_metrics_heapster_image="docker.io/openshift/origin-metrics-heapster:{{ openshift_image_tag }}"
 # when openshift_deployment_type=='openshift-enterprise'
-#openshift_metrics_cassandra_image="registry.access.redhat.com/openshift3/metrics-cassandra:{{ openshift_image_tag }}"
-#openshift_metrics_hawkular_agent_image="registry.access.redhat.com/openshift3/metrics-hawkular-openshift-agent:{{ openshift_image_tag }}"
-#openshift_metrics_hawkular_metrics_image="registry.access.redhat.com/openshift3/metrics-hawkular-metrics:{{ openshift_image_tag }}"
-#openshift_metrics_schema_installer_image="registry.access.redhat.com/openshift3/metrics-schema-installer:{{ openshift_image_tag }}"
-#openshift_metrics_heapster_image="registry.access.redhat.com/openshift3/metrics-heapster:{{ openshift_image_tag }}"
+#openshift_metrics_cassandra_image="registry.redhat.io/openshift3/metrics-cassandra:{{ openshift_image_tag }}"
+#openshift_metrics_hawkular_agent_image="registry.redhat.io/openshift3/metrics-hawkular-openshift-agent:{{ openshift_image_tag }}"
+#openshift_metrics_hawkular_metrics_image="registry.redhat.io/openshift3/metrics-hawkular-metrics:{{ openshift_image_tag }}"
+#openshift_metrics_schema_installer_image="registry.redhat.io/openshift3/metrics-schema-installer:{{ openshift_image_tag }}"
+#openshift_metrics_heapster_image="registry.redhat.io/openshift3/metrics-heapster:{{ openshift_image_tag }}"
 #
 # StorageClass
 # openshift_storageclass_name=gp2
@@ -898,7 +898,7 @@ debug_level=2
 # Specify an openshift_service_catalog image
 # (defaults for origin and openshift-enterprise, repsectively)
 #openshift_service_catalog_image="docker.io/openshift/origin-service-catalog:{{ openshift_image_tag }}""
-#openshift_service_catalog_image="registry.access.redhat.com/openshift3/ose-service-catalog:{{ openshift_image_tag }}"
+#openshift_service_catalog_image="registry.redhat.io/openshift3/ose-service-catalog:{{ openshift_image_tag }}"
 
 # TSB image tag
 #template_service_broker_version='v3.9'

+ 1 - 1
playbooks/adhoc/docker_storage_cleanup/docker_storage_cleanup.yml

@@ -52,7 +52,7 @@
     ignore_errors: yes
 
   - name: Remove non-running docker images
-    shell: "docker images | grep -v -e registry.access.redhat.com -e docker-registry.usersys.redhat.com -e docker-registry.ops.rhcloud.com | awk '{print $3}' | xargs --no-run-if-empty docker rmi 2>/dev/null"
+    shell: "docker images | grep -v -e registry.redhat.io -e registry.access.redhat.com -e docker-registry.usersys.redhat.com -e docker-registry.ops.rhcloud.com | awk '{print $3}' | xargs --no-run-if-empty docker rmi 2>/dev/null"
     ignore_errors: yes
 
   # leaving off the '-t' for docker exec.  With it, it doesn't work with ansible and tty support

+ 1 - 1
roles/ansible_service_broker/defaults/main.yml

@@ -24,7 +24,7 @@ ansible_service_broker_local_registry_whitelist: []
 
 l_asb_default_images_dict:
   origin: 'docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-ansible-service-broker:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-ansible-service-broker:${version}'
 
 l_asb_default_images_default: "{{ l_asb_default_images_dict[openshift_deployment_type] }}"
 l_asb_image_url: "{{ oreg_url | default(l_asb_default_images_default) | regex_replace('${version}' | regex_escape, openshift_image_tag) }}"

+ 1 - 1
roles/ansible_service_broker/vars/openshift-enterprise.yml

@@ -1,7 +1,7 @@
 ---
 __ansible_service_broker_registry_type: rhcc
 __ansible_service_broker_registry_name: rh
-__ansible_service_broker_registry_url: "https://registry.access.redhat.com"
+__ansible_service_broker_registry_url: "https://registry.redhat.io"
 __ansible_service_broker_registry_user: null
 __ansible_service_broker_registry_password: null
 __ansible_service_broker_registry_organization: null

+ 2 - 2
roles/container_runtime/defaults/main.yml

@@ -19,7 +19,7 @@ openshift_docker_additional_registries: []
 openshift_docker_blocked_registries: []
 openshift_docker_insecure_registries: []
 
-openshift_docker_ent_reg: 'registry.access.redhat.com'
+openshift_docker_ent_reg: 'registry.redhat.io'
 
 openshift_docker_options: False  # str
 openshift_docker_log_driver: False  # str
@@ -88,7 +88,7 @@ l_openshift_image_tag: "{{ openshift_image_tag | default(l_openshift_image_tag_d
 
 l_crio_pause_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-${component}:${version}'
 l_pause_registry_url_default: "{{ l_crio_pause_images_dict[openshift_deployment_type] }}"
 
 pause_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'pod') }}"

+ 1 - 1
roles/container_runtime/templates/registries.conf

@@ -11,7 +11,7 @@
 
 
 #registries:
-#  - registry.access.redhat.com
+#  - registry.redhat.io
 
 {% if l2_docker_additional_registries %}
 registries:

+ 1 - 1
roles/etcd/defaults/main.yaml

@@ -19,7 +19,7 @@ r_etcd_default_version: "3.2.22"
 osm_etcd_image: "{{ etcd_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 etcd_image_dict:
   origin: "quay.io/coreos/etcd:v{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"
-  openshift-enterprise: "registry.access.redhat.com/rhel7/etcd:{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"
+  openshift-enterprise: "registry.redhat.io/rhel7/etcd:{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"
 etcd_image: "{{ osm_etcd_image }}"
 
 # etcd run on a host => use etcdctl command directly

+ 1 - 1
roles/openshift_autoheal/defaults/main.yml

@@ -8,7 +8,7 @@ openshift_autoheal_image_dict:
     prefix: "docker.io/openshift/"
     version: v0.0.1
   openshift-enterprise:
-    prefix: "registry.access.redhat.com/openshift3/ose-"
+    prefix: "registry.redhat.io/openshift3/ose-"
     version: "{{ openshift_image_tag }}"
 openshift_autoheal_image_prefix: "{{ openshift_autoheal_image_dict[openshift_deployment_type]['prefix'] }}"
 openshift_autoheal_image_version: "{{ openshift_autoheal_image_dict[openshift_deployment_type]['version'] }}"

+ 1 - 1
roles/openshift_examples/defaults/main.yml

@@ -29,5 +29,5 @@ registry_host: "{{ openshift_examples_registryurl.split('/')[0] if '.' in opensh
 
 openshift_hosted_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-${component}:${version}'
 openshift_examples_registryurl: "{{ oreg_url_master | default(oreg_url) | default(openshift_hosted_images_dict[openshift_deployment_type]) }}"

+ 2 - 2
roles/openshift_examples/tasks/main.yml

@@ -61,9 +61,9 @@
   failed_when: "'already exists' not in oex_imagestream_import_secret.stderr and oex_imagestream_import_secret.rc != 0"
   changed_when: false
 
-- name: Modify registry paths if registry_url is not registry.access.redhat.com
+- name: Modify registry paths if registry_url is not registry.redhat.io
   shell: >
-    find {{ examples_base }} -type f | xargs -n 1 sed -i 's|registry.access.redhat.com|{{ registry_host | quote }}|g'
+    find {{ examples_base }} -type f | xargs -n 1 sed -i 's|registry.redhat.io|{{ registry_host | quote }}|g'
   when: registry_host != '' and openshift_examples_modify_imagestreams | default(False) | bool
 
 # RHEL and Centos image streams are mutually exclusive

+ 2 - 2
roles/openshift_facts/defaults/main.yml

@@ -2,13 +2,13 @@
 openshift_client_binary: "{{ (openshift_is_atomic | bool) | ternary('/usr/local/bin/oc', 'oc') }}"
 
 system_images_registry_dict:
-  openshift-enterprise: "registry.access.redhat.com"
+  openshift-enterprise: "registry.redhat.io"
   origin: "docker.io"
 system_images_registry: "{{ system_images_registry_dict[openshift_deployment_type | default('origin')] }}"
 
 l_openshift_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-${component}:${version}'
 
 l_osm_registry_url_default: "{{ l_openshift_images_dict[openshift_deployment_type] }}"
 l_osm_registry_url: "{{ oreg_url_master | default(oreg_url) | default(l_osm_registry_url_default) | regex_replace('${version}' | regex_escape, openshift_image_tag | default('${version}')) }}"

+ 3 - 3
roles/openshift_health_checker/openshift_checks/docker_image_availability.py

@@ -59,8 +59,8 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         deployment_type = self.get_var("openshift_deployment_type", default="")
         if deployment_type == "origin" and "docker.io" not in regs:
             regs.append("docker.io")
-        elif deployment_type == 'openshift-enterprise' and "registry.access.redhat.com" not in regs:
-            regs.append("registry.access.redhat.com")
+        elif deployment_type == 'openshift-enterprise' and "registry.redhat.io" not in regs:
+            regs.append("registry.redhat.io")
         self.registries["configured"] = regs
 
         # for the oreg_url registry there may be credentials specified
@@ -240,7 +240,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         registries = self.registries["configured"]
         # If image already includes a registry, only use that.
         # NOTE: This logic would incorrectly identify images that do not use a namespace, e.g.
-        # registry.access.redhat.com/rhel7 as if the registry were a namespace.
+        # registry.redhat.io/rhel7 as if the registry were a namespace.
         # It's not clear that there's any way to distinguish them, but fortunately
         # the current set of images all look like [registry/]namespace/name[:version].
         if image.count("/") > 1:

+ 1 - 1
roles/openshift_health_checker/test/docker_image_availability_test.py

@@ -65,7 +65,7 @@ def test_all_images_available_remotely(task_vars, available_locally):
             return {'images': [], 'failed': available_locally}
         return {}
 
-    task_vars['openshift_docker_additional_registries'] = ["docker.io", "registry.access.redhat.com"]
+    task_vars['openshift_docker_additional_registries'] = ["docker.io", "registry.redhat.io"]
     task_vars['openshift_image_tag'] = 'v3.4'
     check = DockerImageAvailability(execute_module, task_vars)
     check._module_retry_interval = 0

+ 1 - 1
roles/openshift_hosted/README.md

@@ -67,7 +67,7 @@ Example Playbook
       certfile: /path/to/my-router.crt
       keyfile: /path/to/my-router.key
       cafile: /path/to/my-router-ca.crt
-    openshift_hosted_router_registryurl: 'registry.access.redhat.com/openshift3/ose-haproxy-router:v3.0.2.0'
+    openshift_hosted_router_registryurl: 'registry.redhat.io/openshift3/ose-haproxy-router:v3.0.2.0'
     openshift_hosted_router_selector: 'type=infra'
     openshift_hosted_registry_storage_kind=glusterfs
     openshift_hosted_registry_storage_glusterfs_path=external_glusterfs_volume_name

+ 1 - 1
roles/openshift_hosted/defaults/main.yml

@@ -22,7 +22,7 @@ openshift_cluster_domain: 'cluster.local'
 
 openshift_hosted_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-${component}:${version}'
 
 ##########
 # Router #

+ 1 - 1
roles/openshift_hosted_templates/defaults/main.yml

@@ -6,7 +6,7 @@ content_version: "{{ openshift_examples_content_version }}"
 
 openshift_hosted_images_dict:
   origin: 'docker.io/openshift/origin-${component}:${version}'
-  openshift-enterprise: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+  openshift-enterprise: 'registry.redhat.io/openshift3/ose-${component}:${version}'
 
 openshift_hosted_templates_registryurl: "{{ oreg_url_master | default(oreg_url) | default(openshift_hosted_images_dict[openshift_deployment_type]) | regex_replace('${version}' | regex_escape, openshift_image_tag | default('${version}')) }}"
 registry_host: "{{ openshift_hosted_templates_registryurl.split('/')[0] if '.' in openshift_hosted_templates_registryurl.split('/')[0] else '' }}"

+ 2 - 2
roles/openshift_hosted_templates/tasks/main.yml

@@ -35,9 +35,9 @@
 - name: Cleanup the OpenShift hosted templates temp dir
   local_action: file dest="{{ copy_hosted_templates_mktemp.stdout }}" state=absent
 
-- name: Modify registry paths if registry_url is not registry.access.redhat.com
+- name: Modify registry paths if registry_url is not registry.redhat.io
   shell: >
-    find {{ hosted_base }} -type f | xargs -n 1 sed -i 's|registry.access.redhat.com|{{ registry_host | quote }}|g'
+    find {{ hosted_base }} -type f | xargs -n 1 sed -i 's|registry.redhat.io|{{ registry_host | quote }}|g'
   when: registry_host != '' and openshift_hosted_modify_imagestreams | default(openshift_examples_modify_imagestreams | default(False)) | bool
 
 - name: Create temp directory for kubeconfig

+ 1 - 1
roles/openshift_logging/README.md

@@ -262,7 +262,7 @@ $ docker inspect ff2e249fc45a
                 . . .
                 "release": "0.143.3.0",
                 . . .
-                "url": "https://access.redhat.com/containers/#/registry.access.redhat.com/openshift3/logging-fluentd/images/v3.7.0-0.143.3.0",
+                "url": "https://access.redhat.com/containers/#/registry.redhat.io/openshift3/logging-fluentd/images/v3.7.0-0.143.3.0",
                 . . .
                 "version": "v3.7.0"
             }

+ 1 - 1
roles/openshift_management/files/templates/cloudforms/cfme-backup-job.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest
+        image: registry.redhat.io/cloudforms46/cfme-openshift-postgresql:latest
         command:
         - "/opt/rh/cfme-container-scripts/backup_db"
         env:

+ 1 - 1
roles/openshift_management/files/templates/cloudforms/cfme-restore-job.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
       - name: postgresql
-        image: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql:latest
+        image: registry.redhat.io/cloudforms46/cfme-openshift-postgresql:latest
         command:
         - "/opt/rh/cfme-container-scripts/restore_db"
         env:

+ 5 - 5
roles/openshift_management/files/templates/cloudforms/cfme-template-ext-db.yaml

@@ -884,7 +884,7 @@ parameters:
 - name: MEMCACHED_IMG_NAME
   displayName: Memcached Image Name
   description: This is the Memcached image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached
+  value: registry.redhat.io/cloudforms46/cfme-openshift-memcached
 - name: MEMCACHED_IMG_TAG
   displayName: Memcached Image Tag
   description: This is the Memcached image tag/version requested to deploy.
@@ -892,11 +892,11 @@ parameters:
 - name: FRONTEND_APPLICATION_IMG_NAME
   displayName: Frontend Application Image Name
   description: This is the Frontend Application image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui
+  value: registry.redhat.io/cloudforms46/cfme-openshift-app-ui
 - name: BACKEND_APPLICATION_IMG_NAME
   displayName: Backend Application Image Name
   description: This is the Backend Application image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-app
+  value: registry.redhat.io/cloudforms46/cfme-openshift-app
 - name: FRONTEND_APPLICATION_IMG_TAG
   displayName: Front end Application Image Tag
   description: This is the CloudForms Frontend Application image tag/version requested to deploy.
@@ -908,7 +908,7 @@ parameters:
 - name: ANSIBLE_IMG_NAME
   displayName: Ansible Image Name
   description: This is the Ansible image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible
+  value: registry.redhat.io/cloudforms46/cfme-openshift-embedded-ansible
 - name: ANSIBLE_IMG_TAG
   displayName: Ansible Image Tag
   description: This is the Ansible image tag/version requested to deploy.
@@ -944,7 +944,7 @@ parameters:
 - name: HTTPD_IMG_NAME
   displayName: Apache httpd Image Name
   description: This is the httpd image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd
+  value: registry.redhat.io/cloudforms46/cfme-openshift-httpd
 - name: HTTPD_IMG_TAG
   displayName: Apache httpd Image Tag
   description: This is the httpd image tag/version requested to deploy.

+ 6 - 6
roles/openshift_management/files/templates/cloudforms/cfme-template.yaml

@@ -1042,7 +1042,7 @@ parameters:
 - name: POSTGRESQL_IMG_NAME
   displayName: PostgreSQL Image Name
   description: This is the PostgreSQL image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-postgresql
+  value: registry.redhat.io/cloudforms46/cfme-openshift-postgresql
 - name: POSTGRESQL_IMG_TAG
   displayName: PostgreSQL Image Tag
   description: This is the PostgreSQL image tag/version requested to deploy.
@@ -1050,7 +1050,7 @@ parameters:
 - name: MEMCACHED_IMG_NAME
   displayName: Memcached Image Name
   description: This is the Memcached image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-memcached
+  value: registry.redhat.io/cloudforms46/cfme-openshift-memcached
 - name: MEMCACHED_IMG_TAG
   displayName: Memcached Image Tag
   description: This is the Memcached image tag/version requested to deploy.
@@ -1058,11 +1058,11 @@ parameters:
 - name: FRONTEND_APPLICATION_IMG_NAME
   displayName: Frontend Application Image Name
   description: This is the Frontend Application image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-app-ui
+  value: registry.redhat.io/cloudforms46/cfme-openshift-app-ui
 - name: BACKEND_APPLICATION_IMG_NAME
   displayName: Backend Application Image Name
   description: This is the Backend Application image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-app
+  value: registry.redhat.io/cloudforms46/cfme-openshift-app
 - name: FRONTEND_APPLICATION_IMG_TAG
   displayName: Front end Application Image Tag
   description: This is the CloudForms Frontend Application image tag/version requested to deploy.
@@ -1074,7 +1074,7 @@ parameters:
 - name: ANSIBLE_IMG_NAME
   displayName: Ansible Image Name
   description: This is the Ansible image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-embedded-ansible
+  value: registry.redhat.io/cloudforms46/cfme-openshift-embedded-ansible
 - name: ANSIBLE_IMG_TAG
   displayName: Ansible Image Tag
   description: This is the Ansible image tag/version requested to deploy.
@@ -1115,7 +1115,7 @@ parameters:
 - name: HTTPD_IMG_NAME
   displayName: Apache httpd Image Name
   description: This is the httpd image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-openshift-httpd
+  value: registry.redhat.io/cloudforms46/cfme-openshift-httpd
 - name: HTTPD_IMG_TAG
   displayName: Apache httpd Image Tag
   description: This is the httpd image tag/version requested to deploy.

+ 1 - 1
roles/openshift_metrics/README.md

@@ -138,7 +138,7 @@ $ docker inspect 9c3597aeb39f
                 . . .
                 "release": "0.143.4.0",
                 . . .
-                "url": "https://access.redhat.com/containers/#/registry.access.redhat.com/openshift3/metrics-cassandra/images/v3.7.0-0.143.4.0",
+                "url": "https://access.redhat.com/containers/#/registry.redhat.io/openshift3/metrics-cassandra/images/v3.7.0-0.143.4.0",
                 . . .
                 "version": "v3.7.0"
             }

+ 1 - 1
roles/openshift_node_problem_detector/defaults/main.yaml

@@ -10,7 +10,7 @@ openshift_node_problem_detector_image_dict:
     prefix: "docker.io/openshift/"
     version: "{{ openshift_image_tag }}"
   openshift-enterprise:
-    prefix: "registry.access.redhat.com/openshift3/ose-"
+    prefix: "registry.redhat.io/openshift3/ose-"
     version: "{{ openshift_image_tag }}"
 
 openshift_node_problem_detector_image_prefix: "{{ openshift_node_problem_detector_image_dict[openshift_deployment_type]['prefix'] }}"

+ 1 - 1
roles/openshift_provisioners/defaults/main.yaml

@@ -11,7 +11,7 @@ openshift_provisioners_project: openshift-infra
 
 openshift_provisioners_image_prefix_dict:
   origin: "docker.io/openshift/origin-"
-  openshift-enterprise: "registry.access.redhat.com/openshift3/"
+  openshift-enterprise: "registry.redhat.io/openshift3/"
 
 openshift_provisioners_image_version_dict:
   origin: "latest"

+ 4 - 4
roles/openshift_storage_glusterfs/defaults/main.yml

@@ -5,22 +5,22 @@
 # becomes "oreg.example.com/rhgs3/rhgs-server-rhel7:latest"
 l_gluster_image_dict:
   origin: "docker.io/gluster/gluster-centos:latest"
-  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-server-rhel7:latest"
+  openshift-enterprise: "registry.redhat.io/rhgs3/rhgs-server-rhel7:latest"
 openshift_storage_glusterfs_image: "{{ l_gluster_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 
 l_gluster_block_image_dict:
   origin: "docker.io/gluster/glusterblock-provisioner:latest"
-  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-gluster-block-prov-rhel7:latest"
+  openshift-enterprise: "registry.redhat.io/rhgs3/rhgs-gluster-block-prov-rhel7:latest"
 openshift_storage_glusterfs_block_image: "{{ l_gluster_block_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 
 l_gluster_s3_image_dict:
   origin: "docker.io/gluster/gluster-object:latest"
-  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-s3-server-rhel7:latest"
+  openshift-enterprise: "registry.redhat.io/rhgs3/rhgs-s3-server-rhel7:latest"
 openshift_storage_glusterfs_s3_image: "{{ l_gluster_s3_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 
 l_gluster_heketi_image_dict:
   origin: "docker.io/heketi/heketi:latest"
-  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-volmanager-rhel7:latest"
+  openshift-enterprise: "registry.redhat.io/rhgs3/rhgs-volmanager-rhel7:latest"
 openshift_storage_glusterfs_heketi_image: "{{ l_gluster_heketi_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 
 openshift_storage_glusterfs_timeout: 300