diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-27 03:51:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 03:51:43 -0700 |
| commit | 54c41923ed30ba7e46dd12d15157195feca093a6 (patch) | |
| tree | 93e2061716cd1a88cb7ec2917cd3787d971776e7 | |
| parent | 742d338d7c133c4670d6e887655edaf89949df8c (diff) | |
| parent | 6269bb4819277e1fc369e731d8673c97815d8250 (diff) | |
| download | openshift-54c41923ed30ba7e46dd12d15157195feca093a6.tar.gz openshift-54c41923ed30ba7e46dd12d15157195feca093a6.tar.bz2 openshift-54c41923ed30ba7e46dd12d15157195feca093a6.tar.xz openshift-54c41923ed30ba7e46dd12d15157195feca093a6.zip | |
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.
| -rw-r--r-- | roles/openshift_node_dnsmasq/handlers/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node_dnsmasq/tasks/no-network-manager.yml | 9 |
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 |