Merge "Sequence deploys - compute after control plane."

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

diff --git a/nagios3.yaml b/nagios3.yaml
index 6d86ebb..e60eb55 100644 (file)
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -9,6 +9,7 @@ Parameters:
     Description: Password for nagiosadmin web admin user.
     Type: String
     Default: nagiosadmin
+    NoEcho: true
   NovaHostIp:
     Description: nova ip.
     Type: String
@@ -17,6 +18,7 @@ Parameters:
     Description: nova OS_PASSWORD.
     Type: String
     Default: unset
+    NoEcho: true
   NovaOsUsername:
     Description: nova OS_USERNAME.
     Type: String
@@ -40,13 +42,27 @@ Parameters:
   Apache2SnakeoilPem:
     Description: Snakeoil PEM file.
     Type: String
+    NoEcho: true
     Default: |
       -----  BEGIN PlaceHolder...
   Apache2SnakeoilKey:
     Description: Snakeoil Key file.
     Type: String
+    NoEcho: true
     Default: |
       -----  BEGIN PlaceHolder...
+  PostfixMailHostname:
+    Description: Hostname for postfix..
+    Type: String
+    Default: nagios3-nagios3
+  PostfixMailDomain:
+    Description: Top level domain for postfix.
+    Type: String
+    Default: novalocal
+  PostfixDelayWarningTime:
+    Description: Amount of time to Delay warnnings.
+    Type: String
+    Default: 4h
 Resources:
   nagios3:
     Metadata:
@@ -69,6 +85,13 @@ Resources:
           Ref: NovaOsTenantName
         initial_network_split_key:
           Ref: InitialIpSplitKey
+      postfix:
+        mailhostname:
+          Ref: PostfixMailHostname
+        maildomain:
+          Ref: PostfixMailDomain
+        delay_warning_time:
+          Ref: PostfixDelayWarningTime
     Type: AWS::EC2::Instance
     Properties:
       KeyName:
@@ -77,5 +100,4 @@ Resources:
         Ref: Nagios3ImageId
       InstanceType: {Ref: InstanceType}
 Outputs:
-    Nagios3Host:
-        Fn::GetAtt: [ nagios3 , PrivateIp ]
\ No newline at end of file
+    Nagios3Host: {'Fn::Select': [ 0, {'Fn::Select': [ 'ctlplane', 'Fn::GetAtt': [ 'nagios3' , 'networks' ] ]} ]}