X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nagios3.yaml;h=e2ba8ccfc096e4a23cc86dcb3fc588e018d677d6;hb=e437e100b43d624de3a524b7a51b0b4aac9d4460;hp=1e0a46156fa4ae34476ef2f9116eb83aec7ed457;hpb=6dcc9e1528b3dff5279cbd17b01579f24db350ae;p=apex-tripleo-heat-templates.git

diff --git a/nagios3.yaml b/nagios3.yaml
index 1e0a4615..e2ba8ccf 100644
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -19,6 +19,26 @@ parameters:
     type: string
     description: Password for initial admin user
     hidden: true
+  external_network:
+    type: string
+    description: Network to attach floating ips to.
+    default: ext-net
+  flavor:
+    type: string
+    description: What flavor to use for the nagios server.
+    default: m1.small
+  image:
+    type: string
+    description: Image for Nagios.
+    default: nagios
+  key_name:
+    type: string
+    description: What Nova SSH key to use for the nagios server.
+    default: default
+  monitor_networks:
+    type: json
+    description: Neutron networks to monitor.
+    default: []
   nova_os_auth_url:
     type: string
     default: ''
@@ -36,30 +56,10 @@ parameters:
     type: string
     description: tenant name to present to nova_host_ip.
     default: ''
-  monitor_networks:
-    type: json
-    description: Neutron networks to monitor.
-    default: []
-  image:
-    type: string
-    description: Image for Nagios.
-    default: nagios
   server_network:
     type: string
     description: Network id for server.
     default: default-net
-  external_network:
-    type: string
-    description: Network to attach floating ips to.
-    default: ext-net
-  flavor:
-    type: string
-    description: What flavor to use for the nagios server.
-    default: m1.small
-  key_name:
-    type: string
-    description: What Nova SSH key to use for the nagios server.
-    default: default
 resources:
   nagios_config:
     type: OS::Heat::StructuredConfig
@@ -105,10 +105,15 @@ resources:
       flavor: { get_param: flavor }
       image: { get_param: image }
       key_name: { get_param: key_name }
-      user_data_format: SOFTWARE_CONFIG
       networks:
         - network: { get_param: server_network }
           port: { get_resource: nagios_net_port }
+      user_data_format: SOFTWARE_CONFIG
+      user_data: {get_resource: NodeUserData}
+
+  NodeUserData:
+    type: OS::TripleO::NodeUserData
+
   nagios_floating_ip:
     type: OS::Neutron::FloatingIP
     properties: