From e77d651cd114d1808fbb92ec096bcacd6caab111 Mon Sep 17 00:00:00 2001 From: Sanjay Chari Date: Wed, 1 Dec 2021 14:02:06 +0530 Subject: [PATCH] Fix collectd installation for composable roles This patch fixes collectd installation for composable roles, and also optimises the collectd build process on computes. Change-Id: Icf358415312885c68879aa886a78f3ae1c163e91 --- ansible/install/collectd-baremetal.yml | 6 ++++-- ansible/install/collectd-container.yml | 6 ++++-- ansible/install/start-collectd-baremetal.yml | 6 ++++-- ansible/install/start-collectd-container.yml | 6 ++++-- ansible/install/stop-collectd-baremetal.yml | 6 ++++-- ansible/install/stop-collectd-container.yml | 6 ++++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ansible/install/collectd-baremetal.yml b/ansible/install/collectd-baremetal.yml index 8ba6f8fff..26d7ced79 100644 --- a/ansible/install/collectd-baremetal.yml +++ b/ansible/install/collectd-baremetal.yml @@ -12,7 +12,7 @@ # ansible-playbook -i hosts install/collectd-openstack.yml --tag "blockstorage" # ansible-playbook -i hosts install/collectd-openstack.yml --tag "objectstorage" # ansible-playbook -i hosts install/collectd-openstack.yml --tag "cephstorage" -# ansible-playbook -i hosts install/collectd-openstack.yml --tag "compute" +# ansible-playbook -i hosts install/collectd-openstack.yml --tag "compute" -f 10 # @@ -35,6 +35,7 @@ environment: "{{proxy_env}}" - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: controller @@ -125,7 +126,8 @@ tags: cephstorage environment: "{{proxy_env}}" -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: compute diff --git a/ansible/install/collectd-container.yml b/ansible/install/collectd-container.yml index f13c8f95c..8bac7433a 100644 --- a/ansible/install/collectd-container.yml +++ b/ansible/install/collectd-container.yml @@ -6,7 +6,7 @@ # # ansible-playbook -i hosts install/collectd.yml --tags="undercloud" # ansible-playbook -i hosts install/collectd.yml --tags="controller" -# ansible-playbook -i hosts install/collectd.yml --tags="compute" +# ansible-playbook -i hosts install/collectd.yml --tags="compute" -f 10 - hosts: Undercloud @@ -22,6 +22,7 @@ environment: "{{proxy_env}}" - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: controller @@ -32,7 +33,8 @@ - { role: collectd, when: collectd_controller|bool } tags: controller -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: compute diff --git a/ansible/install/start-collectd-baremetal.yml b/ansible/install/start-collectd-baremetal.yml index f0b673479..501517043 100644 --- a/ansible/install/start-collectd-baremetal.yml +++ b/ansible/install/start-collectd-baremetal.yml @@ -12,7 +12,7 @@ # ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "blockstorage" # ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "objectstorage" # ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "cephstorage" -# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "compute" +# ansible-playbook -i hosts.yml install/start-collectd-baremetal.yml --tag "compute" -f 10 # @@ -26,6 +26,7 @@ tags: undercloud - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" tasks: - name: Start Collectd on controller @@ -70,7 +71,8 @@ ignore_errors: true tags: cephstorage -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" tasks: - name: Start Collectd on compute diff --git a/ansible/install/start-collectd-container.yml b/ansible/install/start-collectd-container.yml index 36bbd2246..268ac6a64 100644 --- a/ansible/install/start-collectd-container.yml +++ b/ansible/install/start-collectd-container.yml @@ -12,7 +12,7 @@ # ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "blockstorage" # ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "objectstorage" # ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "cephstorage" -# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "compute" +# ansible-playbook -i hosts.yml install/start-collectd-container.yml --tag "compute" -f 10 # @@ -32,6 +32,7 @@ tags: undercloud - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: controller @@ -106,7 +107,8 @@ ignore_errors: true tags: cephstorage -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: compute diff --git a/ansible/install/stop-collectd-baremetal.yml b/ansible/install/stop-collectd-baremetal.yml index 5cbe1b359..14a0c0ce2 100644 --- a/ansible/install/stop-collectd-baremetal.yml +++ b/ansible/install/stop-collectd-baremetal.yml @@ -12,7 +12,7 @@ # ansible-playbook -i hosts.yml install/stop-collectd-baremetal.yml --tag "blockstorage" # ansible-playbook -i hosts.yml install/stop-collectd-baremetal.yml --tag "objectstorage" # ansible-playbook -i hosts.yml install/stop-collectd-baremetal.yml --tag "cephstorage" -# ansible-playbook -i hosts.yml install/stop-collectd-baremetal.yml --tag "compute" +# ansible-playbook -i hosts.yml install/stop-collectd-baremetal.yml --tag "compute" -f 10 # @@ -26,6 +26,7 @@ tags: undercloud - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" tasks: - name: Stop Collectd on controller @@ -70,7 +71,8 @@ ignore_errors: true tags: cephstorage -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" tasks: - name: Stop Collectd on compute diff --git a/ansible/install/stop-collectd-container.yml b/ansible/install/stop-collectd-container.yml index 313361037..85fd9f59b 100644 --- a/ansible/install/stop-collectd-container.yml +++ b/ansible/install/stop-collectd-container.yml @@ -12,7 +12,7 @@ # ansible-playbook -i hosts.yml install/stop-collectd-container.yml --tag "blockstorage" # ansible-playbook -i hosts.yml install/stop-collectd-container.yml --tag "objectstorage" # ansible-playbook -i hosts.yml install/stop-collectd-container.yml --tag "cephstorage" -# ansible-playbook -i hosts.yml install/stop-collectd-container.yml --tag "compute" +# ansible-playbook -i hosts.yml install/stop-collectd-container.yml --tag "compute" -f 10 # @@ -32,6 +32,7 @@ tags: undercloud - hosts: Controller + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: controller @@ -106,7 +107,8 @@ ignore_errors: true tags: cephstorage -- hosts: Compute +- hosts: Compute* + strategy: free remote_user: "{{ host_remote_user }}" vars: config_type: compute