diff options
| author | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-08 12:28:35 -0500 |
|---|---|---|
| committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-01-15 14:04:30 -0500 |
| commit | 7d7de31659bb15e9690df082d4129c73c4c413cf (patch) | |
| tree | adb0e7c271448c04a066539c643e6086a6b5068b /playbooks/gce | |
| parent | 2a12b6a99db4e8f39da27770e397dfafe27c9547 (diff) | |
| download | openshift-7d7de31659bb15e9690df082d4129c73c4c413cf.tar.gz openshift-7d7de31659bb15e9690df082d4129c73c4c413cf.tar.bz2 openshift-7d7de31659bb15e9690df082d4129c73c4c413cf.tar.xz openshift-7d7de31659bb15e9690df082d4129c73c4c413cf.zip | |
Remove default disable of SDN for GCE
- Update openshift_facts to no longer default use_openshift_sdn for GCE
installs
- Remove workarounds in the GCE playbooks that were forcing SDN configuration
Diffstat (limited to 'playbooks/gce')
| -rw-r--r-- | playbooks/gce/openshift-cluster/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/join_node.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/vars.yml | 3 |
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 |