summaryrefslogtreecommitdiffstats
path: root/playbooks/gce
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2016-01-20 15:01:38 -0500
committerMatt Woodson <mwoodson@gmail.com>2016-01-20 15:01:38 -0500
commit9410cdff9342fae80a3149c530b819e473996cce (patch)
treecf26be9b05f3b97dbdafb7bae109b0707da0a0d4 /playbooks/gce
parenta2b745039bce597d419b03fdce39b4c6c69139f6 (diff)
parentbdedb63403ea582c4aaa5f56caed302f51744de2 (diff)
downloadopenshift-9410cdff9342fae80a3149c530b819e473996cce.tar.gz
openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.bz2
openshift-9410cdff9342fae80a3149c530b819e473996cce.tar.xz
openshift-9410cdff9342fae80a3149c530b819e473996cce.zip
Merge pull request #1247 from openshift/master
Merge master into prod
Diffstat (limited to 'playbooks/gce')
-rw-r--r--playbooks/gce/openshift-cluster/config.yml1
-rw-r--r--playbooks/gce/openshift-cluster/join_node.yml2
-rw-r--r--playbooks/gce/openshift-cluster/vars.yml3
3 files changed, 0 insertions, 6 deletions
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml
index 3231ecc8e..84a3f84d4 100644
--- a/playbooks/gce/openshift-cluster/config.yml
+++ b/playbooks/gce/openshift-cluster/config.yml
@@ -13,4 +13,3 @@
openshift_debug_level: "{{ debug_level }}"
openshift_deployment_type: "{{ deployment_type }}"
openshift_hostname: "{{ gce_private_ip }}"
- openshift_use_openshift_sdn: "{{ do_we_use_openshift_sdn }}"
diff --git a/playbooks/gce/openshift-cluster/join_node.yml b/playbooks/gce/openshift-cluster/join_node.yml
index acf5e5110..75343dffa 100644
--- a/playbooks/gce/openshift-cluster/join_node.yml
+++ b/playbooks/gce/openshift-cluster/join_node.yml
@@ -48,6 +48,4 @@
openshift_debug_level: 4
openshift_deployment_type: "{{ deployment_type }}"
openshift_hostname: "{{ ansible_default_ipv4.address }}"
- openshift_use_openshift_sdn: true
openshift_node_labels: "{{ lookup('oo_option', 'openshift_node_labels') }} "
- os_sdn_network_plugin_name: "redhat/openshift-ovs-subnet"
diff --git a/playbooks/gce/openshift-cluster/vars.yml b/playbooks/gce/openshift-cluster/vars.yml
index 7fb13c7a6..f004a9e6b 100644
--- a/playbooks/gce/openshift-cluster/vars.yml
+++ b/playbooks/gce/openshift-cluster/vars.yml
@@ -1,8 +1,5 @@
---
-do_we_use_openshift_sdn: true
-sdn_network_plugin: redhat/openshift-ovs-subnet
debug_level: 2
-# 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_rhel7_ent_base:
image: rhel-7