mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-26 20:31:27 -07:00
corrected several usages of deprecated bare vars
This commit is contained in:
parent
ba51ed06cf
commit
08b3dbcda3
9 changed files with 18 additions and 18 deletions
|
@ -28,17 +28,17 @@
|
||||||
|
|
||||||
- name: install mysqldb_test rpm dependencies
|
- name: install mysqldb_test rpm dependencies
|
||||||
yum: name={{ item }} state=latest
|
yum: name={{ item }} state=latest
|
||||||
with_items: mysql_packages
|
with_items: "{{mysql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'yum'
|
when: ansible_pkg_mgr == 'yum'
|
||||||
|
|
||||||
- name: install mysqldb_test rpm dependencies
|
- name: install mysqldb_test rpm dependencies
|
||||||
dnf: name={{ item }} state=latest
|
dnf: name={{ item }} state=latest
|
||||||
with_items: mysql_packages
|
with_items: "{{mysql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'dnf'
|
when: ansible_pkg_mgr == 'dnf'
|
||||||
|
|
||||||
- name: install mysqldb_test debian dependencies
|
- name: install mysqldb_test debian dependencies
|
||||||
apt: name={{ item }} state=latest
|
apt: name={{ item }} state=latest
|
||||||
with_items: mysql_packages
|
with_items: "{{mysql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'apt'
|
when: ansible_pkg_mgr == 'apt'
|
||||||
|
|
||||||
- name: start mysql_db service if not running
|
- name: start mysql_db service if not running
|
||||||
|
|
|
@ -10,12 +10,12 @@
|
||||||
# Make sure we start fresh
|
# Make sure we start fresh
|
||||||
- name: remove rpm dependencies for postgresql test
|
- name: remove rpm dependencies for postgresql test
|
||||||
package: name={{ item }} state=absent
|
package: name={{ item }} state=absent
|
||||||
with_items: postgresql_packages
|
with_items: "{{postgresql_packages}}"
|
||||||
when: ansible_os_family == "RedHat"
|
when: ansible_os_family == "RedHat"
|
||||||
|
|
||||||
- name: remove dpkg dependencies for postgresql test
|
- name: remove dpkg dependencies for postgresql test
|
||||||
apt: name={{ item }} state=absent
|
apt: name={{ item }} state=absent
|
||||||
with_items: postgresql_packages
|
with_items: "{{postgresql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'apt'
|
when: ansible_pkg_mgr == 'apt'
|
||||||
|
|
||||||
- name: remove old db (red hat)
|
- name: remove old db (red hat)
|
||||||
|
@ -36,12 +36,12 @@
|
||||||
|
|
||||||
- name: install rpm dependencies for postgresql test
|
- name: install rpm dependencies for postgresql test
|
||||||
package: name={{ item }} state=latest
|
package: name={{ item }} state=latest
|
||||||
with_items: postgresql_packages
|
with_items: "{{postgresql_packages}}"
|
||||||
when: ansible_os_family == "RedHat"
|
when: ansible_os_family == "RedHat"
|
||||||
|
|
||||||
- name: install dpkg dependencies for postgresql test
|
- name: install dpkg dependencies for postgresql test
|
||||||
apt: name={{ item }} state=latest
|
apt: name={{ item }} state=latest
|
||||||
with_items: postgresql_packages
|
with_items: "{{postgresql_packages}}"
|
||||||
when: ansible_pkg_mgr == 'apt'
|
when: ansible_pkg_mgr == 'apt'
|
||||||
|
|
||||||
- name: Initialize postgres (systemd)
|
- name: Initialize postgres (systemd)
|
||||||
|
|
|
@ -150,7 +150,7 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- "{{item.stat.mode}} == 0700"
|
- "{{item.stat.mode}} == 0700"
|
||||||
with_items: dir_stats.results
|
with_items: "{{dir_stats.results}}"
|
||||||
|
|
||||||
|
|
||||||
# errors on this aren't presently ignored so this test is commented out. But it would be nice to fix.
|
# errors on this aren't presently ignored so this test is commented out. But it would be nice to fix.
|
||||||
|
|
|
@ -248,7 +248,7 @@
|
||||||
that:
|
that:
|
||||||
- 'item.changed == true'
|
- 'item.changed == true'
|
||||||
- 'item.state == "file"'
|
- 'item.state == "file"'
|
||||||
with_items: file16_result.results
|
with_items: "{{file16_result.results}}"
|
||||||
|
|
||||||
- name: try to force the sub-directory to a link
|
- name: try to force the sub-directory to a link
|
||||||
file: src={{output_dir}}/testing dest={{output_dir}}/sub1 state=link force=yes
|
file: src={{output_dir}}/testing dest={{output_dir}}/sub1 state=link force=yes
|
||||||
|
|
|
@ -88,7 +88,7 @@
|
||||||
|
|
||||||
- name: remove known_host files
|
- name: remove known_host files
|
||||||
file: state=absent path={{ item }}
|
file: state=absent path={{ item }}
|
||||||
with_items: known_host_files
|
with_items: "{{known_host_files}}"
|
||||||
|
|
||||||
- name: checkout ssh://git@github.com repo without accept_hostkey (expected fail)
|
- name: checkout ssh://git@github.com repo without accept_hostkey (expected fail)
|
||||||
git: repo={{ repo_format2 }} dest={{ checkout_dir }}
|
git: repo={{ repo_format2 }} dest={{ checkout_dir }}
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
mysql_user: name={{ item[0] }} priv={{ item[1] }}.*:ALL append_privs=yes password={{ user_password_1 }}
|
mysql_user: name={{ item[0] }} priv={{ item[1] }}.*:ALL append_privs=yes password={{ user_password_1 }}
|
||||||
with_nested:
|
with_nested:
|
||||||
- [ '{{ user_name_1 }}' , '{{ user_name_2 }}']
|
- [ '{{ user_name_1 }}' , '{{ user_name_2 }}']
|
||||||
- db_names
|
- "{{db_names}}"
|
||||||
|
|
||||||
- name: show grants access for user1 on multiple database
|
- name: show grants access for user1 on multiple database
|
||||||
command: mysql "-e SHOW GRANTS FOR '{{ user_name_1 }}'@'localhost';"
|
command: mysql "-e SHOW GRANTS FOR '{{ user_name_1 }}'@'localhost';"
|
||||||
|
@ -104,7 +104,7 @@
|
||||||
|
|
||||||
- name: assert grant access for user1 on multiple database
|
- name: assert grant access for user1 on multiple database
|
||||||
assert: { that: "'{{ item }}' in result.stdout" }
|
assert: { that: "'{{ item }}' in result.stdout" }
|
||||||
with_items: db_names
|
with_items: "{{db_names}}"
|
||||||
|
|
||||||
- name: show grants access for user2 on multiple database
|
- name: show grants access for user2 on multiple database
|
||||||
command: mysql "-e SHOW GRANTS FOR '{{ user_name_2 }}'@'localhost';"
|
command: mysql "-e SHOW GRANTS FOR '{{ user_name_2 }}'@'localhost';"
|
||||||
|
|
|
@ -69,8 +69,8 @@
|
||||||
- '"json" in item.1'
|
- '"json" in item.1'
|
||||||
- item.0.stat.checksum == item.1.content | checksum
|
- item.0.stat.checksum == item.1.content | checksum
|
||||||
with_together:
|
with_together:
|
||||||
- pass_checksum.results
|
- "{{pass_checksum.results}}"
|
||||||
- pass.results
|
- "{{pass.results}}"
|
||||||
|
|
||||||
|
|
||||||
- name: checksum fail_json
|
- name: checksum fail_json
|
||||||
|
@ -89,8 +89,8 @@
|
||||||
- item.0.stat.checksum == item.1.content | checksum
|
- item.0.stat.checksum == item.1.content | checksum
|
||||||
- '"json" not in item.1'
|
- '"json" not in item.1'
|
||||||
with_together:
|
with_together:
|
||||||
- fail_checksum.results
|
- "{{fail_checksum.results}}"
|
||||||
- fail.results
|
- "{{fail.results}}"
|
||||||
|
|
||||||
- name: test https fetch to a site with mismatched hostname and certificate
|
- name: test https fetch to a site with mismatched hostname and certificate
|
||||||
uri:
|
uri:
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
# assert:
|
# assert:
|
||||||
# that:
|
# that:
|
||||||
# - "{{item.stat.mode}} == 0700"
|
# - "{{item.stat.mode}} == 0700"
|
||||||
# with_items: dir_stats.results
|
# with_items: "{{dir_stats.results}}"
|
||||||
|
|
||||||
|
|
||||||
# errors on this aren't presently ignored so this test is commented out. But it would be nice to fix.
|
# errors on this aren't presently ignored so this test is commented out. But it would be nice to fix.
|
||||||
|
|
|
@ -183,7 +183,7 @@
|
||||||
that:
|
that:
|
||||||
- 'item.changed == true'
|
- 'item.changed == true'
|
||||||
# - 'item.state == "file"'
|
# - 'item.state == "file"'
|
||||||
with_items: file16_result.results
|
with_items: "{{file16_result.results}}"
|
||||||
|
|
||||||
#- name: try to force the sub-directory to a link
|
#- name: try to force the sub-directory to a link
|
||||||
# win_file: src={{win_output_dir}}/testing dest={{win_output_dir}}/sub1 state=link force=yes
|
# win_file: src={{win_output_dir}}/testing dest={{win_output_dir}}/sub1 state=link force=yes
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue