Auto-fix usage of modules via FQCN
Since ansible-core 2.10 it is recommended to use modules via FQCN In order to align with recommendation, we perform migration by applying suggestions made by `ansible-lint --fix=fqcn` Change-Id: Ide77ad6afc07c17da15d7a6fc88197384f306981
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Stop services
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
name: "{{ item.0.service_name }}"
|
||||
enabled: true
|
||||
state: "stopped"
|
||||
@@ -33,7 +33,7 @@
|
||||
- "systemd service changed"
|
||||
|
||||
- name: Start services
|
||||
service:
|
||||
ansible.builtin.service:
|
||||
name: "{{ item.0.service_name }}"
|
||||
enabled: true
|
||||
state: "started"
|
||||
|
@@ -14,12 +14,12 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Check for gnocchi resource file
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "{{ ceilometer_lib_dir }}/ceilometer/publisher/data/gnocchi_resources.yaml"
|
||||
register: gnocchi_resource_file
|
||||
|
||||
- name: Initialize Gnocchi database by creating ceilometer resources
|
||||
command: "{{ ceilometer_bin }}/ceilometer-upgrade"
|
||||
ansible.builtin.command: "{{ ceilometer_bin }}/ceilometer-upgrade"
|
||||
become: true
|
||||
become_user: "{{ ceilometer_system_user_name }}"
|
||||
changed_when: false
|
||||
|
@@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Record the installation method
|
||||
ini_file:
|
||||
community.general.ini_file:
|
||||
dest: "/etc/ansible/facts.d/openstack_ansible.fact"
|
||||
section: "ceilometer"
|
||||
option: "install_method"
|
||||
@@ -22,12 +22,12 @@
|
||||
mode: "0644"
|
||||
|
||||
- name: Refresh local facts to ensure the ceilometer section is present
|
||||
setup:
|
||||
ansible.builtin.setup:
|
||||
filter: ansible_local
|
||||
gather_subset: "!all"
|
||||
|
||||
- name: Install distro packages
|
||||
package:
|
||||
ansible.builtin.package:
|
||||
name: "{{ ceilometer_package_list }}"
|
||||
state: "{{ ceilometer_package_state }}"
|
||||
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
|
||||
@@ -43,13 +43,13 @@
|
||||
# constraints are given which will always happen with a source install
|
||||
# and wheels built on the repo server. We must filter ceilometer out of u-c.
|
||||
- name: Retrieve the constraints URL
|
||||
uri:
|
||||
ansible.builtin.uri:
|
||||
url: "{{ ceilometer_upper_constraints_url }}"
|
||||
return_content: true
|
||||
register: _u_c_contents
|
||||
|
||||
- name: Install the python venv
|
||||
include_role:
|
||||
ansible.builtin.include_role:
|
||||
name: "python_venv_build"
|
||||
vars:
|
||||
venv_python_executable: "{{ ceilometer_venv_python_executable }}"
|
||||
|
@@ -14,12 +14,12 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Find the venv's python version
|
||||
command: "{{ ceilometer_bin }}/{{ ceilometer_venv_python_executable }} -c 'import ceilometer; print(ceilometer.__file__)'"
|
||||
ansible.builtin.command: "{{ ceilometer_bin }}/{{ ceilometer_venv_python_executable }} -c 'import ceilometer; print(ceilometer.__file__)'"
|
||||
changed_when: false
|
||||
register: _ceilometer_python_venv_details
|
||||
|
||||
- name: Set python lib dir fact
|
||||
set_fact:
|
||||
ansible.builtin.set_fact:
|
||||
ceilometer_lib_dir: "{{ _ceilometer_python_venv_details.stdout | dirname | dirname }}"
|
||||
|
||||
- name: Copy ceilometer configuration files
|
||||
@@ -45,14 +45,14 @@
|
||||
# because we only want to copy the original files once. and we
|
||||
# don't want to need multiple tasks.
|
||||
- name: Preserve original configuration file(s)
|
||||
command: "cp {{ item.source_f }} {{ item.source_f }}.original"
|
||||
ansible.builtin.command: "cp {{ item.source_f }} {{ item.source_f }}.original"
|
||||
args:
|
||||
creates: "{{ item.source_f }}.original"
|
||||
with_items: "{{ ceilometer_core_files }}"
|
||||
when: item.condition | default(True)
|
||||
|
||||
- name: Fetch override files
|
||||
fetch:
|
||||
ansible.builtin.fetch:
|
||||
src: "{{ item.source_f }}.original"
|
||||
dest: "{{ item.tmp_f }}"
|
||||
flat: true
|
||||
@@ -79,7 +79,7 @@
|
||||
- Restart ceilometer services
|
||||
|
||||
- name: Cleanup fetched temp files
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "{{ item.tmp_f }}"
|
||||
state: absent
|
||||
changed_when: false
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
# NOTE(cloudnull): This will ensure strong permissions on all rootwrap files.
|
||||
- name: Set rootwrap.d permissions
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "/etc/ceilometer/rootwrap.d"
|
||||
owner: "root"
|
||||
group: "root"
|
||||
|
@@ -14,13 +14,13 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Create the system group
|
||||
group:
|
||||
ansible.builtin.group:
|
||||
name: "{{ ceilometer_system_group_name }}"
|
||||
state: "present"
|
||||
system: "yes"
|
||||
|
||||
- name: Create the ceilometer system user
|
||||
user:
|
||||
ansible.builtin.user:
|
||||
name: "{{ ceilometer_system_user_name }}"
|
||||
group: "{{ ceilometer_system_group_name }}"
|
||||
comment: "{{ ceilometer_system_comment }}"
|
||||
@@ -30,7 +30,7 @@
|
||||
home: "{{ ceilometer_system_user_home }}"
|
||||
|
||||
- name: Create the swift system user and add to ceilometer group
|
||||
user:
|
||||
ansible.builtin.user:
|
||||
name: "{{ swift_system_user_name }}"
|
||||
group: "{{ ceilometer_system_group_name }}"
|
||||
comment: "{{ swift_system_comment }}"
|
||||
@@ -45,24 +45,24 @@
|
||||
# removed. This is required on source installs because the
|
||||
# config directory is a link.
|
||||
- name: Source config block
|
||||
when:
|
||||
- ceilometer_install_method == 'source'
|
||||
block:
|
||||
- name: Stat config directory
|
||||
stat:
|
||||
ansible.builtin.stat:
|
||||
path: "/etc/ceilometer"
|
||||
register: ceilometer_conf_dir_stat
|
||||
|
||||
- name: Remove the config directory
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "/etc/ceilometer"
|
||||
state: absent
|
||||
when:
|
||||
- ceilometer_conf_dir_stat.stat.isdir is defined and
|
||||
ceilometer_conf_dir_stat.stat.isdir
|
||||
when:
|
||||
- ceilometer_install_method == 'source'
|
||||
|
||||
- name: Create ceilometer dir
|
||||
file:
|
||||
ansible.builtin.file:
|
||||
path: "{{ item.path | default(omit) }}"
|
||||
src: "{{ item.src | default(omit) }}"
|
||||
dest: "{{ item.dest | default(omit) }}"
|
||||
|
@@ -14,7 +14,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
- name: Gather variables for each operating system
|
||||
include_vars: "{{ lookup('first_found', params) }}"
|
||||
ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
|
||||
vars:
|
||||
params:
|
||||
files:
|
||||
@@ -29,7 +29,7 @@
|
||||
- always
|
||||
|
||||
- name: Fail if our required secrets are not present
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: "Please set the {{ item }} variable prior to applying this role."
|
||||
when: (item is undefined) or (item is none)
|
||||
with_items: "{{ ceilometer_required_secrets }}"
|
||||
@@ -37,7 +37,7 @@
|
||||
- always
|
||||
|
||||
- name: Fail if service was deployed using a different installation method
|
||||
fail:
|
||||
ansible.builtin.fail:
|
||||
msg: "Switching installation methods for OpenStack services is not supported"
|
||||
when:
|
||||
- ansible_local is defined
|
||||
@@ -47,28 +47,28 @@
|
||||
- ansible_local.openstack_ansible.ceilometer.install_method != ceilometer_install_method
|
||||
|
||||
- name: Gather variables for installation method
|
||||
include_vars: "{{ ceilometer_install_method }}_install.yml"
|
||||
ansible.builtin.include_vars: "{{ ceilometer_install_method }}_install.yml"
|
||||
tags:
|
||||
- always
|
||||
|
||||
- name: Importing ceilometer_pre_install tasks
|
||||
import_tasks: ceilometer_pre_install.yml
|
||||
ansible.builtin.import_tasks: ceilometer_pre_install.yml
|
||||
tags:
|
||||
- ceilometer-install
|
||||
|
||||
- name: Importing ceilometer_install tasks
|
||||
import_tasks: ceilometer_install.yml
|
||||
ansible.builtin.import_tasks: ceilometer_install.yml
|
||||
tags:
|
||||
- ceilometer-install
|
||||
|
||||
- name: Importing ceilometer_post_install tasks
|
||||
import_tasks: ceilometer_post_install.yml
|
||||
ansible.builtin.import_tasks: ceilometer_post_install.yml
|
||||
tags:
|
||||
- ceilometer-config
|
||||
- post-install
|
||||
|
||||
- name: Run the systemd service role
|
||||
import_role:
|
||||
ansible.builtin.import_role:
|
||||
name: systemd_service
|
||||
vars:
|
||||
systemd_user_name: "{{ ceilometer_system_user_name }}"
|
||||
@@ -100,7 +100,7 @@
|
||||
- systemd-service
|
||||
|
||||
- name: Including osa.service_setup role
|
||||
include_role:
|
||||
ansible.builtin.include_role:
|
||||
name: openstack.osa.service_setup
|
||||
apply:
|
||||
tags:
|
||||
@@ -123,7 +123,7 @@
|
||||
- always
|
||||
|
||||
- name: Including osa.mq_setup role
|
||||
include_role:
|
||||
ansible.builtin.include_role:
|
||||
name: openstack.osa.mq_setup
|
||||
apply:
|
||||
tags:
|
||||
@@ -148,7 +148,7 @@
|
||||
- always
|
||||
|
||||
- name: Importing ceilometer_db_setup tasks
|
||||
import_tasks: ceilometer_db_setup.yml
|
||||
ansible.builtin.import_tasks: ceilometer_db_setup.yml
|
||||
when:
|
||||
- _ceilometer_is_first_play_host
|
||||
tags:
|
||||
|
Reference in New Issue
Block a user