From 97fec22483d9410037714505b954ff80a0d15a0c Mon Sep 17 00:00:00 2001 From: DR695H Date: Mon, 15 Jul 2019 13:32:20 -0400 Subject: use the public key directly using it from the property file rather than a file allows it to be set by someon with no code change in robot Issue-ID: TEST-167 Change-Id: If081282af993d5c55bf5d2a4eff9878cb0bb463f Signed-off-by: DR695H --- robot/resources/openstack/nova_interface.robot | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'robot/resources/openstack') diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot index b1f07f86..52bd174c 100644 --- a/robot/resources/openstack/nova_interface.robot +++ b/robot/resources/openstack/nova_interface.robot @@ -13,7 +13,6 @@ Resource openstack_common.robot ${OPENSTACK_NOVA_API_VERSION} /v2 ${OPENSTACK_NOVA_KEYPAIR_PATH} /os-keypairs ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} openstack/nova_add_keypair.jinja -${OPENSTACK_NOVA_KEYPAIR_SSH_KEY} robot/assets/keys/robot_ssh_public_key.txt ${OPENSTACK_NOVA_FLAVORS_PATH} /flavors ${OPENSTACK_NOVA_SERVERS_PATH} /servers ${OPENSTACK_NOVA_IMAGES_PATH} /images @@ -30,8 +29,7 @@ Get Openstack Keypair Add Openstack Keypair [Documentation] Runs an Openstack Request to add a keypair and returns the keypair name - [Arguments] ${alias} ${name} - ${ssh_key}= OperatingSystem.Get File ${OPENSTACK_NOVA_KEYPAIR_SSH_KEY} + [Arguments] ${alias} ${name} ${ssh_key} ${arguments}= Create Dictionary name=${name} publickey=${ssh_key} Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} ${data}= Apply Template openstack ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} ${arguments} -- cgit 1.2.3-korg