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/gce | |
| 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/gce')
| -rw-r--r-- | playbooks/gce/openshift-cluster/config.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml index 8e46c5919..2625d4d05 100644 --- a/playbooks/gce/openshift-cluster/config.yml +++ b/playbooks/gce/openshift-cluster/config.yml @@ -32,4 +32,5 @@ openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}" os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}" openshift_use_flannel: "{{ lookup('oo_option', 'use_flannel') }}" + openshift_use_calico: "{{ lookup('oo_option', 'use_calico') }}" openshift_use_fluentd: "{{ lookup('oo_option', 'use_fluentd') }}" |