diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-29 01:02:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-29 01:02:31 +0000 |
| commit | 95e443cd1081224cac9ca89846c874d10c6c43da (patch) | |
| tree | 64aaa85d0dfbe14d783cdaa1819edeee076389a2 /environments | |
| parent | d1deaae25f8583603c9a8d9394a81c12d5d1742c (diff) | |
| parent | 933f1afefd2ed6cf0f0395651f55fa25afbecad8 (diff) | |
Merge "Stop using puppet to configure VIPs in /etc/hosts"
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 |