Merge pull request #9013 from tomassedovic/cleanup-openstack-networking

Remove the extra OpenStack network tasks

playbooks/openstack/openshift-cluster/install.yml

@@ -16,11 +16,6 @@
   become: yes
   gather_facts: yes
   tasks:
-  - name: Install dependencies
-    import_role:
-      name: openshift_openstack
-      tasks_from: node-packages.yml
-
   - name: Configure Node
     import_role:
       name: openshift_openstack

roles/openshift_openstack/defaults/main.yml

@@ -16,17 +16,6 @@ openshift_openstack_use_lbaas_load_balancer: false
 openshift_openstack_lbaasv2_provider: Octavia
 openshift_openstack_use_vm_load_balancer: false
 
-openshift_openstack_install_debug_packages: false
-openshift_openstack_required_packages:
-  - NetworkManager
-openshift_openstack_debug_packages:
-  - bash-completion
-  - bind-utils
-  - bridge-utils
-  - git
-  - net-tools
-  - vim-enhanced
-  - wget
 
 # container-storage-setup
 openshift_openstack_container_storage_setup:

roles/openshift_openstack/tasks/node-configuration.yml

@@ -12,5 +12,3 @@
   when: ansible_selinux.config_mode != "enforcing"
 
 - include_tasks: container-storage-setup.yml
-
-- include_tasks: node-network.yml

roles/openshift_openstack/tasks/node-network.yml

@@ -1,18 +0,0 @@
----
-- name: configure NetworkManager
-  lineinfile:
-    dest: "/etc/sysconfig/network-scripts/ifcfg-{{ ansible_default_ipv4['interface'] }}"
-    regexp: '^{{ item }}='
-    line: '{{ item }}=yes'
-    state: present
-    create: yes
-  with_items:
-  - 'USE_PEERDNS'
-  - 'NM_CONTROLLED'
-
-- name: enable and start NetworkManager
-  service:
-    name: NetworkManager
-    state: restarted
-    enabled: yes
-# TODO(shadower): add the flannel interface tasks from post-provision-openstack.yml

roles/openshift_openstack/tasks/node-packages.yml

@@ -1,19 +0,0 @@
----
-# TODO: subscribe to RHEL and install docker and other packages here
-
-- name: Install required packages
-  yum:
-    name: "{{ item }}"
-    state: latest
-  with_items: "{{ openshift_openstack_required_packages }}"
-  register: result
-  until: result is succeeded
-
-- name: Install debug packages (optional)
-  yum:
-    name: "{{ item }}"
-    state: latest
-  with_items: "{{ openshift_openstack_debug_packages }}"
-  when: openshift_openstack_install_debug_packages|bool
-  register: result
-  until: result is succeeded