From 1e2e41f144a193322ede4ebd61e6bdfae8207984 Mon Sep 17 00:00:00 2001
From: Greg Dean <gmdean@buffalo.edu>
Date: Mon, 18 May 2020 11:19:27 -0400
Subject: [PATCH] move action to update modw_cloud.account with PI and
 hierarchy information into jobs-cloud-ingest-pi

---
 classes/OpenXdmod/DataWarehouseInitializer.php    |  4 ++--
 configuration/etl/etl.d/jobs_cloud_common.json    | 10 ++++++++++
 configuration/etl/etl.d/jobs_cloud_generic.json   | 10 ----------
 configuration/etl/etl.d/jobs_cloud_openstack.json | 10 ----------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/classes/OpenXdmod/DataWarehouseInitializer.php b/classes/OpenXdmod/DataWarehouseInitializer.php
index 56519e49f4..bbfbae8c09 100644
--- a/classes/OpenXdmod/DataWarehouseInitializer.php
+++ b/classes/OpenXdmod/DataWarehouseInitializer.php
@@ -239,10 +239,10 @@ public function ingestCloudDataOpenStack()
                   'staging-ingest-common',
                   'jobs-cloud-common',
                   'jobs-cloud-import-users-openstack',
-                  'jobs-cloud-ingest-pi',
                   'hpcdb-ingest-common',
                   'hpcdb-xdw-ingest-common',
-                  'jobs-cloud-extract-openstack'
+                  'jobs-cloud-extract-openstack',
+                  'jobs-cloud-ingest-pi',
                 ),
                 $this->logger
             );
diff --git a/configuration/etl/etl.d/jobs_cloud_common.json b/configuration/etl/etl.d/jobs_cloud_common.json
index b12a615866..4b09354d7a 100644
--- a/configuration/etl/etl.d/jobs_cloud_common.json
+++ b/configuration/etl/etl.d/jobs_cloud_common.json
@@ -254,6 +254,16 @@
                     "schema": "mod_shredder"
                 }
             }
+        },
+        {
+            "name": "UpdateCloudProjectToPI",
+            "description": "Update project in account table to have a PI",
+            "namespace": "ETL\\Maintenance",
+            "options_class": "MaintenanceOptions",
+            "class": "ExecuteSql",
+            "sql_file_list": [
+                "cloud_common/pi_to_account.sql"
+            ]
         }
     ]
 }
diff --git a/configuration/etl/etl.d/jobs_cloud_generic.json b/configuration/etl/etl.d/jobs_cloud_generic.json
index a8451ba446..2ec3a62d7e 100644
--- a/configuration/etl/etl.d/jobs_cloud_generic.json
+++ b/configuration/etl/etl.d/jobs_cloud_generic.json
@@ -255,16 +255,6 @@
                 }
             }
         },
-        {
-            "name": "UpdateCloudProjectToPI",
-            "description": "Update project in account table to have a PI",
-            "namespace": "ETL\\Maintenance",
-            "options_class": "MaintenanceOptions",
-            "class": "ExecuteSql",
-            "sql_file_list": [
-                "cloud_common/pi_to_account.sql"
-            ]
-        },
         {
             "name": "GenericCloudHostIngestor",
             "description": "Generic cloud host data",
diff --git a/configuration/etl/etl.d/jobs_cloud_openstack.json b/configuration/etl/etl.d/jobs_cloud_openstack.json
index a137052d99..bd60e02c0f 100644
--- a/configuration/etl/etl.d/jobs_cloud_openstack.json
+++ b/configuration/etl/etl.d/jobs_cloud_openstack.json
@@ -230,16 +230,6 @@
                 }
             }
         },
-        {
-            "name": "UpdateCloudProjectToPI",
-            "description": "Update project in account table to have a PI",
-            "namespace": "ETL\\Maintenance",
-            "options_class": "MaintenanceOptions",
-            "class": "ExecuteSql",
-            "sql_file_list": [
-                "cloud_common/pi_to_account.sql"
-            ]
-        },
         {
             "name": "OpenStackCloudHostIngestor",
             "description": "OpenStack cloud host data",