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
This commit is contained in:
TimurNurlygayanov 2013-11-22 15:52:10 +04:00
parent 70de267b88
commit 1c2fe7c42c
5 changed files with 17 additions and 2 deletions

View File

@ -5,7 +5,7 @@
"KeyName": { "KeyName": {
"Description": "Key Pair name for Load Balancer", "Description": "Key Pair name for Load Balancer",
"Type": "String", "Type": "String",
"Default": "murano-lb-key" "Default": "$keyName"
} }
}, },
@ -13,6 +13,7 @@
"$instanceName": { "$instanceName": {
"Type": "AWS::EC2::Instance", "Type": "AWS::EC2::Instance",
"Properties": { "Properties": {
"KeyName": { "Ref" : "KeyName" },
"InstanceType": "$instanceType", "InstanceType": "$instanceType",
"ImageId": "$imageName", "ImageId": "$imageName",
"AvailabilityZone": "$availabilityZone", "AvailabilityZone": "$availabilityZone",

View File

@ -34,6 +34,11 @@ forms:
label: Instance Count label: Instance Count
description: Several instances with Apache web Service can be created at one time. description: Several instances with Apache web Service can be created at one time.
helpText: Enter an integer value between 1 and 10 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 - name: unitNamingPattern
type: string type: string
label: Hostname label: Hostname

View File

@ -43,6 +43,11 @@ forms:
required: false required: false
widgetMedia: widgetMedia:
css: {all: [muranodashboard/css/checkbox.css]} css: {all: [muranodashboard/css/checkbox.css]}
- name: keyPair
type: keypair
label: Key Pair
description: >-
The Key Pair for VMs with this service
- name: unitNamingPattern - name: unitNamingPattern
type: string type: string
label: Hostname label: Hostname

View File

@ -16,6 +16,9 @@
<mapping name="instanceName"> <mapping name="instanceName">
<select path="state.hostname"/> <select path="state.hostname"/>
</mapping> </mapping>
<mapping name="keyName">
<select path="::keyPair.name"/>
</mapping>
<mapping name="userData"> <mapping name="userData">
<prepare-user-data template="Linux" initFile="linux_init.sh"> <prepare-user-data template="Linux" initFile="linux_init.sh">
<parameter name="hostname"> <parameter name="hostname">

View File

@ -10,6 +10,7 @@
<parameter name="mappings"> <parameter name="mappings">
<map> <map>
<mapping name="instanceName"><select path="state.hostname"/></mapping> <mapping name="instanceName"><select path="state.hostname"/></mapping>
<mapping name="keyName"><select path="::keyPair.name"/></mapping>
<mapping name="userData"> <mapping name="userData">
<prepare-user-data template="Linux" initFile="linux_init.sh"> <prepare-user-data template="Linux" initFile="linux_init.sh">
<parameter name="hostname"><select path="state.hostname"/></parameter> <parameter name="hostname"><select path="state.hostname"/></parameter>