summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2018-01-24 11:39:48 -0500
committerKenny Woodson <kwoodson@redhat.com>2018-02-01 21:27:28 -0500
commit8e0b7761a128a4851db439b9597869b17b6174b1 (patch)
tree10f1a50001cbe2133afcc21fa34198fd08d10d5c /playbooks/common
parent4fe88b001295566d49db1fe711870bf43c40c1ab (diff)
downloadopenshift-8e0b7761a128a4851db439b9597869b17b6174b1.tar.gz
openshift-8e0b7761a128a4851db439b9597869b17b6174b1.tar.bz2
openshift-8e0b7761a128a4851db439b9597869b17b6174b1.tar.xz
openshift-8e0b7761a128a4851db439b9597869b17b6174b1.zip
Upgrade to migrate to using push to DNS for registries.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/post_control_plane.yml16
1 files changed, 16 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
index de612da21..f44ab3580 100644
--- a/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/post_control_plane.yml
@@ -113,6 +113,22 @@
registry_url: "{{ openshift.master.registry_url }}"
openshift_hosted_templates_import_command: replace
+ post_tasks:
+ # we need to migrate customers to the new pattern of pushing to the registry via dns
+ # Step 1: verify the certificates have the docker registry service name
+ - shell: >
+ echo -n | openssl s_client -showcerts -servername docker-registry.default.svc -connect docker-registry.default.svc:5000 | openssl x509 -text | grep -A1 'X509v3 Subject Alternative Name:' | grep -Pq 'DNS:docker-registry\.default\.svc(,|$)'
+ register: cert_output
+
+ # Step 2: Set a fact to be used to determine if we should run the redeploy of registry certs
+ - name: set a fact to include the registry certs playbook if needed
+ set_fact:
+ openshift_hosted_rollout_certs_and_registry: "{{ cert_output.rc == 0 }}"
+
+# Run the redeploy certs based upon the certificates
+- when: hostvars[groups.oo_first_master.0].openshift_hosted_rollout_certs_and_registry
+ import_playbook: ../../../openshift-hosted/redeploy-registry-certificates.yml
+
# Check for warnings to be printed at the end of the upgrade:
- name: Clean up and display warnings
hosts: oo_masters_to_config