From: Marco Platania <platania@research.att.com>
Date: Fri, 19 Oct 2018 13:04:18 +0000 (+0000)
Subject: Merge "Do not prepand randomo str in key for vFW_NextGen"
X-Git-Tag: 1.3.0~9
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e78a388ab411fe7145c5fd4197a5013c9b97cbfe;hp=e766ea324ebd456224f66d77e59f8d4c954bc5aa;p=demo.git

Merge "Do not prepand randomo str in key for vFW_NextGen"
---

diff --git a/heat/vFW_NextGen/templates/base_template.yaml b/heat/vFW_NextGen/templates/base_template.yaml
index 1804fdda..9184fdaf 100644
--- a/heat/vFW_NextGen/templates/base_template.yaml
+++ b/heat/vFW_NextGen/templates/base_template.yaml
@@ -74,20 +74,10 @@ parameters:
 #############
 
 resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
   my_keypair:
     type: OS::Nova::KeyPair
     properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
+      name: { get_param: key_name }
       public_key: { get_param: pub_key }
       save_private_key: false