diff --git a/app/Controllers/Provision.php b/app/Controllers/Provision.php index d63a695..55e5729 100644 --- a/app/Controllers/Provision.php +++ b/app/Controllers/Provision.php @@ -253,13 +253,18 @@ class Provision extends BaseController //log_message('critical', "Test poath -> ".$output); //ANSIBLE/templates/A000001.yml $ansibleToken = $this->ansibleLogin(); - $mysql = "SELECT id AS plan_id, uid, provision_id, play_file from provision_plans ORDER BY updated ASC LIMIT 1 "; + //$mysql = "SELECT id AS plan_id, uid, provision_id, play_file from provision_plans ORDER BY updated ASC LIMIT 1 "; + $mysql ="SELECT p.product_id, pp.id AS plan_id, pp.uid, pp.provision_id, pp.play_file + FROM provision_plans pp + LEFT JOIN members_products p ON p.id =pp.provision_id + ORDER BY pp.updated ASC LIMIT 1 "; $query = $this->db->query($mysql); $provision_list = $query->getResult(); foreach ($provision_list as $pr) { $playFile = $pr->play_file; $planId = $pr->plan_id; $provisionId = $pr->provision_id; + $playbook = $pr->product_id.".yml"; $this->db->query("UPDATE provision_plans SET updated = now() WHERE id = $planId"); $this->db->query("UPDATE members_products SET p_file = p_file + 1 WHERE id = $provisionId"); @@ -267,7 +272,7 @@ class Provision extends BaseController "template_id"=> 1, "debug"=> false, "dry_run"=> false, - "playbook"=> 'A000001.yml', + "playbook"=> $playbook, "environment"=> "{}" ]; $this->ansibleProvision($ansibleToken, $params);