Remove duplicated tasks to create persisitent directries for haproxy

We already have the task to create persistent directories for haproxy
in the HAProxyBase resource, so we don't need to define the same task
in haproxy-pacemaker-puppet.yaml.

Note that haproxy-pacemaker-puppet.yaml used to create /var/log/haproxy
but this is removed by this change because that directory is never
used.

Change-Id: I8a846317512ad068caa297821105023a71dc2183

deployment/haproxy/haproxy-container-puppet.yaml

@@ -367,16 +367,17 @@ outputs:
                   - haproxy
                 tripleo_delegate_to: "{{ groups['haproxy'] | default([]) }}"
       host_prep_tasks:
-        - {get_attr: [HAProxyPublicTLS, role_data, host_prep_tasks]}
-        - name: create persistent directories
-          file:
-            path: "{{ item.path }}"
-            state: directory
-            setype: "{{ item.setype }}"
-            mode: "{{ item.mode|default(omit) }}"
-          with_items:
-            - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
-            - { 'path': /var/lib/haproxy, 'setype': container_file_t }
+        list_concat:
+          - {get_attr: [HAProxyPublicTLS, role_data, host_prep_tasks]}
+          - - name: create persistent directories
+              file:
+                path: "{{ item.path }}"
+                state: directory
+                setype: "{{ item.setype }}"
+                mode: "{{ item.mode|default(omit) }}"
+              with_items:
+                - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
+                - { 'path': /var/lib/haproxy, 'setype': container_file_t }
       metadata_settings:
         list_concat:
           - {get_attr: [HAProxyPublicTLS, role_data, metadata_settings]}

deployment/haproxy/haproxy-pacemaker-puppet.yaml

@@ -259,37 +259,28 @@ outputs:
               optional: true
       container_config_scripts: {get_attr: [ContainersCommon, container_config_scripts]}
       host_prep_tasks:
-        - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
-        - name: create persistent directories
-          file:
-            path: "{{ item.path }}"
-            state: directory
-            setype: "{{ item.setype }}"
-            mode: "{{ item.mode|default(omit) }}"
-          with_items:
-            - { 'path': /var/log/containers/haproxy, 'setype': var_log_t, 'mode': '0750' }
-            - { 'path': /var/lib/haproxy, 'setype': container_file_t }
-            - { 'path': /var/log/haproxy, 'setype': container_file_t }
-        - name: Run puppet on the host to apply IPtables rules
-          no_log: true
-          shell: |
-            puppet apply {{ (puppet_debug|bool) | ternary('--debug --verbose', '') }} --detailed-exitcodes --summarize --color=false \
-                --modulepath '{{ puppet_modulepath }}' --tags '{{ puppet_tags }}' -e '{{ puppet_execute }}'
-          register: puppet_host_outputs
-          changed_when: puppet_host_outputs.rc == 2
-          failed_when: false
-          vars:
-            puppet_execute: "if hiera('enable_load_balancer', true) { class {'::tripleo::haproxy': use_internal_certificates => false, manage_firewall => hiera('tripleo::firewall::manage_firewall', true), }}"
-            puppet_tags: tripleo::firewall::rule
-            puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
-            puppet_debug: {get_param: ConfigDebug}
-        - name: "Debug output for task: Run puppet on the host to apply IPtables rules"
-          debug:
-            var: puppet_host_outputs.stdout_lines | default([]) | union(puppet_host_outputs.stderr_lines | default([]))
-          when:
-            - not (ansible_check_mode | bool)
-            - puppet_host_outputs.rc is defined
-          failed_when: puppet_host_outputs.rc not in [0, 2]
+        list_concat:
+          - {get_attr: [HAProxyBase, role_data, host_prep_tasks]}
+          - - name: Run puppet on the host to apply IPtables rules
+              no_log: true
+              shell: |
+                puppet apply {{ (puppet_debug|bool) | ternary('--debug --verbose', '') }} --detailed-exitcodes --summarize --color=false \
+                    --modulepath '{{ puppet_modulepath }}' --tags '{{ puppet_tags }}' -e '{{ puppet_execute }}'
+              register: puppet_host_outputs
+              changed_when: puppet_host_outputs.rc == 2
+              failed_when: false
+              vars:
+                puppet_execute: "if hiera('enable_load_balancer', true) { class {'::tripleo::haproxy': use_internal_certificates => false, manage_firewall => hiera('tripleo::firewall::manage_firewall', true), }}"
+                puppet_tags: tripleo::firewall::rule
+                puppet_modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
+                puppet_debug: {get_param: ConfigDebug}
+            - name: "Debug output for task: Run puppet on the host to apply IPtables rules"
+              debug:
+                var: puppet_host_outputs.stdout_lines | default([]) | union(puppet_host_outputs.stderr_lines | default([]))
+              when:
+                - not (ansible_check_mode | bool)
+                - puppet_host_outputs.rc is defined
+              failed_when: puppet_host_outputs.rc not in [0, 2]
       metadata_settings:
         {get_attr: [HAProxyBase, role_data, metadata_settings]}
       deploy_steps_tasks: