From 07cad37303fc6a64fa0f6bf5f99d3a9fab2ccceb Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Fri, 19 Oct 2018 08:32:17 -0400 Subject: Do not prepand randomo str in key for vFW_NextGen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the assignment for the key-name is using CDS, the key-name shouldn't be adding anything to the name that has been resolved, as it would create a discrepancy between what is expected to be the key-name vs what it would be. Using CDS, resolutions happens through GR-API, and are stored within MD-SAL. If that value is altered, deployment will fail as the process won't know about this additional random-str. Change-Id: Icba069a1345572debded44b4e5486b23524728ea Issue-ID: INT-694 Signed-off-by: Alexis de Talhouët --- heat/vFW_NextGen/templates/base_template.yaml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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 -- cgit 1.2.3-korg