openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Generate /etc/hosts early on both under and overcloud" into stable/train

This commit is contained in:
Zuul 2020-03-18 06:56:27 +00:00 committed by Gerrit Code Review
parent dbda462567 8b8194b171
commit 1f24c05c43
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
common/deploy-steps.j2
View File

@ -433,7 +433,7 @@ outputs:
deploy_target_host: "DEPLOY_TARGET_HOST"
- hosts: all
name: Manage SELinux
name: Manage SELinux and generate /etc/hosts
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
any_errors_fatal: yes
tasks:
@ -441,6 +441,13 @@ outputs:
selinux:
policy: targeted
state: SELINUX_MODE
- name: Configure Hosts Entries
include_role:
name: tripleo-hosts-entries
vars:
tripleo_hosts_entries_undercloud_hosts_entries: {{ '"{{ ' }} undercloud_hosts_entries {{ ' }}"' }}
tripleo_hosts_entries_extra_hosts_entries: {{ '"{{ ' }} extra_hosts_entries {{ ' }}"' }}
tripleo_hosts_entries_vip_hosts_entries: {{ '"{{ ' }} vip_hosts_entries {{ ' }}"' }}
- hosts: DEPLOY_TARGET_HOST
name: Common roles for TripleO servers
@ -607,16 +614,6 @@ outputs:
environment:
artifact_urls: {{ '"{{' }} deploy_artifact_urls {{ '}}"' }}
- name: Configure Hosts Entries
include_role:
name: tripleo-hosts-entries
vars:
tripleo_hosts_entries_undercloud_hosts_entries: {{ '"{{ ' }} undercloud_hosts_entries {{ ' }}"' }}
tripleo_hosts_entries_extra_hosts_entries: {{ '"{{ ' }} extra_hosts_entries {{ ' }}"' }}
tripleo_hosts_entries_vip_hosts_entries: {{ '"{{ ' }} vip_hosts_entries {{ ' }}"' }}
tags:
- tripleo_hosts_entries
tags:
- overcloud
- pre_deploy_steps