diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-10-22 16:22:43 -0300 |
| commit | f559eb3146c65a6ec58f0fed3eb2d1124c1314c7 (patch) | |
| tree | 24975a7a87568784b88252bc70d14f7b302670b0 /playbooks/gce/openshift-cluster/vars.yml | |
| parent | 8468d25fae71c80277c10ad975641cb1ba230fd8 (diff) | |
| parent | e6d426fddd79c08452195cd32286bb600f62d51d (diff) | |
| download | openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.gz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.bz2 openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.tar.xz openshift-f559eb3146c65a6ec58f0fed3eb2d1124c1314c7.zip | |
fix merge conflicts
Diffstat (limited to 'playbooks/gce/openshift-cluster/vars.yml')
| -rw-r--r-- | playbooks/gce/openshift-cluster/vars.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml index ae33083b9..6de007807 100644 --- a/playbooks/gce/openshift-cluster/vars.yml +++ b/playbooks/gce/openshift-cluster/vars.yml @@ -1,8 +1,11 @@ --- +do_we_use_openshift_sdn: true +sdn_network_plugin: redhat/openshift-ovs-subnet +# os_sdn_network_plugin_name can be ovssubnet or multitenant, see https://docs.openshift.org/latest/architecture/additional_concepts/sdn.html#ovssubnet-plugin-operation deployment_vars: origin: - image: centos-7 - ssh_user: + image: preinstalled-slave-50g-v5 + ssh_user: root sudo: yes online: image: libra-rhel7 @@ -12,4 +15,3 @@ deployment_vars: image: rhel-7 ssh_user: sudo: yes - |