diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-27 22:28:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 22:28:40 -0500 |
| commit | a502b675936b617515ae7a00228aa62f1ec5bc53 (patch) | |
| tree | fac00fa6dee431cc92ac92610387def9b8aeb155 /playbooks/common | |
| parent | a22e780b21eacf9ae7fc067d9f26e1a01c1d4558 (diff) | |
| parent | 7aa584b59baba5a7018d38aadd19aa7646702391 (diff) | |
| download | openshift-a502b675936b617515ae7a00228aa62f1ec5bc53.tar.gz openshift-a502b675936b617515ae7a00228aa62f1ec5bc53.tar.bz2 openshift-a502b675936b617515ae7a00228aa62f1ec5bc53.tar.xz openshift-a502b675936b617515ae7a00228aa62f1ec5bc53.zip | |
Merge pull request #3038 from djosborne/calico
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/config.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 68b9db03a..81c922043 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -129,6 +129,8 @@ etcd_cert_prefix: "master.etcd-" - role: nuage_master when: openshift.common.use_nuage | bool + - role: calico_master + when: openshift.common.use_calico | bool post_tasks: - name: Create group for deployment type diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml index 6c5a299c1..792ffb4e2 100644 --- a/playbooks/common/openshift-node/config.yml +++ b/playbooks/common/openshift-node/config.yml @@ -82,6 +82,8 @@ etcd_cert_subdir: "openshift-node-{{ openshift.common.hostname }}" etcd_cert_config_dir: "{{ openshift.common.config_base }}/node" when: openshift.common.use_flannel | bool + - role: calico + when: openshift.common.use_calico | bool - role: nuage_node when: openshift.common.use_nuage | bool - role: contiv |