diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-29 13:21:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 13:21:37 -0400 |
| commit | d36e0dca4fea4d03fa3afc7e1392b356fc704cf1 (patch) | |
| tree | 8c42b3aae3631a415a9558755cd589a825c098af | |
| parent | 76344e68b32059d23e649a8bfc7a6b6bdafc84b7 (diff) | |
| parent | cf7f47d7b6b4b974ed04fbc6936214a823141973 (diff) | |
| download | openshift-d36e0dca4fea4d03fa3afc7e1392b356fc704cf1.tar.gz openshift-d36e0dca4fea4d03fa3afc7e1392b356fc704cf1.tar.bz2 openshift-d36e0dca4fea4d03fa3afc7e1392b356fc704cf1.tar.xz openshift-d36e0dca4fea4d03fa3afc7e1392b356fc704cf1.zip | |
Merge pull request #5220 from rparulek/nuage-atomic-install
Nuage changes to add custom mounts for atomic-openshift-node service
| -rw-r--r-- | roles/nuage_node/handlers/main.yaml | 2 | ||||
| -rw-r--r-- | roles/nuage_node/tasks/main.yaml | 5 | ||||
| -rw-r--r-- | roles/nuage_node/vars/main.yaml | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/roles/nuage_node/handlers/main.yaml b/roles/nuage_node/handlers/main.yaml index 60247c33e..e68ae74bd 100644 --- a/roles/nuage_node/handlers/main.yaml +++ b/roles/nuage_node/handlers/main.yaml @@ -1,7 +1,7 @@ --- - name: restart node become: yes - systemd: name={{ openshift.common.service_type }}-node state=restarted + systemd: name={{ openshift.common.service_type }}-node daemon-reload=yes state=restarted - name: save iptable rules become: yes diff --git a/roles/nuage_node/tasks/main.yaml b/roles/nuage_node/tasks/main.yaml index 3764681ff..9db9dbb6a 100644 --- a/roles/nuage_node/tasks/main.yaml +++ b/roles/nuage_node/tasks/main.yaml @@ -33,6 +33,11 @@ - include: certificates.yml +- name: Add additional Docker mounts for Nuage for atomic hosts + become: yes + lineinfile: dest="{{ openshift_atomic_node_config_file }}" line="{{ nuage_atomic_docker_additional_mounts }}" + when: openshift.common.is_atomic | bool + - name: Restart node services command: /bin/true notify: diff --git a/roles/nuage_node/vars/main.yaml b/roles/nuage_node/vars/main.yaml index 4cf68411f..d8bfca62a 100644 --- a/roles/nuage_node/vars/main.yaml +++ b/roles/nuage_node/vars/main.yaml @@ -23,3 +23,5 @@ cni_conf_dir: "/etc/cni/net.d/" cni_bin_dir: "/opt/cni/bin/" nuage_plugin_crt_dir: /usr/share/vsp-openshift +openshift_atomic_node_config_file: /etc/sysconfig/{{ openshift.common.service_type }}-node +nuage_atomic_docker_additional_mounts: "DOCKER_ADDTL_BIND_MOUNTS=-v /var/usr/share/vsp-openshift:/var/usr/share/vsp-openshift -v /etc/default:/etc/default -v /var/run:/var/run -v /opt/cni/bin:/opt/cni/bin -v /etc/cni/net.d:/etc/cni/net.d" |