summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-05 10:31:38 -0400
committerGitHub <noreply@github.com>2016-10-05 10:31:38 -0400
commita2c88dca9c83491848f866a4ba90541da8408c4c (patch)
treec6be62a417af70396d40a14eed00f7b9d67b37cd
parent0c01e07493a4660f3eade5b96abefaa5b1f062b9 (diff)
parent65e896d32055364e3a8082f2cd27b193bd0614b0 (diff)
downloadopenshift-a2c88dca9c83491848f866a4ba90541da8408c4c.tar.gz
openshift-a2c88dca9c83491848f866a4ba90541da8408c4c.tar.bz2
openshift-a2c88dca9c83491848f866a4ba90541da8408c4c.tar.xz
openshift-a2c88dca9c83491848f866a4ba90541da8408c4c.zip
Merge pull request #2544 from abutcher/registry-check
Don't secure registry or deploy registry console when infra replicas == 0
-rw-r--r--roles/cockpit-ui/tasks/main.yml14
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml1
2 files changed, 15 insertions, 0 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml
index c573da6d6..87ed7fee7 100644
--- a/roles/cockpit-ui/tasks/main.yml
+++ b/roles/cockpit-ui/tasks/main.yml
@@ -12,6 +12,15 @@
cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ openshift_hosted_kubeconfig }}
changed_when: False
+- name: Determine if docker-registry service exists
+ command: >
+ {{ openshift.common.client_binary }} get svc/docker-registry
+ --config={{ openshift_hosted_kubeconfig }}
+ -n default
+ register: check_docker_registry_exists
+ failed_when: false
+ changed_when: false
+
- name: Create passthrough route for docker-registry
command: >
{{ openshift.common.client_binary }} create route passthrough
@@ -21,6 +30,7 @@
register: create_docker_registry_route
changed_when: "'already exists' not in create_docker_registry_route.stderr"
failed_when: "'already exists' not in create_docker_registry_route.stderr and create_docker_registry_route.rc != 0"
+ when: check_docker_registry_exists.rc == 0
- name: Create passthrough route for registry-console
command: >
@@ -32,6 +42,7 @@
register: create_registry_console_route
changed_when: "'already exists' not in create_registry_console_route.stderr"
failed_when: "'already exists' not in create_registry_console_route.stderr and create_registry_console_route.rc != 0"
+ when: check_docker_registry_exists.rc == 0
- name: Retrieve docker-registry route
command: >
@@ -41,6 +52,7 @@
-n default
register: docker_registry_route
changed_when: false
+ when: check_docker_registry_exists.rc == 0
- name: Retrieve cockpit kube url
command: >
@@ -49,6 +61,7 @@
-n default
register: registry_console_cockpit_kube_url
changed_when: false
+ when: check_docker_registry_exists.rc == 0
- name: Deploy registry-console
command: >
@@ -62,6 +75,7 @@
register: deploy_registry_console
changed_when: "'already exists' not in deploy_registry_console.stderr"
failed_when: "'already exists' not in deploy_registry_console.stderr and deploy_registry_console.rc != 0"
+ when: check_docker_registry_exists.rc == 0
- name: Delete temp directory
file:
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index ed0a2b38d..4e525a2da 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/roles/openshift_hosted/tasks/registry/registry.yml
@@ -53,6 +53,7 @@
- include: secure.yml
static: no
+ when: replicas | int > 0
- include: storage/object_storage.yml
static: no