From e3cb92a5db51eb80d0806a9bf42b689756a4ac9f Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 26 Aug 2016 12:41:53 -0400 Subject: Mv Nova, Neutron, Horizon out of controller.yaml This patch moves the settings for Nova, Neutron, and Horizon out of controller.yaml. Also fixes the NovaPassword settings in nova-base.yaml so they don't use get_input. Also, creates a new apache.yaml base service to contain shared apache settings for several services which use Apache for WSGI. Co-Authored-By: Giulio Fidente Change-Id: I35d909bd5abc23976b5732a2b9af31cf1448838e Related-bug: #1604414 --- overcloud-resource-registry-puppet.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'overcloud-resource-registry-puppet.yaml') diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 57399210..c9870982 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -130,6 +130,7 @@ resource_registry: # services OS::TripleO::Services: puppet/services/services.yaml + OS::TripleO::Services::Apache: puppet/services/apache.yaml OS::TripleO::Services::CACerts: puppet/services/ca-certs.yaml OS::TripleO::Services::CephMon: OS::Heat::None OS::TripleO::Services::CephOSD: OS::Heat::None -- cgit 1.2.3-korg