aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-29 01:02:31 +0000
committerGerrit Code Review <review@openstack.org>2016-11-29 01:02:31 +0000
commit95e443cd1081224cac9ca89846c874d10c6c43da (patch)
tree64aaa85d0dfbe14d783cdaa1819edeee076389a2 /overcloud-resource-registry-puppet.j2.yaml
parentd1deaae25f8583603c9a8d9394a81c12d5d1742c (diff)
parent933f1afefd2ed6cf0f0395651f55fa25afbecad8 (diff)
Merge "Stop using puppet to configure VIPs in /etc/hosts"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index aaf9ac0f..30b9f2b9 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -182,7 +182,6 @@ resource_registry:
OS::TripleO::Services::GnocchiApi: puppet/services/gnocchi-api.yaml
OS::TripleO::Services::GnocchiMetricd: puppet/services/gnocchi-metricd.yaml
OS::TripleO::Services::GnocchiStatsd: puppet/services/gnocchi-statsd.yaml
- OS::TripleO::Services::VipHosts: puppet/services/vip-hosts.yaml
# Services that are disabled by default (use relevant environment files):
OS::TripleO::Services::FluentdClient: OS::Heat::None
OS::TripleO::LoggingConfiguration: puppet/services/logging/fluentd-config.yaml