summaryrefslogtreecommitdiffstats
path: root/roles/openshift_router
diff options
context:
space:
mode:
authorStefanie Forrester <sedgar@redhat.com>2015-09-11 13:13:17 -0700
committerStefanie Forrester <sedgar@redhat.com>2015-10-21 12:55:42 -0400
commit8691cd2947146a24237fadc443eb02acf805a606 (patch)
tree0aee79ec29eab0d36ea9b2f13f079bbb259dcc77 /roles/openshift_router
parent0b89d53ad9c0c83c42db3ee1642c005474c3cc58 (diff)
downloadopenshift-8691cd2947146a24237fadc443eb02acf805a606.tar.gz
openshift-8691cd2947146a24237fadc443eb02acf805a606.tar.bz2
openshift-8691cd2947146a24237fadc443eb02acf805a606.tar.xz
openshift-8691cd2947146a24237fadc443eb02acf805a606.zip
Support HA or single router, and start work on registry
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"