summaryrefslogtreecommitdiffstats
path: root/roles/openshift_router
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-10-21 15:23:30 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-10-21 15:23:30 -0400
commit9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6 (patch)
tree315c8752e2527fb71dc389b254393977d44a7074 /roles/openshift_router
parentedfd8dc450854d6f2efa6c3d67e856b66b3743fd (diff)
parent8691cd2947146a24237fadc443eb02acf805a606 (diff)
downloadopenshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.gz
openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.bz2
openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.tar.xz
openshift-9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6.zip
Merge pull request #571 from dak1n1/router
Support HA or single router. Deploy after service accounts are created
Diffstat (limited to 'roles/openshift_router')
-rw-r--r--roles/openshift_router/tasks/main.yml11
1 files changed, 7 insertions, 4 deletions
diff --git a/roles/openshift_router/tasks/main.yml b/roles/openshift_router/tasks/main.yml
index 929177262..b88b020fe 100644
--- a/roles/openshift_router/tasks/main.yml
+++ b/roles/openshift_router/tasks/main.yml
@@ -1,11 +1,14 @@
---
-- set_fact: _ortr_images="--images={{ oreg_url|quote }}"
- when: oreg_url is defined
+
+- 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
- --credentials={{ openshift_master_config_dir }}/openshift-router.kubeconfig {{ _ortr_images|default() }}
+ --create --replicas={{ num_infra }}
+ --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"