From 1c2fe7c42c8d7f39c51044fa8c2f3e6aba40d1b1 Mon Sep 17 00:00:00 2001
From: TimurNurlygayanov <tnurlygayanov@mirantis.com>
Date: Fri, 22 Nov 2013 15:52:10 +0400
Subject: [PATCH] Added the Key Pair drop down list to UI forms

Added new parameter for each Linux-based
(Linux Telnet and Linux Apache) services.

User can select the Key Pair from the drop down list
durring the Murano Linux-based services configuration.

Implemented: blueprint key-pair-for-linux-services
Change-Id: I774cd3714791ea7db1bd4889d38f52a1067c50fa
---
 muranorepository/Services/heat_templates/Linux.template | 3 ++-
 muranorepository/Services/ui_forms/LinuxApache.yaml     | 7 ++++++-
 muranorepository/Services/ui_forms/LinuxTelnet.yaml     | 5 +++++
 muranorepository/Services/workflows/Apache.xml          | 3 +++
 muranorepository/Services/workflows/LinuxTelnet.xml     | 1 +
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/muranorepository/Services/heat_templates/Linux.template b/muranorepository/Services/heat_templates/Linux.template
index 876795f..b28b753 100644
--- a/muranorepository/Services/heat_templates/Linux.template
+++ b/muranorepository/Services/heat_templates/Linux.template
@@ -5,7 +5,7 @@
         "KeyName": {
             "Description": "Key Pair name for Load Balancer",
             "Type": "String",
-            "Default": "murano-lb-key"
+            "Default": "$keyName"
         }
     },
 
@@ -13,6 +13,7 @@
         "$instanceName": {
             "Type": "AWS::EC2::Instance",
             "Properties": {
+                "KeyName": { "Ref" : "KeyName" },
                 "InstanceType": "$instanceType",
                 "ImageId": "$imageName",
                 "AvailabilityZone": "$availabilityZone",
diff --git a/muranorepository/Services/ui_forms/LinuxApache.yaml b/muranorepository/Services/ui_forms/LinuxApache.yaml
index 3e61dff..a050b7a 100644
--- a/muranorepository/Services/ui_forms/LinuxApache.yaml
+++ b/muranorepository/Services/ui_forms/LinuxApache.yaml
@@ -34,6 +34,11 @@ forms:
           label: Instance Count
           description: Several instances with Apache web Service can be created at one time.
           helpText: Enter an integer value between 1 and 10
+        - name: keyPair
+          type: keypair
+          label: Key Pair
+          description: >-
+             The Key Pair for VMs with this service
         - name: unitNamingPattern
           type: string
           label: Hostname
@@ -74,4 +79,4 @@ forms:
               type: azone
               label: Availability zone
               description: Select availability zone where service would be installed.
-              required: false
\ No newline at end of file
+              required: false
diff --git a/muranorepository/Services/ui_forms/LinuxTelnet.yaml b/muranorepository/Services/ui_forms/LinuxTelnet.yaml
index 6c3b901..a37ea0d 100644
--- a/muranorepository/Services/ui_forms/LinuxTelnet.yaml
+++ b/muranorepository/Services/ui_forms/LinuxTelnet.yaml
@@ -43,6 +43,11 @@ forms:
           required: false
           widgetMedia:
             css: {all: [muranodashboard/css/checkbox.css]}
+        - name: keyPair
+          type: keypair
+          label: Key Pair
+          description: >-
+             The Key Pair for VMs with this service
         - name: unitNamingPattern
           type: string
           label: Hostname
diff --git a/muranorepository/Services/workflows/Apache.xml b/muranorepository/Services/workflows/Apache.xml
index 74f19d1..9a836da 100644
--- a/muranorepository/Services/workflows/Apache.xml
+++ b/muranorepository/Services/workflows/Apache.xml
@@ -16,6 +16,9 @@
 					<mapping name="instanceName">
 						<select path="state.hostname"/>
 					</mapping>
+                    <mapping name="keyName">
+                        <select path="::keyPair.name"/>
+                    </mapping>
 					<mapping name="userData">
 						<prepare-user-data template="Linux" initFile="linux_init.sh">
 							<parameter name="hostname">
diff --git a/muranorepository/Services/workflows/LinuxTelnet.xml b/muranorepository/Services/workflows/LinuxTelnet.xml
index 42cdf63..6c13d2f 100644
--- a/muranorepository/Services/workflows/LinuxTelnet.xml
+++ b/muranorepository/Services/workflows/LinuxTelnet.xml
@@ -10,6 +10,7 @@
 			<parameter name="mappings">
 				<map>
 					<mapping name="instanceName"><select path="state.hostname"/></mapping>
+                    <mapping name="keyName"><select path="::keyPair.name"/></mapping>
 					<mapping name="userData">
 						<prepare-user-data template="Linux" initFile="linux_init.sh">
 							<parameter name="hostname"><select path="state.hostname"/></parameter>