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 @@
+
+
+
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 @@