Changes from kwoodson

openshift · Feb 22, 2017 · c31a20e · c31a20e
1 parent 48ff2f9
commit c31a20e
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/roles/openshift_hosted/tasks/router/router.yml b/roles/openshift_hosted/tasks/router/router.yml
@@ -12,17 +12,6 @@
   set_fact:
     replicas: "{{ openshift.hosted.router.replicas | default(router_nodes.results.results[0]['items'] | length) }}"
 
-- name: Create OpenShift router
-  oc_adm_router:
-    name: "{{ openshift.hosted.router.name | default('router') }}"
-    replicas: "{{ replicas }}"
-    namespace: "{{ openshift.hosted.router.namespace | default('default') }}"
-    # force_subdomain: "{{ openshift.hosted.router.force_subdomain | default(none) }}"
-    service_account: router
-    selector: "{{ openshift.hosted.router.selector | default(none) }}"
-    images: "{{ openshift.hosted.router.registryurl | default(none) }}"
-  when: replicas | int > 0
-
 - block:
 
   - name: Assert that 'certfile', 'keyfile' and 'cafile' keys provided in openshift_hosted_router_certificate
@@ -61,14 +50,20 @@
       dest: "{{ openshift_master_config_dir }}/openshift-router.pem"
       mode: 0600
 
-  - name: Add certificate to OpenShift Router
-    oc_adm_router:
-      name: "{{ openshift.hosted.router.name | default('router') }}"
-      namespace: "{{ openshift.hosted.router.namespace | default('default') }}"
-      default_cert: "{{ {{ openshift_master_config_dir }}/openshift-router.pem }}"
-
   when: openshift_hosted_router_certificate is defined
 
+- name: Create OpenShift router
+  oc_adm_router:
+    name: "{{ openshift.hosted.router.name | default('router') }}"
+    replicas: "{{ replicas }}"
+    namespace: "{{ openshift.hosted.router.namespace | default('default') }}"
+    # force_subdomain: "{{ openshift.hosted.router.force_subdomain | default(none) }}"
+    service_account: router
+    selector: "{{ openshift.hosted.router.selector | default(none) }}"
+    images: "{{ openshift.hosted.router.registryurl | default(none) }}"
+    default_cert: "{{ openshift_master_config_dir + '/openshift-router.pem' | default(omit) }}"
+  when: replicas | int > 0
+
 - name: Ensure router replica count matches desired
   oc_scale:
     kind: dc