Merge pull request #3900 from mtnbikenc/refactor-network-manager

Merged by openshift-bot

2 files changed, 28 insertions, 40 deletions

diff --git a/playbooks/byo/openshift-node/network_manager.yml b/playbooks/byo/openshift-node/network_manager.yml
index 9bb3ea17f..b23692237 100644
--- a/playbooks/byo/openshift-node/network_manager.yml
+++ b/playbooks/byo/openshift-node/network_manager.yml
@@ -1,42 +1,4 @@
 ---
-- name: Create initial host groups for localhost
-  hosts: localhost
-  connection: local
-  become: no
-  gather_facts: no
-  tags:
-  - always
-  tasks:
-  - include_vars: ../../byo/openshift-cluster/cluster_hosts.yml
-  - name: Evaluate group l_oo_all_hosts
-    add_host:
-      name: "{{ item }}"
-      groups: l_oo_all_hosts
-    with_items: "{{ g_all_hosts | default([]) }}"
-    changed_when: False
+- include: ../openshift-cluster/initialize_groups.yml
 
-- name: Install and configure NetworkManager
-  hosts: l_oo_all_hosts
-  become: yes
-  tasks:
-  - name: install NetworkManager
-    package:
-      name: 'NetworkManager'
-      state: present
-
-  - 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: started
-      enabled: yes
+- include: ../../common/openshift-node/network_manager.yml
diff --git a/playbooks/common/openshift-node/network_manager.yml b/playbooks/common/openshift-node/network_manager.yml
new file mode 100644
index 000000000..be050c12c
--- /dev/null
+++ b/playbooks/common/openshift-node/network_manager.yml
@@ -0,0 +1,26 @@
+---
+- name: Install and configure NetworkManager
+  hosts: l_oo_all_hosts
+  become: yes
+  tasks:
+  - name: install NetworkManager
+    package:
+      name: 'NetworkManager'
+      state: present
+
+  - 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: started
+      enabled: yes