Convert all remaining registry.access.redhat.com to registry.redhat.io

README_CONTAINERIZED_INSTALLATION.md

@@ -49,9 +49,9 @@ before attempting to pull any of the following images.
         docker.io/openshift/openvswitch (centos7 + openvswitch rpm, runs ovsdb ovsctl processes)
         registry.redhat.io/rhel7/etcd
     OpenShift Container Platform
-        registry.access.redhat.com/openshift3/ose
-        registry.access.redhat.com/openshift3/node
-        registry.access.redhat.com/openshift3/openvswitch
+        registry.redhat.io/openshift3/ose
+        registry.redhat.io/openshift3/node
+        registry.redhat.io/openshift3/openvswitch
         registry.redhat.io/rhel7/etcd
 
   * note openshift3/* images come from registry.redhat.io and

inventory/hosts.example

@@ -168,7 +168,7 @@ debug_level=2
 # openshift_master_upgrade_post_hook=/usr/share/custom/post_master.yml
 
 # Cluster Image Source (registry) configuration
-# openshift-enterprise default is 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+# openshift-enterprise default is 'registry.redhat.io/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.redhat.io we can

roles/cockpit-ui/files/registry-console.yaml

@@ -89,7 +89,7 @@ objects:
     redirectURIs:
       - "${COCKPIT_KUBE_URL}"
 parameters:
-  - description: 'Specify fully qualified image name and version; e.g. for "registry.access.redhat.com/openshift3/registry-console:v3.11"'
+  - description: 'Specify fully qualified image name and version; e.g. for "registry.redhat.io/openshift3/registry-console:v3.11"'
     name: IMAGE_NAME
     value: "openshift3/registry-console:latest"
   - description: "The public URL for the Openshift OAuth Provider, e.g. https://openshift.example.com:8443"

roles/lib_openshift/library/oc_adm_registry.py

@@ -97,7 +97,7 @@ options:
   images:
     description:
     - The image to base this registry on - ${component} will be replaced with --type
-    required: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+    required: 'registry.redhat.io/openshift3/ose-${component}:${version}'
     default: None
     aliases: []
   latest_images:
@@ -203,7 +203,7 @@ EXAMPLES = '''
     replicas: 2
     namespace: default
     selector: type=infra
-    images: "registry.access.redhat.com/openshift3/ose-${component}:${version}"
+    images: "registry.redhat.io/openshift3/ose-${component}:${version}"
     env_vars:
       REGISTRY_CONFIGURATION_PATH: /etc/registryconfig/config.yml
       REGISTRY_HTTP_TLS_CERTIFICATE: /etc/secrets/registry.crt

roles/lib_openshift/library/oc_adm_router.py

@@ -100,7 +100,7 @@ options:
   images:
     description:
     - The image to base this router on - ${component} will be replaced with --type
-    required: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+    required: 'registry.redhat.io/openshift3/ose-${component}:${version}'
     default: None
     aliases: []
   latest_images:
@@ -3204,7 +3204,7 @@ def main():
             default_cert=dict(default=None, type='str'),
             cert_file=dict(default=None, type='str'),
             key_file=dict(default=None, type='str'),
-            images=dict(default=None, type='str'), #'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+            images=dict(default=None, type='str'), #'registry.redhat.io/openshift3/ose-${component}:${version}'
             latest_images=dict(default=False, type='bool'),
             labels=dict(default=None, type='dict'),
             ports=dict(default=['80:80', '443:443'], type='list'),

roles/lib_openshift/src/ansible/oc_adm_router.py

@@ -19,7 +19,7 @@ def main():
             default_cert=dict(default=None, type='str'),
             cert_file=dict(default=None, type='str'),
             key_file=dict(default=None, type='str'),
-            images=dict(default=None, type='str'), #'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+            images=dict(default=None, type='str'), #'registry.redhat.io/openshift3/ose-${component}:${version}'
             latest_images=dict(default=False, type='bool'),
             labels=dict(default=None, type='dict'),
             ports=dict(default=['80:80', '443:443'], type='list'),

roles/lib_openshift/src/doc/registry

@@ -44,7 +44,7 @@ options:
   images:
     description:
     - The image to base this registry on - ${component} will be replaced with --type
-    required: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+    required: 'registry.redhat.io/openshift3/ose-${component}:${version}'
     default: None
     aliases: []
   latest_images:
@@ -150,7 +150,7 @@ EXAMPLES = '''
     replicas: 2
     namespace: default
     selector: type=infra
-    images: "registry.access.redhat.com/openshift3/ose-${component}:${version}"
+    images: "registry.redhat.io/openshift3/ose-${component}:${version}"
     env_vars:
       REGISTRY_CONFIGURATION_PATH: /etc/registryconfig/config.yml
       REGISTRY_HTTP_TLS_CERTIFICATE: /etc/secrets/registry.crt

roles/lib_openshift/src/doc/router

@@ -47,7 +47,7 @@ options:
   images:
     description:
     - The image to base this router on - ${component} will be replaced with --type
-    required: 'registry.access.redhat.com/openshift3/ose-${component}:${version}'
+    required: 'registry.redhat.io/openshift3/ose-${component}:${version}'
     default: None
     aliases: []
   latest_images:

roles/lib_openshift/src/test/unit/test_oc_adm_registry.py

@@ -102,7 +102,7 @@ class RegistryTest(unittest.TestCase):
                             "containers": [
                                 {
                                     "name": "registry",
-                                    "image": "registry.access.redhat.com/openshift3/ose-docker-registry:v3.5.0.39",
+                                    "image": "registry.redhat.io/openshift3/ose-docker-registry:v3.5.0.39",
                                     "ports": [
                                         {
                                             "containerPort": 5000

roles/lib_openshift/src/test/unit/test_oc_adm_router.py

@@ -109,7 +109,7 @@ class RouterTest(unittest.TestCase):
                         "containers": [
                             {
                                 "name": "router",
-                                "image": "registry.access.redhat.com/openshift3/ose-haproxy-router:v3.5.0.39",
+                                "image": "registry.redhat.io/openshift3/ose-haproxy-router:v3.5.0.39",
                                 "ports": [
                                     {
                                         "containerPort": 80

roles/openshift_examples/files/examples/latest/cfme-templates/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:

roles/openshift_examples/files/examples/latest/cfme-templates/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:

roles/openshift_examples/files/examples/latest/cfme-templates/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.

roles/openshift_examples/files/examples/latest/cfme-templates/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.

roles/openshift_examples/files/examples/latest/cfme-templates/httpd-configmap-generator-template.yaml

@@ -91,7 +91,7 @@ parameters:
 - name: HTTPD_CONFIGMAP_GENERATOR_IMG_NAME
   displayName: Httpd Configmap Generator Image Name
   description: This is the httpd configmap generator image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-httpd-configmap-generator
+  value: registry.redhat.io/cloudforms46/cfme-httpd-configmap-generator
 - name: HTTPD_CONFIGMAP_GENERATOR_IMG_TAG
   displayName: Httpd Configmap Generator Image Tag
   description: This is the httpd configmap generator image tag/version requested to deploy.

roles/openshift_examples/files/examples/latest/cfme-templates/jboss-middleware-manager-template.yaml

@@ -29,11 +29,11 @@ parameters:
 - name: HAWKULAR_SERVICES_IMAGE
   description: What docker image should be used for hawkular-services.
   displayName: Hawkular Services Docker Image
-  value: registry.access.redhat.com/jboss-mm-7-tech-preview/middleware-manager:latest
+  value: registry.redhat.io/jboss-mm-7-tech-preview/middleware-manager:latest
 - name: CASSANDRA_IMAGE
   description: What docker image should be used for cassandra node.
   displayName: Cassandra Docker Image
-  value: registry.access.redhat.com/openshift3/metrics-cassandra:3.5.0
+  value: registry.redhat.io/openshift3/metrics-cassandra:3.5.0
 - name: CASSANDRA_MEMORY_LIMIT
   description: Maximum amount of memory for Cassandra container.
   displayName: Cassandra Memory Limit

roles/openshift_examples/files/examples/latest/xpaas-streams/rhpam70-image-streams.yaml

@@ -24,7 +24,7 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-businesscentral-openshift:1.0
+        name: registry.redhat.io/rhpam-7/rhpam70-businesscentral-openshift:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -43,7 +43,7 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-businesscentral-monitoring-openshift:1.0
+        name: registry.redhat.io/rhpam-7/rhpam70-businesscentral-monitoring-openshift:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -62,7 +62,7 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-controller-openshift:1.0
+        name: registry.redhat.io/rhpam-7/rhpam70-controller-openshift:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -81,7 +81,7 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-kieserver-openshift:1.0
+        name: registry.redhat.io/rhpam-7/rhpam70-kieserver-openshift:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -100,7 +100,7 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-smartrouter-openshift:1.0
+        name: registry.redhat.io/rhpam-7/rhpam70-smartrouter-openshift:1.0
 - kind: ImageStream
   apiVersion: v1
   metadata:
@@ -119,5 +119,4 @@ items:
         version: '1.0'
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/rhpam-7/rhpam70-businesscentral-indexing-openshift:1.0
-
+        name: registry.redhat.io/rhpam-7/rhpam70-businesscentral-indexing-openshift:1.0

roles/openshift_health_checker/openshift_checks/docker_image_availability.py

@@ -19,7 +19,7 @@ DEPLOYMENT_IMAGE_INFO = {
     "openshift-enterprise": {
         "namespace": "openshift3",
         "name": "ose",
-        "registry_console_prefix": "registry.access.redhat.com/openshift3/",
+        "registry_console_prefix": "registry.redhat.io/openshift3/",
         "registry_console_basename": "registry-console",
         "registry_console_default_version": "${short_version}",
     },
@@ -150,7 +150,7 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
         For now we operate as follows:
         * For containerized components (master, node, ...) we look at the deployment
           type and use docker.io/openshift/origin or
-          registry.access.redhat.com/openshift3/ose as the base for those component
+          registry.redhat.io/openshift3/ose as the base for those component
           images. The version is openshift_image_tag as determined by the
           openshift_version role.
         * For OpenShift-managed infrastructure (router, registry...) we use oreg_url if

roles/openshift_health_checker/test/docker_image_availability_test.py

@@ -196,7 +196,7 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
             'docker.io/openshift/origin-haproxy-router:vtest',
             'docker.io/cockpit/kubernetes:latest',
             # containerized component images
-            'registry.access.redhat.com/openshift3/ose-node:vtest',
+            'registry.redhat.io/openshift3/ose-node:vtest',
         ])
     ),
     (  # enterprise images
@@ -207,9 +207,9 @@ def test_registry_availability(image, registries, connection_test_failed, skopeo
             'foo.io/openshift3/ose-docker-registry:f13ac45',
             'foo.io/openshift3/ose-haproxy-router:f13ac45',
             # registry-console is not constructed/versioned the same as the others.
-            'registry.access.redhat.com/openshift3/registry-console:vtest',
+            'registry.redhat.io/openshift3/registry-console:vtest',
             # containerized images aren't built from oreg_url
-            'registry.access.redhat.com/openshift3/ose-node:vtest',
+            'registry.redhat.io/openshift3/ose-node:vtest',
         ])
     ),
 
@@ -221,7 +221,7 @@ def test_required_images(deployment_type, openshift_is_atomic, groups, oreg_url,
         group_names=groups,
         oreg_url=oreg_url,
         openshift_image_tag='vtest',
-        osn_image='registry.access.redhat.com/openshift3/ose-node:vtest',
+        osn_image='registry.redhat.io/openshift3/ose-node:vtest',
     )
 
     assert expected == DockerImageAvailability(task_vars=task_vars).required_images()
@@ -239,7 +239,7 @@ def test_required_images(deployment_type, openshift_is_atomic, groups, oreg_url,
             openshift_deployment_type="openshift-enterprise",
             openshift_image_tag="vtest",
         ),
-        "registry.access.redhat.com/openshift3/registry-console:vtest",
+        "registry.redhat.io/openshift3/registry-console:vtest",
     ), (
         dict(
             openshift_deployment_type="openshift-enterprise",
@@ -268,10 +268,10 @@ def test_registry_console_image(task_vars, expected):
         dict(
             group_names=['oo_nodes_to_config'],
             openshift_image_tag="veggs",
-            osn_image="registry.access.redhat.com/openshift3/ose-node:vtest",
+            osn_image="registry.redhat.io/openshift3/ose-node:vtest",
         ),
         set([
-            'registry.access.redhat.com/openshift3/ose-node:vtest', 'docker.io/cockpit/kubernetes:latest',
+            'registry.redhat.io/openshift3/ose-node:vtest', 'docker.io/cockpit/kubernetes:latest',
             'docker.io/openshift/origin-haproxy-router:veggs', 'docker.io/openshift/origin-deployer:veggs',
             'docker.io/openshift/origin-docker-registry:veggs', 'docker.io/openshift/origin-pod:veggs',
         ]),

roles/openshift_hosted/README.md

@@ -19,12 +19,12 @@ From this role:
 | Name                                  | Default value                            | Description                                                                                                              |
 |---------------------------------------|------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
 | openshift_hosted_router_certificate   | None                                     | Dictionary containing "certfile", "keyfile" and "cafile" keys with values containing paths to local certificate files.   |
-| openshift_hosted_router_registryurl   | 'registry.access.redhat.com/openshift3/ose-${component}:${version}' | The image to base the OpenShift router on.                                                                               |
+| openshift_hosted_router_registryurl   | 'registry.redhat.io/openshift3/ose-${component}:${version}' | The image to base the OpenShift router on.                                                                               |
 | openshift_hosted_router_replicas      | Number of nodes matching selector        | The number of replicas to configure.                                                                                     |
 | openshift_hosted_router_selector      | node-role.kubernetes.io/infra=true       | Node selector used when creating router. The OpenShift router will only be deployed to nodes matching this selector.     |
 | openshift_hosted_router_name          | router                                   | The name of the router to be created.                                                                                    |
 | openshift_hosted_router_extended_validation | True                               | Whether to configure the router to perform extended validation on routes before admitting them. |
-| openshift_hosted_registry_registryurl | 'registry.access.redhat.com/openshift3/ose-${component}:${version}' | The image to base the OpenShift registry on.                                                                             |
+| openshift_hosted_registry_registryurl | 'registry.redhat.io/openshift3/ose-${component}:${version}' | The image to base the OpenShift registry on.                                                                             |
 | openshift_hosted_registry_replicas    | Number of nodes matching selector        | The number of replicas to configure.                                                                                     |
 | openshift_hosted_registry_selector    | node-role.kubernetes.io/infra=true                   | Node selector used when creating registry. The OpenShift registry will only be deployed to nodes matching this selector. |
 | openshift_hosted_registry_cert_expire_days | `730` (2 years)                     | Validity of the certificates in days. Works only with OpenShift version 1.5 (3.5) and later.                             |

roles/openshift_management/files/templates/cloudforms/httpd-configmap-generator-template.yaml

@@ -91,7 +91,7 @@ parameters:
 - name: HTTPD_CONFIGMAP_GENERATOR_IMG_NAME
   displayName: Httpd Configmap Generator Image Name
   description: This is the httpd configmap generator image name requested to deploy.
-  value: registry.access.redhat.com/cloudforms46/cfme-httpd-configmap-generator
+  value: registry.redhat.io/cloudforms46/cfme-httpd-configmap-generator
 - name: HTTPD_CONFIGMAP_GENERATOR_IMG_TAG
   displayName: Httpd Configmap Generator Image Tag
   description: This is the httpd configmap generator image tag/version requested to deploy.