diff options
author | Dan Osborne <djosborne10@gmail.com> | 2017-03-10 16:07:45 -0800 |
---|---|---|
committer | Dan Osborne <djosborne10@gmail.com> | 2017-03-23 13:53:46 -0700 |
commit | 7aa584b59baba5a7018d38aadd19aa7646702391 (patch) | |
tree | ccaf232790a12e81b923b4595d020deac1bfbe16 /playbooks/common | |
parent | 33e181c39d5024ecd226567139a7b0d36683bf2c (diff) | |
download | openshift-7aa584b59baba5a7018d38aadd19aa7646702391.tar.gz openshift-7aa584b59baba5a7018d38aadd19aa7646702391.tar.bz2 openshift-7aa584b59baba5a7018d38aadd19aa7646702391.tar.xz openshift-7aa584b59baba5a7018d38aadd19aa7646702391.zip |
Add calico.
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 |