summaryrefslogtreecommitdiffstats
path: root/roles/openshift_router
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-01 11:43:48 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-01 11:43:48 -0500
commit3d3053062ee3bca175df6eb4dd66ff56237234ca (patch)
treeebc814ec2f1ccaaf12e4ab3be1b5395dd82c5408 /roles/openshift_router
parentb0961af3b0ee955be033fc043b1e072097dfbd69 (diff)
parent1a5b22dd4f4dd3a1643abc14bdbae045999cea44 (diff)
downloadopenshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.gz
openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.bz2
openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.tar.xz
openshift-3d3053062ee3bca175df6eb4dd66ff56237234ca.zip
Merge pull request #1237 from detiber/infra_fixes
infra_node fixes
Diffstat (limited to 'roles/openshift_router')
-rw-r--r--roles/openshift_router/tasks/main.yml15
-rw-r--r--roles/openshift_router/vars/main.yml2
2 files changed, 7 insertions, 10 deletions
diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml
index 498a65127..355cbf84b 100644
--- a/roles/openshift_router/tasks/main.yml
+++ b/roles/openshift_router/tasks/main.yml
@@ -1,14 +1,9 @@
---
-
-- set_fact: _ortr_images="--images='{{ openshift.master.registry_url }}'"
-
-- set_fact: _ortr_selector="--selector='{{ openshift.master.router_selector }}'"
-
- name: Deploy OpenShift Router
command: >
{{ openshift.common.admin_binary }} router
- --create --replicas={{ openshift.master.infra_nodes }}
- --service-account=router {{ _ortr_selector }}
- --credentials={{ openshift_master_config_dir }}/openshift-router.kubeconfig {{ _ortr_images }}
- register: _ortr_results
- changed_when: "'service exists' not in _ortr_results.stdout"
+ --create --replicas={{ openshift.master.infra_nodes | length }}
+ --service-account=router {{ ortr_selector }}
+ --credentials={{ openshift_master_config_dir }}/openshift-router.kubeconfig {{ ortr_images }}
+ register: ortr_results
+ changed_when: "'service exists' not in ortr_results.stdout"
diff --git a/roles/openshift_router/vars/main.yml b/roles/openshift_router/vars/main.yml
index 9967e26f4..bcac12068 100644
--- a/roles/openshift_router/vars/main.yml
+++ b/roles/openshift_router/vars/main.yml
@@ -1,2 +1,4 @@
---
openshift_master_config_dir: "{{ openshift.common.config_base }}/master"
+ortr_images: "--images='{{ openshift.master.registry_url }}'"
+ortr_selector: "--selector='{{ openshift.master.router_selector }}'"