Browse Source

Merge pull request #5533 from mgugino-upstream-stage/configure-network-manager

Automatic merge from submit-queue

Support installation of NetworkManager for provisioned nodes

Currently, automated AWS provisionging fails when provisioning
with images that don't already have NetworkManager installed
and activated.

This commit adds NetworkManager to the build_ami provisioning
process, if not already installed.
OpenShift Merge Robot 7 years ago
parent
commit
54c41923ed

+ 1 - 0
roles/openshift_node_dnsmasq/handlers/main.yml

@@ -3,6 +3,7 @@
   systemd:
     name: NetworkManager
     state: restarted
+    enabled: True
 
 - name: restart dnsmasq
   systemd:

+ 9 - 0
roles/openshift_node_dnsmasq/tasks/no-network-manager.yml

@@ -1,2 +1,11 @@
 ---
 - fail: msg="Currently, NetworkManager must be installed and enabled prior to installation."
+  when: not openshift_node_bootstrap | bool
+
+- name: Install NetworkManager during node_bootstrap provisioning
+  package:
+    name: NetworkManager
+    state: present
+  notify: restart NetworkManager
+
+- include: ./network-manager.yml