Merge "Ensure haproxy is not enabled by puppet-tripleo when EnablePacemaker"

[apex-tripleo-heat-templates.git] / controller.yaml

diff --git a/controller.yaml b/controller.yaml
index f63ebbc..bbac3a6 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -168,6 +168,9 @@ parameters:
   HeatAuthEncryptionKey:
     description: Auth encryption key for heat-engine
     type: string
+  HorizonSecret:
+    description: Secret key for Django
+    type: string
   Image:
     type: string
     default: overcloud-control
@@ -205,6 +208,10 @@ parameters:
     description: Keystone key for signing tokens.
     type: string
     hidden: true
+  MysqlClustercheckPassword:
+    type: string
+    hidden: true
+    default: ''  # Has to be here because of the ignored empty value bug
   MysqlClusterUniquePart:
     description: A unique identifier of the MySQL cluster the controller is in.
     type: string