diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-07-14 19:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 19:12:37 -0400 |
| commit | 9d4a0c00b0c554a8b7bd7242438806ce901831bc (patch) | |
| tree | acabd24cbddc711234fabf0eaa03f7f00d3cac68 | |
| parent | 1730f85865672b0d5475e1ef2556662379f71f69 (diff) | |
| parent | cbba0d689f8dbc8cf533142067a2c529dffa24f3 (diff) | |
| download | openshift-9d4a0c00b0c554a8b7bd7242438806ce901831bc.tar.gz openshift-9d4a0c00b0c554a8b7bd7242438806ce901831bc.tar.bz2 openshift-9d4a0c00b0c554a8b7bd7242438806ce901831bc.tar.xz openshift-9d4a0c00b0c554a8b7bd7242438806ce901831bc.zip | |
Merge pull request #4751 from jkaurredhat/redeploy-1.6
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/registry.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/redeploy-certificates/router.yml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml index 8c8062585..afd5463b2 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/registry.yml @@ -66,6 +66,7 @@ --signer-cert={{ openshift.common.config_base }}/master/ca.crt --signer-key={{ openshift.common.config_base }}/master/ca.key --signer-serial={{ openshift.common.config_base }}/master/ca.serial.txt + --config={{ mktemp.stdout }}/admin.kubeconfig --hostnames="{{ docker_registry_service_ip.results.clusterip }},docker-registry.default.svc,docker-registry.default.svc.cluster.local,{{ docker_registry_route_hostname }}" --cert={{ openshift.common.config_base }}/master/registry.crt --key={{ openshift.common.config_base }}/master/registry.key diff --git a/playbooks/common/openshift-cluster/redeploy-certificates/router.yml b/playbooks/common/openshift-cluster/redeploy-certificates/router.yml index 9f14f2d69..748bbbf91 100644 --- a/playbooks/common/openshift-cluster/redeploy-certificates/router.yml +++ b/playbooks/common/openshift-cluster/redeploy-certificates/router.yml @@ -116,8 +116,9 @@ tls.crt="{{ mktemp.stdout }}/openshift-hosted-router-certificate.pem" tls.key="{{ mktemp.stdout }}/openshift-hosted-router-certificate.key" --type=kubernetes.io/tls + --config={{ mktemp.stdout }}/admin.kubeconfig --confirm - -o json | {{ openshift.common.client_binary }} replace -f - + -o json | {{ openshift.common.client_binary }} --config={{ mktemp.stdout }}/admin.kubeconfig replace -f - - name: Remove temporary router certificate and key files file: |