12.0.0
This commit is contained in:
@@ -39,21 +39,21 @@ class decort_bservice(DecortController):
|
||||
self.fail_json(**self.result)
|
||||
# fail the module -> exit
|
||||
# now validate RG
|
||||
validated_rg_id, validated_rg_facts = self.rg_find(
|
||||
validated_rg_id, validated_rg_model = self.rg_find(
|
||||
arg_account_id=validated_acc_id,
|
||||
arg_rg_id=arg_amodule.params['rg_id'],
|
||||
arg_rg_name=arg_amodule.params['rg_name']
|
||||
)
|
||||
if not validated_rg_id:
|
||||
if not validated_rg_id or not validated_rg_model:
|
||||
self.result['failed'] = True
|
||||
self.result['changed'] = False
|
||||
self.result['msg'] = "Cannot find RG ID {} / name '{}'.".format(arg_amodule.params['rg_id'],
|
||||
arg_amodule.params['rg_name'])
|
||||
self.fail_json(**self.result)
|
||||
self.amodule.fail_json(**self.result)
|
||||
|
||||
arg_amodule.params['rg_id'] = validated_rg_id
|
||||
arg_amodule.params['rg_name'] = validated_rg_facts['name']
|
||||
validated_acc_id = validated_rg_facts['accountId']
|
||||
arg_amodule.params['rg_name'] = validated_rg_model.name
|
||||
validated_acc_id = validated_rg_model.account_id
|
||||
|
||||
self.bservice_id, self.bservice_info = self.bservice_find(
|
||||
validated_acc_id,
|
||||
@@ -104,11 +104,11 @@ class decort_bservice(DecortController):
|
||||
return
|
||||
|
||||
def create(self):
|
||||
self.bservice_id = self.bservice_id = self.bservice_provision(
|
||||
self.amodule.params['name'],
|
||||
self.amodule.params['rg_id'],
|
||||
self.amodule.params['sshuser'],
|
||||
self.amodule.params['sshkey'],
|
||||
self.bservice_id = self.sdk_checkmode(self.api.ca.bservice.create)(
|
||||
name=self.amodule.params['name'],
|
||||
rg_id=self.amodule.params['rg_id'],
|
||||
ssh_user_name=self.amodule.params['sshuser'],
|
||||
ssh_public_key=self.amodule.params['sshkey'],
|
||||
zone_id=self.aparams['zone_id'],
|
||||
)
|
||||
if self.bservice_id:
|
||||
@@ -136,7 +136,10 @@ class decort_bservice(DecortController):
|
||||
pass
|
||||
|
||||
def destroy(self):
|
||||
self.bservice_delete(self.bservice_id)
|
||||
self.sdk_checkmode(self.api.ca.bservice.delete)(
|
||||
bservice_id=self.bservice_id,
|
||||
permanently=True,
|
||||
)
|
||||
self.bservice_info['status'] = 'DELETED'
|
||||
self.bservice_should_exist = False
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user