From 6f3f9ec6da71fec349856e719d0606a6d8b33d91 Mon Sep 17 00:00:00 2001 From: Alexis Lee Date: Wed, 8 Oct 2014 15:17:29 +0100 Subject: Sort inputs and parameters They're mostly rather higgledy-piggledy at the moment which makes it quite difficult to compare against files where these are sorted. EG compute.yaml from I687a00c7dc164ba044f9f2dfca96a02401427855. Change-Id: I508a3d0f6a79810d2100fdd1ad143bcd37bf8c00 --- nagios3.yaml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'nagios3.yaml') diff --git a/nagios3.yaml b/nagios3.yaml index 1e0a4615..0db22b8b 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 -- cgit 1.2.3-korg