Merge "Make the CloudDomain defaults match the doc strings"

[apex-tripleo-heat-templates.git] / puppet / services / keepalived.yaml

diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml
index 95a401c..fb0d32b 100644 (file)
--- a/puppet/services/keepalived.yaml
+++ b/puppet/services/keepalived.yaml
@@ -4,16 +4,49 @@ description: >
   Keepalived service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ControlVirtualInterface:
+    default: ''
+    description: >
+        Interface where virtual ip will be assigned.  This value will be
+        automatically set by the deployment tool.  Overriding here will
+        override automatic setting.
+    type: string
+  PublicVirtualInterface:
+    default: ''
+    description: >
+        Interface where virtual ip will be assigned.  This value will be
+        automatically set by the deployment tool.  Overriding here will
+        override automatic setting.
+    type: string
+  MonitoringSubscriptionKeepalived:
+    default: 'overcloud-keepalived'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Keepalived role.
     value:
       service_name: keepalived
+      monitoring_subscription: {get_param: MonitoringSubscriptionKeepalived}
+      config_settings:
+        tripleo::keepalived::control_virtual_interface: {get_param: ControlVirtualInterface}
+        tripleo::keepalived::public_virtual_interface: {get_param: PublicVirtualInterface}
+        tripleo.keepalived.firewall_rules:
+          '106 keepalived vrrp':
+            proto: vrrp
       step_config: |
         include ::tripleo::profile::base::keepalived