summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-09 12:24:52 -0400
committerGitHub <noreply@github.com>2016-09-09 12:24:52 -0400
commitf85dd1604e9c3d011b24654e6c40c0345e2e96bb (patch)
treec3c6f8ce5c3eae529aaedcfbf86490bea88df70e
parent242aeba73a60a7ad113a80e8141478fe67b695a5 (diff)
parent437f096b7c7fbca08b748d3754be8a6f84faba06 (diff)
downloadopenshift-f85dd1604e9c3d011b24654e6c40c0345e2e96bb.tar.gz
openshift-f85dd1604e9c3d011b24654e6c40c0345e2e96bb.tar.bz2
openshift-f85dd1604e9c3d011b24654e6c40c0345e2e96bb.tar.xz
openshift-f85dd1604e9c3d011b24654e6c40c0345e2e96bb.zip
Merge pull request #2427 from abutcher/BZ1298336
Bug 1298336 - Rerunning the installer fails when not in default namespace
-rw-r--r--roles/openshift_hosted/tasks/registry/secure.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/secure.yml b/roles/openshift_hosted/tasks/registry/secure.yml
index ef1c7c5bc..4cb85df04 100644
--- a/roles/openshift_hosted/tasks/registry/secure.yml
+++ b/roles/openshift_hosted/tasks/registry/secure.yml
@@ -13,6 +13,8 @@
command: >
{{ openshift.common.client_binary }} get service docker-registry
--template='{{ '{{' }} .spec.clusterIP {{ '}}' }}'
+ --config={{ openshift_hosted_kubeconfig }}
+ -n default
register: docker_registry_service_ip
changed_when: false
@@ -74,6 +76,8 @@
{{ openshift.common.client_binary }} env dc/docker-registry
REGISTRY_HTTP_TLS_CERTIFICATE=/etc/secrets/registry.crt
REGISTRY_HTTP_TLS_KEY=/etc/secrets/registry.key
+ --config={{ openshift_hosted_kubeconfig }}
+ -n default
# These commands are on a single line to preserve patch json.
- name: Update registry liveness probe from HTTP to HTTPS