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

{{role}}HostPrepDeployment resources are still needed in queens as
config-download is not the default deployment procedure. Therefore,
if config-download is not used we would skip the host_prep_tasks,
which are needed for several services to work correctly (i.e:
nova-compute as stated in LP 1799903)

This reverts commit 3ce99b522c.

Change-Id: I2cd06a7f261d3587bb50683ae2b54631983ea077
Closes-Bug: #1799903

common/deploy-steps.j2

@@ -266,11 +266,19 @@ resources:
                   docker_puppet_script: {get_file: ../docker/docker-puppet.py}
                   bootstrap_server_id: {get_attr: [BootstrapServerId, value]}
                 tasks:
-                  # 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
+                  # 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
 
   {{role.name}}HostPrepDeployment:
     type: OS::Heat::SoftwareDeploymentGroup