summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-25 18:56:33 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-26 09:51:35 -0400
commit6269bb4819277e1fc369e731d8673c97815d8250 (patch)
treea5fb48e22b580738727d7ca0a469463bffc2ac5d /roles
parentc16d16d082ae992df3dd63d120622d9179371b17 (diff)
downloadopenshift-6269bb4819277e1fc369e731d8673c97815d8250.tar.gz
openshift-6269bb4819277e1fc369e731d8673c97815d8250.tar.bz2
openshift-6269bb4819277e1fc369e731d8673c97815d8250.tar.xz
openshift-6269bb4819277e1fc369e731d8673c97815d8250.zip
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.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_node_dnsmasq/handlers/main.yml1
-rw-r--r--roles/openshift_node_dnsmasq/tasks/no-network-manager.yml9
2 files changed, 10 insertions, 0 deletions
diff --git a/roles/openshift_node_dnsmasq/handlers/main.yml b/roles/openshift_node_dnsmasq/handlers/main.yml
index b4a0c3583..9f98126a0 100644
--- a/roles/openshift_node_dnsmasq/handlers/main.yml
+++ b/roles/openshift_node_dnsmasq/handlers/main.yml
@@ -3,6 +3,7 @@
systemd:
name: NetworkManager
state: restarted
+ enabled: True
- name: restart dnsmasq
systemd:
diff --git a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml b/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml
index d5fda7bd0..8a7da66c2 100644
--- a/roles/openshift_node_dnsmasq/tasks/no-network-manager.yml
+++ b/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