diff --git a/doc/source/index.rst b/doc/source/index.rst index 55bdc48..814303f 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -19,6 +19,11 @@ structure used by OpenStack-Ansible to work. git clone https://opendev.org/vexxhost/openstack-monitoring /opt/openstack-monitoring +#. Install the role dependencies + + .. code:: + + ansible-galaxy install -r requirements.yml #. Add the following variables inside your ``user_variables.yml`` file in order for the playbooks to ensure that they point towards the RabbitMQ which your diff --git a/playbooks/common-tasks/setup-checks.yml b/playbooks/common-tasks/setup-checks.yml index 9f5425e..c669a8d 100644 --- a/playbooks/common-tasks/setup-checks.yml +++ b/playbooks/common-tasks/setup-checks.yml @@ -21,4 +21,5 @@ standalone: true path: "/etc/sensu/conf.d/{{ sensu_service }}.json" notify: Restart sensu-client + when: item.condition | default(True) with_items: "{{ sensu_checks }}" \ No newline at end of file diff --git a/playbooks/openstack-hosts-setup.yml b/playbooks/openstack-hosts-setup.yml index 3d53b62..ab3eae5 100644 --- a/playbooks/openstack-hosts-setup.yml +++ b/playbooks/openstack-hosts-setup.yml @@ -22,6 +22,13 @@ vars: sensu_service: host tasks: + - include_role: + name: openmanage + vars: + openmanage_install_monitoring_tools: true + when: + - ansible_system_vendor == 'Dell Inc.' + - import_tasks: common-tasks/install-plugins.yml vars: sensu_plugins: @@ -49,6 +56,9 @@ command: check-entropy.rb - name: load command: check-load.rb + - name: openmanage + command: /usr/local/bin/check_openmanage -b pdisk_cert=all + condition: ansible_system_vendor == 'Dell Inc.' environment: "{{ deployment_environment_variables | default({}) }}" tags: - openstack-hosts \ No newline at end of file diff --git a/requirements.yml b/requirements.yml new file mode 100644 index 0000000..98e0c9e --- /dev/null +++ b/requirements.yml @@ -0,0 +1,4 @@ +--- +- name: openmanage + src: https://opendev.org/vexxhost/ansible-role-openmanage + scm: git \ No newline at end of file