Merge "Revert "Don't run host_prep_tasks from {{role}}HostPrepDeployment"" into stable/queens
This commit is contained in:
commit
e3fac2d062
|
@ -270,6 +270,14 @@ 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
|
||||
|
|
Loading…
Reference in New Issue