Merge pull request #1180 from rackerlabs/fix-argo-svm-enabled

fix: SVM create fails due to uncaptured outputs

Author: cardoe

python/understack-workflows/understack_workflows/netapp_manager.py

@@ -75,11 +75,14 @@ def create_svm(self, project_id: str, aggregate_name: str):
             logger.info(
                 "SVM '%s' created successfully with NVMe protocol allowed", svm.name
             )
+            return svm.name
         except NetAppRestError as e:
             logger.error("Error creating SVM: %s", e)
             exit(1)
 
-    def create_volume(self, project_id: str, volume_size: str, aggregate_name: str):
+    def create_volume(
+        self, project_id: str, volume_size: str, aggregate_name: str
+    ) -> str:
         """Creates a new volume within a specific SVM and aggregate."""
         volume_name = self._volume_name(project_id)
         logger.info(
@@ -97,6 +100,7 @@ def create_volume(self, project_id: str, volume_size: str, aggregate_name: str):
             volume.post()
             volume.get()
             logger.info("Volume %s created.", volume_name)
+            return volume_name
         except NetAppRestError as e:
             logger.error("Error creating Volume: %s", e)
             exit(1)

python/understack-workflows/understack_workflows/oslo_event/keystone_project.py

@@ -66,10 +66,10 @@ def handle_project_created(
     svm_name = None
     try:
         netapp_manager = NetAppManager()
-        netapp_manager.create_svm(
+        svm_name = netapp_manager.create_svm(
             project_id=event.project_id, aggregate_name=AGGREGATE_NAME
         )
-        svm_name = netapp_manager.create_volume(
+        netapp_manager.create_volume(
             project_id=event.project_id,
             volume_size=VOLUME_SIZE,
             aggregate_name=AGGREGATE_NAME,

workflows/argo-events/workflowtemplates/openstack-oslo-event.yaml

@@ -64,9 +64,9 @@ spec:
             secretName: netapp-config
       outputs:
         parameters:
-          - name: exit_code
+          - name: svm_name
             valueFrom:
-              path: /var/run/argo/output.exit_code
-          - name: msg
+              path: /var/run/argo/output.svm_name
+          - name: svm_enabled
             valueFrom:
-              path: /var/run/argo/output.msg
+              path: /var/run/argo/output.svm_enabled

workflows/openstack/sensors/sensor-keystone-oslo-event.yaml

@@ -93,12 +93,12 @@ spec:
                               print(str(uuid.UUID(project_id_without_dashes)))
 
                   - - name: ansible-to-nautobot
-                      when: "{{steps.oslo-events.outputs.svm_enabled}} == 'true'"
+                      when: "{{steps.oslo-events.outputs.parameters.svm_enabled}} == True"
                       inline:
                         container:
                           image: ghcr.io/rss-engineering/undercloud-nautobot/ansible:latest
+                          command: [ansible-playbook]
                           args:
-                          - "ansible-playbook"
                           - "storage_on_svm_create.yml"
                           - --extra-vars
                           - "svm_name=os-{{workflow.parameters.project_id}} project_id={{steps.convert-project-id.outputs.result}} env=dev"