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

@@ -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

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

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

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

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

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