Merge "Generate /etc/hosts early on both under and overcloud"
This commit is contained in:
commit
c9fbf190b8
|
@ -476,7 +476,7 @@ outputs:
|
|||
- facts
|
||||
|
||||
- hosts: all
|
||||
name: Manage SELinux
|
||||
name: Manage SELinux and generate /etc/hosts
|
||||
gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
|
||||
any_errors_fatal: yes
|
||||
tasks:
|
||||
|
@ -484,6 +484,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
|
||||
|
@ -650,16 +657,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
|
||||
|
|
Loading…
Reference in New Issue