Add support for isolating swift storage nets

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

diff --git a/nagios3.yaml b/nagios3.yaml
index 06cbb6a..e2ba8cc 100644 (file)
--- a/nagios3.yaml
+++ b/nagios3.yaml
@@ -12,13 +12,33 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-heat_template_version: 2014-10-16
+heat_template_version: 2013-05-23
 description: Deploy Nagios
 parameters:
   adm_web_passwd:
     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: