Drop inconsistent flannel SDN for openstack

playbooks/openstack/advanced-configuration.md

@@ -207,26 +207,6 @@ This just illustrates a compatibility mode with a DNS service deployed
 by OpenShift on OSP10 reference architecture, and used in a mixed mode with
 another external DNS server.
 
-## Flannel networking
-
-In order to configure the
-[flannel networking](https://docs.openshift.com/container-platform/3.6/install_config/configuring_sdn.html#using-flannel),
-uncomment and adjust the appropriate `inventory/group_vars/OSEv3.yml` group vars.
-Note that the `osm_cluster_network_cidr` must not overlap with the default
-Docker bridge subnet of 172.17.0.0/16. Or you should change the docker0 default
-CIDR range otherwise. For example, by adding `--bip=192.168.2.1/24` to
-`DOCKER_NETWORK_OPTIONS` located in `/etc/sysconfig/docker-network`.
-
-Also note that the flannel network will be provisioned on a separate isolated Neutron
-subnet defined from `osm_cluster_network_cidr` and having ports security disabled.
-Use the `openstack_private_data_network_name` variable to define the network
-name for the heat stack resource.
-
-After the cluster deployment done, you should run an additional post installation
-step for flannel and docker iptables configuration:
-
-    ansible-playbook openshift-ansible-contrib/playbooks/provisioning/openstack/post-install.yml
-
 ## Other configuration variables
 
 `openshift_openstack_keypair_name` is a Nova keypair - you can see your

playbooks/openstack/openshift-cluster/prerequisites.yml

@@ -5,8 +5,3 @@
     import_role:
       name: openshift_openstack
       tasks_from: check-prerequisites.yml
-
-  - name: Check network configuration
-    import_role:
-      name: openshift_openstack
-      tasks_from: net_vars_check.yaml

playbooks/openstack/sample-inventory/group_vars/OSEv3.yml

@@ -52,9 +52,3 @@ openshift_hostname_check: false
 # NOTE(shadower): Always switch to root on the OSEv3 nodes.
 # openshift-ansible requires an explicit `become`.
 ansible_become: true
-
-# # Flannel networking
-#osm_cluster_network_cidr: 10.128.0.0/14
-#openshift_use_openshift_sdn: false
-#openshift_use_flannel: true
-#flannel_interface: eth1

playbooks/openstack/sample-inventory/group_vars/all.yml

@@ -15,10 +15,6 @@ openshift_openstack_dns_nameservers: []
 openshift_openstack_keypair_name: "openshift"
 openshift_openstack_external_network_name: "public"
 #openshift_openstack_private_network_name:  "openshift-ansible-{{ openshift_openstack_stack_name }}-net"
-# # A dedicated Neutron network name for containers data network
-# # Configures the data network to be separated from openshift_openstack_private_network_name
-# # NOTE: this is only supported with Flannel SDN yet
-#openstack_private_data_network_name: "openshift-ansible-{{ openshift_openstack_stack_name }}-data-net"
 
 ## If you want to use a provider network, set its name here.
 ## NOTE: the `openshift_openstack_external_network_name` and

roles/openshift_openstack/tasks/node-network.yml

@@ -15,5 +15,3 @@
     name: NetworkManager
     state: restarted
     enabled: yes
-
-# TODO(shadower): add the flannel interface tasks from post-provision-openstack.yml

roles/openshift_openstack/templates/heat_stack.yaml.j2

@@ -99,22 +99,6 @@ resources:
         - {{ nameserver }}
 {% endfor %}
 
-{% if openshift_use_flannel|default(False)|bool %}
-  data_net:
-    type: OS::Neutron::Net
-    properties:
-      name: openshift-ansible-{{ openshift_openstack_stack_name }}-data-net
-      port_security_enabled: false
-
-  data_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: openshift-ansible-{{ openshift_openstack_stack_name }}-data-subnet
-      network: { get_resource: data_net }
-      cidr: {{ osm_cluster_network_cidr|default('10.128.0.0/14') }}
-      gateway_ip: null
-{% endif %}
-
   router:
     type: OS::Neutron::Router
     properties:
@@ -317,12 +301,6 @@ resources:
           protocol: tcp
           port_range_min: 9090
           port_range_max: 9090
-{% if openshift_use_flannel|default(False)|bool %}
-        - direction: ingress
-          protocol: tcp
-          port_range_min: 2379
-          port_range_max: 2379
-{% endif %}
 
   etcd-secgrp:
     type: OS::Neutron::SecurityGroup
@@ -640,11 +618,6 @@ resources:
               template: openshift-ansible-cluster_id-net
               params:
                 cluster_id: {{ openshift_openstack_stack_name }}
-{% if openshift_use_flannel|default(False)|bool %}
-          attach_data_net: true
-          data_net:    { get_resource: data_net }
-          data_subnet: { get_resource: data_subnet }
-{% endif %}
 {% endif %}
           secgrp:
 {% if openshift_openstack_flat_secgrp|default(False)|bool %}
@@ -718,11 +691,6 @@ resources:
               template: openshift-ansible-cluster_id-net
               params:
                 cluster_id: {{ openshift_openstack_stack_name }}
-{% if openshift_use_flannel|default(False)|bool %}
-          attach_data_net: true
-          data_net:    { get_resource: data_net }
-          data_subnet: { get_resource: data_subnet }
-{% endif %}
 {% endif %}
           secgrp:
             - { get_resource: {% if openshift_openstack_flat_secgrp|default(False)|bool %}flat-secgrp{% else %}node-secgrp{% endif %} }
@@ -782,11 +750,6 @@ resources:
               template: openshift-ansible-cluster_id-net
               params:
                 cluster_id: {{ openshift_openstack_stack_name }}
-{% if openshift_use_flannel|default(False)|bool %}
-          attach_data_net: true
-          data_net:    { get_resource: data_net }
-          data_subnet: { get_resource: data_subnet }
-{% endif %}
 {% endif %}
           secgrp:
 # TODO(bogdando) filter only required node rules into infra-secgrp
@@ -851,11 +814,6 @@ resources:
               template: openshift-ansible-cluster_id-net
               params:
                 cluster_id: {{ openshift_openstack_stack_name }}
-{% if openshift_use_flannel|default(False)|bool %}
-          attach_data_net: true
-          data_net:    { get_resource: data_net }
-          data_subnet: { get_resource: data_subnet }
-{% endif %}
 {% endif %}
           secgrp:
 {% if openshift_openstack_flat_secgrp|default(False)|bool %}

roles/openshift_openstack/templates/heat_stack_server.yaml.j2

@@ -68,28 +68,6 @@ parameters:
     description: Subnet resource
 {% endif %}
 
-{% if openshift_use_flannel|default(False)|bool %}
-  attach_data_net:
-    type: boolean
-    default: false
-    label: Attach-data-net
-    description: A switch for data port connection
-
-  data_net:
-    type: string
-    default: ''
-    label: Net ID
-    description: Net resource
-
-{% if not openshift_openstack_provider_network_name %}
-  data_subnet:
-    type: string
-    default: ''
-    label: Subnet ID
-    description: Subnet resource
-{% endif %}
-{% endif %}
-
   secgrp:
     type: comma_delimited_list
     label: Security groups
@@ -163,9 +141,6 @@ outputs:
 
 conditions:
   no_floating: {not: { get_param: attach_float_net} }
-{% if openshift_use_flannel|default(False)|bool %}
-  no_data_subnet: {not: { get_param: attach_data_net} }
-{% endif %}
 
 resources:
 
@@ -177,27 +152,10 @@ resources:
       image:     { get_param: image }
       flavor:    { get_param: flavor }
       networks:
-{% if openshift_use_flannel|default(False)|bool %}
-        if:
-          - no_data_subnet
-{% if use_trunk_ports|default(false)|bool %}
-          - - port:  { get_attr: [trunk-port, port_id] }
-{% else %}
-          - - port:  { get_resource: port }
-{% endif %}
-{% if use_trunk_ports|default(false)|bool %}
-          - - port:  { get_attr: [trunk-port, port_id] }
-{% else %}
-          - - port:  { get_resource: port }
-            - port:  { get_resource: data_port }
-{% endif %}
-
-{% else %}
 {% if use_trunk_ports|default(false)|bool %}
         - port:  { get_attr: [trunk-port, port_id] }
 {% else %}
         - port:  { get_resource: port }
-{% endif %}
 {% endif %}
       user_data:
         get_file: user-data
@@ -233,19 +191,6 @@ resources:
 {% endif %}
       security_groups: { get_param: secgrp }
 
-{% if openshift_use_flannel|default(False)|bool %}
-  data_port:
-    type: OS::Neutron::Port
-    condition: { not: no_data_subnet }
-    properties:
-      network: { get_param: data_net }
-      port_security_enabled: false
-{% if not openshift_openstack_provider_network_name %}
-      fixed_ips:
-        - subnet: { get_param: data_subnet }
-{% endif %}
-{% endif %}
-
 {% if not openshift_openstack_provider_network_name %}
   floating-ip:
     condition: { not: no_floating }