diff options
| author |   Dan Prince <dprince@redhat.com> | 2016-11-25 11:20:57 -0500 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2016-11-27 13:20:33 -0500 |
| commit | 933f1afefd2ed6cf0f0395651f55fa25afbecad8 (patch) | |
| tree | 8ab2f9120e06825010af8d07c70332e1ef62dbca /environments | |
| parent | 2a7e0445187df045d61b6b34b6943a3c6a448308 (diff) | |
Stop using puppet to configure VIPs in /etc/hosts
This patch drops use of the vip-hosts.yaml service which can
cause issues during deployment because puppet 'hosts' resources
overwrite the data in /etc/hosts. The only reason things seem to work
at all at the moment is because our hosts element in t-i-e runs
on each os-refresh-config iteration and re-adds the dropped hosts
entries.
To work around the issue we add a conditional which selectively
adds the extra hosts entries only if the AddVipsToEtcHosts is set
to true.
Closes-bug: 1645123
Change-Id: Ic6aaeb249a127df83894f32a704219683a6382b2
Diffstat (limited to 'environments')
| -rw-r--r-- | environments/hyperconverged-ceph.yaml | 3 | ||||
| -rw-r--r-- | environments/use-dns-for-vips.yaml | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/environments/hyperconverged-ceph.yaml b/environments/hyperconverged-ceph.yaml index 8258ae91..77fa5a49 100644 --- a/environments/hyperconverged-ceph.yaml +++ b/environments/hyperconverged-ceph.yaml @@ -25,5 +25,4 @@ parameter_defaults: - OS::TripleO::Services::OpenDaylightOvs - OS::TripleO::Services::SensuClient - OS::TripleO::Services::FluentdClient - - OS::TripleO::Services::VipHosts - - OS::TripleO::Services::CephOSD
\ No newline at end of file + - OS::TripleO::Services::CephOSD diff --git a/environments/use-dns-for-vips.yaml b/environments/use-dns-for-vips.yaml index daf07bc7..b700312f 100644 --- a/environments/use-dns-for-vips.yaml +++ b/environments/use-dns-for-vips.yaml @@ -1,5 +1,5 @@ # A Heat environment file which can be used to disable the writing of the VIPs # to the /etc/hosts file in the overcloud. Use this in case you have a working # DNS server that you will provide for the overcloud. -resource_registry: - OS::TripleO::Services::VipHosts: OS::Heat::None +parameter_defaults: + AddVipsToEtcHosts: False |