aboutsummaryrefslogtreecommitdiffstats
path: root/controller.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-06-01 10:18:10 -0400
committerDan Prince <dprince@redhat.com>2015-06-04 13:28:00 -0400
commit26dee879c015572bd440875cd0ddb2496357ac03 (patch)
tree176deb333258d39565cafa55e4803e9647c254a5 /controller.yaml
parent6b0b761062033ffff68374d182a4b0db1bb33268 (diff)
puppet controller role: per service VIP settings
This patch refactors the puppet controller role so that it makes use of per service VIP settings for each service. Previously the VIP for the ctlplane was hard wired to many of the controller service. With this patch we have the ability to isolate traffic for services which made use of the ctlplane and public VIPs for their settings. The implementation includes: * stops the use of the VirtualIP and PublicVirtualIP within the controller role. These parameters have now been replaced with per service heat parameters for the controller nested stack which are determined via VipMap based on per service settings in the heat environment. * All VIP configuration is now moved into puppet/vip-config.yaml. This made sense so we could deprecate the use of the VirtualIP and PublicVirtualIP settings above. * The puppet manifests for the controller were cleaned up for several to use Hiera directly instead of constructing URLs based on the static controller and public network VIPs. This improvement was something we wanted to do anyways and made the implementation cleaner. Change-Id: I9b9a15be67f74bec97366408f7047acfd6ea0ec6
Diffstat (limited to 'controller.yaml')
-rw-r--r--controller.yaml15
1 files changed, 15 insertions, 0 deletions
diff --git a/controller.yaml b/controller.yaml
index 4e541e92..8c1b93d2 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -418,6 +418,21 @@ parameters:
VirtualIP:
type: string
default: '' # Has to be here because of the ignored empty value bug
+ HeatApiVirtualIP:
+ type: string
+ default: ''
+ GlanceApiVirtualIP:
+ type: string
+ default: ''
+ MysqlVirtualIP:
+ type: string
+ default: ''
+ KeystonePublicApiVirtualIP:
+ type: string
+ default: ''
+ NeutronApiVirtualIP:
+ type: string
+ default: ''
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set