enable candidate-registry for osbs in prod

Signed-off-by: Adam Miller <admiller@redhat.com>

inventory/group_vars/buildarm

@@ -21,7 +21,7 @@ csi_relationship: |
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/buildhw

@@ -23,7 +23,7 @@ csi_relationship: |
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/buildvm

@@ -35,7 +35,7 @@ csi_relationship: |
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/buildvm-aarch64

@@ -34,7 +34,7 @@ csi_relationship: |
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/buildvm-s390

@@ -11,7 +11,7 @@ koji_topurl: "http://s390pkgs.fedoraproject.org/"
 
 # These variables are for koji-containerbuild/osbs
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/koji

@@ -45,7 +45,7 @@ nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid,nfsvers=4"
 virt_install_command: "{{ virt_install_command_two_nic }}"
 
 osbs_fqdn: "osbs.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 koji_root: "koji.fedoraproject.org/koji"
 koji_hub: "koji.fedoraproject.org/kojihub"

inventory/group_vars/osbs

@@ -9,8 +9,8 @@ tcp_ports: [ 80, 443, 8443]
 fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
-docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org"
-docker_registry: "registry.fedoraproject.org"
+docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org"
+docker_registry: "candidate-registry.fedoraproject.org"
 source_registry: "registry.fedoraproject.org"
 
 osbs_url: "osbs.fedoraproject.org"

playbooks/groups/docker-registry.yml

@@ -89,3 +89,10 @@
       when: env == "production",
       delegate_to: compose-x86-01.phx2.fedoraproject.org
     }
+    - {
+      role: push-docker,
+        docker_cert_name: "containerbuild",
+        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
+      when: env == "production",
+      delegate_to: compose-x86-01.phx2.fedoraproject.org
+    }

playbooks/groups/osbs-master.yml

@@ -80,7 +80,7 @@
     - {
       role: push-docker,
         docker_cert_name: "containerbuild",
-        docker_cert_dir: "/etc/docker/certs.d/registry.fedoraproject.org",
+        docker_cert_dir: "/etc/docker/certs.d/candidate-registry.fedoraproject.org",
       when: env == "production"
     }