diff --git a/.github/workflows/blacked.yml b/.github/workflows/blacked.yml index 12276689..aedd6e57 100644 --- a/.github/workflows/blacked.yml +++ b/.github/workflows/blacked.yml @@ -17,7 +17,7 @@ jobs: - name: Create Pull Request if: steps.git-check.outputs.modified == 'true' id: cpr - uses: peter-evans/create-pull-request@v4.0.2 + uses: peter-evans/create-pull-request@v4.0.3 with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: fix(Linting):blacked code diff --git a/VirtualMachineService/VirtualMachineHandler.py b/VirtualMachineService/VirtualMachineHandler.py index cc73f3c8..589cb948 100644 --- a/VirtualMachineService/VirtualMachineHandler.py +++ b/VirtualMachineService/VirtualMachineHandler.py @@ -2190,6 +2190,13 @@ def start_cluster(self, public_key, master_instance, worker_instances, user): "masterInstance": master_instance, "workerInstances": wI, "useMasterWithPublicIp": False, + "ansibleGalaxyRoles": [ + { + "name": "autoscaling", + "hosts": "all", + "git": "https://github.com/patricS4/autoscaling-config-ansible", + } + ], } for mode in self.BIBIGRID_MODES: body.update({mode: True}) diff --git a/VirtualMachineService/ancon/Playbook.py b/VirtualMachineService/ancon/Playbook.py index c1e82c9f..f99c8eec 100644 --- a/VirtualMachineService/ancon/Playbook.py +++ b/VirtualMachineService/ancon/Playbook.py @@ -31,7 +31,6 @@ class Playbook(object): - ACTIVE = "ACTIVE" PLAYBOOK_FAILED = "PLAYBOOK_FAILED" @@ -57,6 +56,9 @@ def __init__( None # init process, returncode, standard output, standard error output ) self.returncode = -1 + self.playbooks_information = playbooks_information + LOG.exception(self.playbooks_information) + self.stdout = "" self.stderr = "" # init temporary directories and mandatory generic files @@ -145,10 +147,14 @@ def load_vars(): data[playbook_name + "_tools"][k] = p_dict if playbook_name in self.loaded_metadata_keys: for k, v in playbook_vars.items(): + LOG.info(playbook_vars) if k == "template_version": data[playbook_name + "_vars"][k] = v if k == "create_only_backend": data[playbook_name + "_vars"][k] = v + if k == "base_url": + data[playbook_name + "_vars"][k] = v + if playbook_name == OPTIONAL: for k, v in playbook_vars.items(): if k == MOSH: diff --git a/requirements.txt b/requirements.txt index a274d2d6..c823b88e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -setuptools==62.1.0 +setuptools==62.2.0 thrift==0.16.0 python-keystoneclient openstacksdk ==0.61.0 @@ -9,6 +9,6 @@ flake8==4.0.1 paramiko==2.10.4 ruamel.yaml==0.17.21 pyvim==3.0.2 -redis==4.2.2 +redis==4.3.1 requests==2.27.1 pyyaml==6.0