From f211e2d160670057b85e21dfa9180292ecdf7bd2 Mon Sep 17 00:00:00 2001 From: Thirumalesh Aaraveti Date: Wed, 20 Nov 2024 20:02:46 +0530 Subject: [PATCH] Fixed the account_id issue --- .../common/clouds/ibm/account/ibm_authenticator.py | 2 +- jenkins/clouds/ibm/hourly/tagging/tagging.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud_governance/common/clouds/ibm/account/ibm_authenticator.py b/cloud_governance/common/clouds/ibm/account/ibm_authenticator.py index 8de0a534..0b67ed68 100644 --- a/cloud_governance/common/clouds/ibm/account/ibm_authenticator.py +++ b/cloud_governance/common/clouds/ibm/account/ibm_authenticator.py @@ -17,7 +17,7 @@ def __init__(self): if hasattr(self.env_config, 'IBM_ACCOUNT_ID'): self.account_id = self.env_config.IBM_ACCOUNT_ID else: - self.account_id = self.env_config.environment_variables_dict.get('ACCOUNT_ID') + self.account_id = self.env_config.environment_variables_dict.get('IBM_ACCOUNT_ID') if hasattr(self.env_config, 'IBM_CLOUD_API_KEY'): self.__api_key = self.env_config.IBM_CLOUD_API_KEY else: diff --git a/jenkins/clouds/ibm/hourly/tagging/tagging.py b/jenkins/clouds/ibm/hourly/tagging/tagging.py index 09959f9a..d713c1a6 100644 --- a/jenkins/clouds/ibm/hourly/tagging/tagging.py +++ b/jenkins/clouds/ibm/hourly/tagging/tagging.py @@ -55,12 +55,12 @@ def get_podman_run_cmd(volume_mounts: list = None, **kwargs): 'log_level': "INFO", 'policy': 'tag_baremetal', "PUBLIC_CLOUD_NAME": "IBM", "tag_custom": tag_custom} baremetal_cmd = get_podman_run_cmd(volume_mounts=volume_mounts_targets, **input_env_keys) -# run_cmd(baremetal_cmd) +run_cmd(baremetal_cmd) run_cmd("echo Run IBM tag Virtual Machines") input_env_keys['policy'] = 'tag_vm' virtual_machine_cmd = get_podman_run_cmd(volume_mounts=volume_mounts_targets, **input_env_keys) -# run_cmd(virtual_machine_cmd) +run_cmd(virtual_machine_cmd) # Run tag resources run_cmd("echo Run tag resources command")