diff --git a/.gitignore b/.gitignore index 3a77206..c46a9ec 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ logs/* # OS generated files # ###################### ._* +.ansible .tox *.egg-info .eggs diff --git a/defaults/main.yml b/defaults/main.yml index b50a69e..78397ea 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -14,7 +14,7 @@ # limitations under the License. ## Verbosity Options -debug: False +debug: false # Set the host which will execute the shade modules # for the service setup. The host must already have @@ -141,7 +141,7 @@ masakari_api_bind_address: "{{ openstack_service_bind_address | default('0.0.0.0 masakari_api_service_port: 15868 ## API options -masakari_enable_v1_api: True +masakari_enable_v1_api: true masakari_etc_dir: /etc/masakari masakari_monitor_etc_dir: /etc/masakarimonitors @@ -229,7 +229,7 @@ masakari_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_m # The multicast interface used by corocync for masakari hostmonitor masakari_monitor_corosync_multicast_interface: "br-mgmt" masakari_monitor_corosync_multicast_ports: 5405 -masakari_monitor_corosync_ipmi_check: False +masakari_monitor_corosync_ipmi_check: false ### ### Backend TLS @@ -249,7 +249,7 @@ masakari_pki_setup_host: "{{ openstack_pki_setup_host | default('localhost') }}" masakari_pki_keys_path: "{{ masakari_pki_dir ~ '/certs/private/' }}" masakari_pki_certs_path: "{{ masakari_pki_dir ~ '/certs/certs/' }}" masakari_pki_intermediate_cert_name: "{{ openstack_pki_service_intermediate_cert_name | default('ExampleCorpIntermediate') }}" -masakari_pki_regen_cert: '' +masakari_pki_regen_cert: "" masakari_pki_san: "{{ openstack_pki_san | default('DNS:' ~ ansible_facts['hostname'] ~ ',IP:' ~ management_address) }}" masakari_pki_certificates: - name: "masakari_{{ ansible_facts['hostname'] }}" diff --git a/examples/env.d/masakari.yml b/examples/env.d/masakari.yml index 7bb68a6..35d427b 100644 --- a/examples/env.d/masakari.yml +++ b/examples/env.d/masakari.yml @@ -22,4 +22,4 @@ physical_skel: - all_containers masakari_hosts: belongs_to: - - hosts \ No newline at end of file + - hosts diff --git a/handlers/main.yml b/handlers/main.yml index 2806974..d128547 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -17,7 +17,7 @@ service: name: "{{ item.value.service_name }}" state: restarted - daemon_reload: yes + daemon_reload: true with_dict: "{{ masakari_services }}" when: inventory_hostname in groups[item.value.group] listen: diff --git a/meta/openstack-ansible.yml b/meta/openstack-ansible.yml index dcb8343..37d5850 100644 --- a/meta/openstack-ansible.yml +++ b/meta/openstack-ansible.yml @@ -12,8 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - maturity_info: status: incubated created_during: rocky diff --git a/tasks/masakari_db_sync.yml b/tasks/masakari_db_sync.yml index 5d6a306..9c50510 100644 --- a/tasks/masakari_db_sync.yml +++ b/tasks/masakari_db_sync.yml @@ -15,6 +15,6 @@ - name: Perform a synchronization of the Masakari database command: "{{ masakari_bin }}/masakari-manage db sync" - become: yes + become: true become_user: "{{ masakari_system_user_name }}" changed_when: false diff --git a/tasks/masakari_post_install.yml b/tasks/masakari_post_install.yml index ebc7b5a..f1f5dad 100644 --- a/tasks/masakari_post_install.yml +++ b/tasks/masakari_post_install.yml @@ -78,5 +78,5 @@ owner: "root" group: "root" mode: "0440" - validate: '/usr/sbin/visudo -cf %s' + validate: "/usr/sbin/visudo -cf %s" when: "'masakari_monitor' in group_names"