diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 01:11:25 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 01:11:25 -0400 |
| commit | d121d8c208d4b5ea974f2f9d1ecf529f8fca7f44 (patch) | |
| tree | 30e3d90ffe0bc8109ff42f707a9bdc15ffac975b | |
| parent | 9f3d3e9d0e697ce85620ac0a7a7c5eeba892f1d6 (diff) | |
| download | openshift-d121d8c208d4b5ea974f2f9d1ecf529f8fca7f44.tar.gz openshift-d121d8c208d4b5ea974f2f9d1ecf529f8fca7f44.tar.bz2 openshift-d121d8c208d4b5ea974f2f9d1ecf529f8fca7f44.tar.xz openshift-d121d8c208d4b5ea974f2f9d1ecf529f8fca7f44.zip | |
Conditionally include openshift_router role.
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_router/tasks/main.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 678e1c2d5..f4bf0e62c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -257,7 +257,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 |