summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-22 10:55:54 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-22 10:55:54 -0400
commit917f8b157b10ee605cee75065fe874c5561a0573 (patch)
treebdc61a6b8eb186ebc61a00f56451b44485162667
parent19e5995968f89dfed2a8f3478ad40680f42ff777 (diff)
parentd121d8c208d4b5ea974f2f9d1ecf529f8fca7f44 (diff)
downloadopenshift-917f8b157b10ee605cee75065fe874c5561a0573.tar.gz
openshift-917f8b157b10ee605cee75065fe874c5561a0573.tar.bz2
openshift-917f8b157b10ee605cee75065fe874c5561a0573.tar.xz
openshift-917f8b157b10ee605cee75065fe874c5561a0573.zip
Merge pull request #721 from abutcher/fix-router
Conditionally include openshift_router role
-rw-r--r--playbooks/common/openshift-master/config.yml6
-rw-r--r--roles/openshift_router/tasks/main.yml2
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index fdf6b4d09..0d78eca30 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/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
diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml
index b88b020fe..498a65127 100644
--- a/roles/openshift_router/tasks/main.yml
+++ b/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