diff options
| author | Russell Teague <rteague@redhat.com> | 2016-11-18 14:26:02 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2016-11-28 11:11:44 -0500 |
| commit | ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607 (patch) | |
| tree | a8c3897b9765b9b6dc02582a851b704be8f0828e /roles/flannel | |
| parent | b45db4c7e0b278623f7531cee50127aa24686139 (diff) | |
| download | openshift-ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607.tar.gz openshift-ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607.tar.bz2 openshift-ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607.tar.xz openshift-ec9c22ca6a376b7d1139a384dcb78f3f5bb5b607.zip | |
Refactored to use Ansible systemd module
* Ansible systemd module used in place of service module
* Refactored command tasks which are no longer necessary
* Applying rules from openshift-ansible Best Practices Guide
Diffstat (limited to 'roles/flannel')
| -rw-r--r-- | roles/flannel/README.md | 3 | ||||
| -rw-r--r-- | roles/flannel/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/flannel/meta/main.yml | 2 | ||||
| -rw-r--r-- | roles/flannel/tasks/main.yml | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/roles/flannel/README.md b/roles/flannel/README.md index 84e2c5c49..0c7347603 100644 --- a/roles/flannel/README.md +++ b/roles/flannel/README.md @@ -6,7 +6,8 @@ Configure flannel on openshift nodes Requirements ------------ -This role assumes it's being deployed on a RHEL/Fedora based host with package +* Ansible 2.2 +* This role assumes it's being deployed on a RHEL/Fedora based host with package named 'flannel' available via yum or dnf (conditionally), in version superior to 0.3. diff --git a/roles/flannel/handlers/main.yml b/roles/flannel/handlers/main.yml index 981ea5c7a..94d1d18fb 100644 --- a/roles/flannel/handlers/main.yml +++ b/roles/flannel/handlers/main.yml @@ -1,8 +1,8 @@ --- - name: restart flanneld become: yes - service: name=flanneld state=restarted + systemd: name=flanneld state=restarted - name: restart docker become: yes - service: name=docker state=restarted + systemd: name=docker state=restarted diff --git a/roles/flannel/meta/main.yml b/roles/flannel/meta/main.yml index 616ae61d2..35f825586 100644 --- a/roles/flannel/meta/main.yml +++ b/roles/flannel/meta/main.yml @@ -4,7 +4,7 @@ galaxy_info: description: flannel management company: Red Hat, Inc. license: Apache License, Version 2.0 - min_ansible_version: 2.1 + min_ansible_version: 2.2 platforms: - name: EL versions: diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index a51455bae..3a8945a82 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -27,7 +27,7 @@ - name: Enable flanneld become: yes - service: + systemd: name: flanneld state: started enabled: yes |