Fix collectd path replacement bug

- Other updates to fix existing CI problems

Change-Id: Ia209c4c23316ea0e29b58ff9d99f4e8577f80450

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_connection/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Set up expected THT vars"
       set_fact:

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_connection/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_connection/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: Verify
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Get amqp conf"
       stat:

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_default_interval/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Set up expected THT vars"
       set_fact:

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_default_interval/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/amqp_default_interval/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: Verify
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Get amqp conf"
       stat:

tripleo_ansible/roles/tripleo_collectd/molecule/collectd_connection/molecule.yml

@@ -12,10 +12,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"
@@ -36,7 +36,6 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
     privileged: true

tripleo_ansible/roles/tripleo_collectd/molecule/collectd_connection/verify.yml

@@ -45,7 +45,8 @@
 
 - name: "(Re)start collectd service"
   hosts:
-    - all
+    - collectd-test
+    - collectd-server
   tasks:
     - name: "Kill running collectd process"
       command:

tripleo_ansible/roles/tripleo_collectd/molecule/common/prepare.yml

@@ -16,11 +16,15 @@
 
 
 - name: Prepare
-  hosts: all
+  hosts:
+    - collectd-test
+    - collectd-server
   tasks:
     - name: "Enable delorean repos"
       command: |
         dnf config-manager --add-repo https://trunk.rdoproject.org/centos{{ ansible_facts['distribution_major_version'] }}/current/delorean.repo
+      args:
+        warn: false
 
     - name: "Install tripleo-repos"
       package:
@@ -52,6 +56,11 @@
           - collectd-libpod-stats
         state: present
 
+    - name: "Install pkill"
+      package:
+        name:
+          - procps-ng
+
     - name: "Create a directory for the log file"
       file:
         path: /var/log/collectd/

tripleo_ansible/roles/tripleo_collectd/molecule/common/verify.yml

@@ -16,7 +16,7 @@
 
 
 - name: "Common Verify tasks"
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: Check for files in conf output dir
       find:

tripleo_ansible/roles/tripleo_collectd/molecule/default/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Set up expected THT vars"
       set_fact:

tripleo_ansible/roles/tripleo_collectd/molecule/default/molecule.yml

@@ -8,11 +8,11 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
       - /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/default/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: Verify
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Check that the right plugins are enabled"
       stat:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_libpodstats/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - set_fact:
         tripleo_role_name: "SomeRole"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_libpodstats/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_libpodstats/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: "Verify collectd libpodstats plugin"
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: Check that the libpodstats conf file exists
       stat:
@@ -41,7 +41,7 @@
         src: /etc/collectd.conf
       register: output
       failed_when:
-        - not "TypesDB \"/etc/collectd.d/types.db.libpodstats\"" in output.content | b64decode
+        - not "TypesDB \"/etc/collectd.d//types.db.libpodstats\"" in output.content | b64decode
 
     - name: "Check that the contents of types.db.libpodstats are as expected"
       slurp:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sensubility/converge.yml

@@ -1,6 +1,6 @@
 ---
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - set_fact:
         tripleo_role_name: "SomeRole"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sensubility/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sensubility/verify.yml

@@ -2,7 +2,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: "Verify collectd exec plugin"
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Check that the exec plugin config file exists"
       stat:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sqlalchemy/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Set up expected THT vars"
       set_fact:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sqlalchemy/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_sqlalchemy/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: Verify
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Make sure python.conf exists"
       stat:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_stf/converge.yml

@@ -16,7 +16,7 @@
 
 
 - name: Converge
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Set up expected THT vars"
       set_fact:

tripleo_ansible/roles/tripleo_collectd/molecule/enable_stf/molecule.yml

@@ -8,10 +8,10 @@ platforms:
     image: centos/centos:stream8
     registry:
       url: quay.io
-    pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
     volumes:
       - /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
-      - /etc/dnf/vars:/etc/dnf/vars
+      # Had to comment this out or I get "No URLs in mirrorlist"
+      #- /etc/dnf/vars:/etc/dnf/vars
     privileged: true
     environment: &env
       http_proxy: "{{ lookup('env', 'http_proxy') }}"

tripleo_ansible/roles/tripleo_collectd/molecule/enable_stf/verify.yml

@@ -18,7 +18,7 @@
 - import_playbook: ../common/verify.yml
 
 - name: Verify
-  hosts: all
+  hosts: collectd-test
   tasks:
     - name: "Check that the right plugins are enabled"
       stat:

tripleo_ansible/roles/tripleo_collectd/tasks/configure_collectd.yml

@@ -222,5 +222,5 @@
 - name: "Update config file path"
   replace:
     path: "{{ collectd_conf_output_dir }}/../collectd.conf"
-    regexp: "^(.*){{ collectd_conf_output_dir }}/(.*)$"
+    regexp: "^(.*){{ collectd_conf_output_dir }}(.*)$"
     replace: '\1/etc/collectd.d/\2'