Don't run host_prep_tasks from {{role}}HostPrepDeployment

host_prep_tasks are run from deploy_steps_playbook.yaml, so there's no
need to also run them as part of the {{role}}HostPrepDeployment
resources.

Change-Id: If1bf6dda19e6e0b875463c421f9504efab85251b
(cherry picked from commit 697b1d9438)

common/deploy-steps.j2

@@ -266,19 +266,11 @@ resources:
                   docker_puppet_script: {get_file: ../docker/docker-puppet.py}
                   bootstrap_server_id: {get_attr: [BootstrapServerId, value]}
                 tasks:
-                  # Join host_prep_tasks with the other per-host configuration
-                  list_concat:
-{%- if is_upgrade|default(false) and role.disable_upgrade_deployment|default(false) %}
-                    - []
-{%- else %}
-                    - {get_param: [role_data, {{role.name}}, host_prep_tasks]}
-{%- endif %}
-                    -
-                      # FIXME: can we move docker-puppet somewhere so it's installed via a package?
-                      - name: Create /var/lib/docker-puppet
-                        file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
-                      - name: Write docker-puppet.py
-                        copy: content="{{ '{{' }}docker_puppet_script{{ '}}' }}" dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
+                  # FIXME: can we move docker-puppet somewhere so it's installed via a package?
+                  - name: Create /var/lib/docker-puppet
+                    file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
+                  - name: Write docker-puppet.py
+                    copy: content="{{ '{{' }}docker_puppet_script{{ '}}' }}" dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
 
   {{role.name}}HostPrepDeployment:
     type: OS::Heat::SoftwareDeploymentGroup