Merge "Sequence deploys - compute after control plane."

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

diff --git a/nagios3.yaml b/nagios3.yaml
index 0bdb1d3..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,11 +42,13 @@ 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:
@@ -96,5 +100,4 @@ Resources:
         Ref: Nagios3ImageId
       InstanceType: {Ref: InstanceType}
 Outputs:
-    Nagios3Host:
-        Fn::GetAtt: [ nagios3 , first_private_address ]
+    Nagios3Host: {'Fn::Select': [ 0, {'Fn::Select': [ 'ctlplane', 'Fn::GetAtt': [ 'nagios3' , 'networks' ] ]} ]}