From 3a15186e033fe2bca9c502c0a19e64e51a143425 Mon Sep 17 00:00:00 2001 From: "wichert, travis" Date: Fri, 18 Sep 2015 01:19:54 -0700 Subject: [PATCH] use real local vdc key for single deployments --- ecs-single-node/step2_object_provisioning.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ecs-single-node/step2_object_provisioning.py b/ecs-single-node/step2_object_provisioning.py index a3cea465..ec30f383 100644 --- a/ecs-single-node/step2_object_provisioning.py +++ b/ecs-single-node/step2_object_provisioning.py @@ -81,10 +81,9 @@ def DeleteUser(ECSNode,userName,Namespace): executeRestAPI("/object/users/deactivate", 'POST','.id', DeleteUserPayload, ECSNode) -def getVDCSecretKey(self): - Log.info(LoggingInfra.logger, "Fetch VDC secret key") - secretKeyDict = self.executeRestAPI("/vdc/secret-key", 'GET', '.secret_key', "") - return secretKeyDict['secret_key'] +def getVDCSecretKey(ECSNode): + secretKeyDict = executeRestAPI("/object/vdcs/vdc/local/secretkey", 'GET', '.secret_key', "", ECSNode, checkOutput=1) + return secretKeyDict['key'] def UploadLicense(ECSNode): @@ -136,8 +135,8 @@ def InsertVDC(ECSNode, VDCName): else: break - secretKey="secret12345" - #secretKey=getVDCSecretKey() + #secretKey="secret12345" + secretKey=getVDCSecretKey(ECSNode) InsertVDCPayload ='{\\"vdcName\\":\\"%s\\",\ \\"interVdcEndPoints\\":\\"%s\\", \ \\"secretKeys\\":\\"%s\\"\