diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index 39d5bbe..5780a41 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -522,23 +522,16 @@ class Provision extends BaseController log_message('critical', "Members Product ID ***** " . $pr->mpid . " Provision_Status == " . $pr->provision_status); $this->updateToNow($productUid); // increase count not to repeat - $ansible_host = $productId . "_SERVER"; - $ContainerName = $this->generatedContainerName($productId, $pr->mpid); //$productId ."-SVR-". str_pad($pr->mpid, 10, "0", STR_PAD_LEFT); - //$destinationHomeFolder = "/home/chiefsoft/SITES/" . $ContainerName; - $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName; -// $composer_template_path_local = $partMachineLocal . $provisionUID; -// $composer_template_path_remote = $remote_composer_path . $provisionUID; + $PROVISION_IMAGE_DATA = $this->assignProvideImageName($productId, $provisionUID); + $PROVISION_IMAGE_NAME = $PROVISION_IMAGE_DATA[0]; + $ansible_host = $productId . "_SERVER"; + $ContainerName = $this->generatedContainerName($productId, $pr->mpid); + $destinationHomeFolder = $_ENV['DESTINATION_HOME_FOLDER'] . $ContainerName; $composer_template_path_local = $partMachineLocal . $productUid; $composer_template_path_remote = $remote_composer_path . $productUid; - -// $ansible_transport_path = $pr->provision_uid; // $ContainerName; $ansible_transport_path = $productUid; // $ContainerName; - - // let us make sure all we promise are availale - //"WHAT_PART_LOCAL - - $CURRENT_IMAGE_REFRESH = "registry.chiefsoft.com/a000001/personal-web-web0002a:latest"; + $CURRENT_IMAGE_REFRESH = $PROVISION_IMAGE_NAME; // "registry.chiefsoft.com/a000001/personal-web-web0002a:latest"; // Remember this is in a CONTAINER so the path follows $this_composer_part_location = "/var/www/html/ANSIBLE/parts/" . $productUid;