diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-27 21:11:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 21:11:19 -0400 |
| commit | 7dddb07d4c81482835670d8f1de73fde092c8c60 (patch) | |
| tree | 6288b47c1629d2858a32ffe8fd85fb8ff52f52cd | |
| parent | 95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca (diff) | |
| parent | 9bdc70492301a309a4cfe2f92ac4fdc77343ee9f (diff) | |
| download | openshift-7dddb07d4c81482835670d8f1de73fde092c8c60.tar.gz openshift-7dddb07d4c81482835670d8f1de73fde092c8c60.tar.bz2 openshift-7dddb07d4c81482835670d8f1de73fde092c8c60.tar.xz openshift-7dddb07d4c81482835670d8f1de73fde092c8c60.zip | |
Merge pull request #4479 from mtnbikenc/contiv-warnings
Resolve Ansible deprecation warnings in Contiv roles
| -rw-r--r-- | roles/contiv/tasks/netmaster_iptables.yml | 2 | ||||
| -rw-r--r-- | roles/contiv/tasks/netplugin_iptables.yml | 2 | ||||
| -rw-r--r-- | roles/contiv_facts/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/contiv_facts/tasks/rpm.yml | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/roles/contiv/tasks/netmaster_iptables.yml b/roles/contiv/tasks/netmaster_iptables.yml index 2d0fb95ae..07bb16ea7 100644 --- a/roles/contiv/tasks/netmaster_iptables.yml +++ b/roles/contiv/tasks/netmaster_iptables.yml @@ -2,7 +2,7 @@ - name: Netmaster IPtables | Get iptables rules command: iptables -L --wait register: iptablesrules - always_run: yes + check_mode: no - name: Netmaster IPtables | Enable iptables at boot service: diff --git a/roles/contiv/tasks/netplugin_iptables.yml b/roles/contiv/tasks/netplugin_iptables.yml index 184c595c5..3ea34645d 100644 --- a/roles/contiv/tasks/netplugin_iptables.yml +++ b/roles/contiv/tasks/netplugin_iptables.yml @@ -2,7 +2,7 @@ - name: Netplugin IPtables | Get iptables rules command: iptables -L --wait register: iptablesrules - always_run: yes + check_mode: no - name: Netplugin IPtables | Enable iptables at boot service: diff --git a/roles/contiv_facts/tasks/main.yml b/roles/contiv_facts/tasks/main.yml index 926e0e0be..7a4972fca 100644 --- a/roles/contiv_facts/tasks/main.yml +++ b/roles/contiv_facts/tasks/main.yml @@ -3,7 +3,7 @@ stat: path=/run/ostree-booted register: s changed_when: false - always_run: yes + check_mode: no - name: Init the is_atomic fact set_fact: @@ -17,7 +17,7 @@ - name: Determine if CoreOS raw: "grep '^NAME=' /etc/os-release | sed s'/NAME=//'" register: distro - always_run: yes + check_mode: no - name: Init the is_coreos fact set_fact: @@ -61,7 +61,7 @@ stat: path=/usr/bin/rpm register: s changed_when: false - always_run: yes + check_mode: no - name: Init the has_rpm fact set_fact: diff --git a/roles/contiv_facts/tasks/rpm.yml b/roles/contiv_facts/tasks/rpm.yml index d2f66dac5..07401a6dd 100644 --- a/roles/contiv_facts/tasks/rpm.yml +++ b/roles/contiv_facts/tasks/rpm.yml @@ -4,7 +4,7 @@ register: s changed_when: false failed_when: false - always_run: yes + check_mode: no - name: Set the has_firewalld fact set_fact: @@ -16,7 +16,7 @@ register: s changed_when: false failed_when: false - always_run: yes + check_mode: no - name: Set the has_iptables fact set_fact: |