From 6f3f9ec6da71fec349856e719d0606a6d8b33d91 Mon Sep 17 00:00:00 2001
From: Alexis Lee <alexisl@hp.com>
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
---
 controller.yaml | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'controller.yaml')

diff --git a/controller.yaml b/controller.yaml
index 8aac819f..4123fc07 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -27,6 +27,8 @@ parameters:
     default: ''
     description: User to use for replication from bootstrap host
     type: string
+  controllerImage:
+    type: string
   GlanceDBPassword:
     description: Password for connecting to glance database
     type: string
@@ -43,6 +45,11 @@ parameters:
     description: Password for accessing Heat database.
     type: string
     hidden: true
+  HeatStackDomainAdminPassword:
+    description: Password for heat_domain_admin user.
+    type: string
+    default: ''
+    hidden: true
   InstanceType:
     default: baremetal
     description: Use this flavor
@@ -55,40 +62,33 @@ parameters:
     description: Password for connecting to keystone
     type: string
     hidden: true
-  NovaDBPassword:
-    description: Password for connecting to nova database
+  NeutronDBPassword:
+    description: Password for connecting to neutron database
     type: string
     hidden: true
-  NovaInterfaces:
+  NeutronInterfaces:
     default: eth0
     type: string
-  NeutronDBPassword:
-    description: Password for connecting to neutron database
+  NovaDBPassword:
+    description: Password for connecting to nova database
     type: string
     hidden: true
-  NeutronInterfaces:
+  NovaInterfaces:
     default: eth0
     type: string
   RabbitMQPassword:
     description: Password for RabbitMQ
     type: string
     hidden: true
-  RabbitUserName:
-    type: string
   RabbitPassword:
     type: string
     hidden: true
+  RabbitUserName:
+    type: string
   ServicePassword:
     description: admin_password for setting up auth in nova.
     type: string
     hidden: true
-  controllerImage:
-    type: string
-  HeatStackDomainAdminPassword:
-    description: Password for heat_domain_admin user.
-    type: string
-    default: ''
-    hidden: true
 resources:
   AccessPolicy:
     properties:
-- 
cgit 1.2.3-korg