diff --git a/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py b/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py index 8aa4cfc6..edf1e10d 100644 --- a/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py +++ b/src/bin/shipyard_airflow/shipyard_airflow/plugins/armada_post_apply.py @@ -47,10 +47,7 @@ class ArmadaPostApplyOperator(ArmadaBaseOperator): self.dc = self.xcom_puller.get_deployment_configuration() self.target_manifest = self.dc['armada.manifest'] if self.action_info['name'] == 'update_software': - update_manifest = self.dc.get( - 'armada.update_manifest', "").strip() - if update_manifest: - self.target_manifest = update_manifest + self.target_manifest = self.dc['armada.update_manifest'] # Update query dict with information of target_manifest self.query['target_manifest'] = self.target_manifest @@ -59,7 +56,7 @@ class ArmadaPostApplyOperator(ArmadaBaseOperator): timeout = self.dc['armada.post_apply_timeout'] # Execute Armada Apply to install the helm charts in sequence - LOG.info("Armada Apply, target manifest: ", self.target_manifest) + LOG.info("Armada Apply, target manifest: %s", self.target_manifest) try: armada_post_apply = self.armada_client.post_apply( diff --git a/src/bin/shipyard_airflow/shipyard_airflow/plugins/deployment_configuration_operator.py b/src/bin/shipyard_airflow/shipyard_airflow/plugins/deployment_configuration_operator.py index 277eade0..a84874e5 100644 --- a/src/bin/shipyard_airflow/shipyard_airflow/plugins/deployment_configuration_operator.py +++ b/src/bin/shipyard_airflow/shipyard_airflow/plugins/deployment_configuration_operator.py @@ -74,6 +74,7 @@ class DeploymentConfigurationOperator(BaseOperator): "armada.get_releases_timeout": 300, "armada.get_status_timeout": 300, "armada.manifest": "full-site", + "armada.update_manifest": "full-site", "armada.post_apply_timeout": 2700, "armada.validate_design_timeout": 600 } diff --git a/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml b/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml index d6c94180..134af9e6 100644 --- a/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml +++ b/src/bin/shipyard_airflow/shipyard_airflow/schemas/deploymentConfiguration.yaml @@ -73,6 +73,8 @@ data: type: 'integer' manifest: type: 'string' + update_manifest: + type: 'string' post_apply_timeout: type: 'integer' validate_design_timeout: