summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-node
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-09-07 10:57:28 -0400
committerGitHub <noreply@github.com>2017-09-07 10:57:28 -0400
commit6da235f41a31776b1bc253a34dc14a30307e331e (patch)
treebda2cc62691a59fb6ac6ed4978fa7f15ec046121 /playbooks/common/openshift-node
parentaad4ccce7ce6641d3c720507568f6da779a66995 (diff)
parent8bf97723ceaca02fe12b86466f8383aa211ead5e (diff)
downloadopenshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.gz
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.bz2
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.tar.xz
openshift-6da235f41a31776b1bc253a34dc14a30307e331e.zip
Merge pull request #5208 from mgugino-upstream-stage/remove-openshift_common
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-node')
-rw-r--r--playbooks/common/openshift-node/config.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index c13417714..c7afc78ac 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -71,14 +71,14 @@
etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}"
etcd_cert_subdir: "openshift-node-{{ openshift.common.hostname }}"
etcd_cert_config_dir: "{{ openshift.common.config_base }}/node"
- when: openshift.common.use_flannel | bool
+ when: openshift_use_flannel | default(false) | bool
- role: calico
- when: openshift.common.use_calico | bool
+ when: openshift_use_calico | default(false) | bool
- role: nuage_node
- when: openshift.common.use_nuage | bool
+ when: openshift_use_nuage | default(false) | bool
- role: contiv
contiv_role: netplugin
- when: openshift.common.use_contiv | bool
+ when: openshift_use_contiv | default(false) | bool
- role: nickhammond.logrotate
- role: openshift_manage_node
openshift_master_host: "{{ groups.oo_first_master.0 }}"