Merge pull request #721 from abutcher/fix-router

Conditionally include openshift_router role

playbooks/common/openshift-master/config.yml

@@ -256,7 +256,7 @@
 
 - name: Create services
   hosts: oo_first_master
-
   roles:
-    - openshift_router
-#    - openshift_registry
+  - role: openshift_router
+    when: openshift.master.infra_nodes is defined
+  #- role: openshift_registry

roles/openshift_router/tasks/main.yml

@@ -7,7 +7,7 @@
 - name: Deploy OpenShift Router
   command: >
     {{ openshift.common.admin_binary }} router
-    --create --replicas={{ num_infra }}
+    --create --replicas={{ openshift.master.infra_nodes }}
     --service-account=router {{ _ortr_selector }}
     --credentials={{ openshift_master_config_dir }}/openshift-router.kubeconfig {{ _ortr_images }}
   register: _ortr_results