diff --git a/.env.live b/.env.live index 0ec5572..4ede972 100644 --- a/.env.live +++ b/.env.live @@ -13,6 +13,7 @@ REMOTE_COMPOSER_PATH='chiefsoft@10.10.10.13:/home/chiefsoft/DevSites/MERMS/Merms DESTINATION_HOME_FOLDER='/home/chiefsoft/SITES/' ANSIBLE_AUTOMATION_SERVER_LOCATION="http://172.16.4.90:3000" +ANSIBLE_AUTOMATION_PROJECT_ID="1" SOCKET_SERVER_LOCATION="http://10.13.3.15:5006" diff --git a/app/Controllers/BaseController.php b/app/Controllers/BaseController.php index 1c42adc..af82ccc 100644 --- a/app/Controllers/BaseController.php +++ b/app/Controllers/BaseController.php @@ -154,22 +154,22 @@ abstract class BaseController extends Controller $token = $item["id"]; break; } - } $result = "Found token: $token"; - # Print response. return $token; } public function ansibleProvision($ansibleToken,$params){ - log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ".$ansibleToken); - log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ". serialize( $params)); +// log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ".$ansibleToken); +// log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ". serialize( $params)); $result = "Unhandled exception"; - $base_url = "http://172.16.4.90:3000"; - $PROJECT_ID= 8; + //$base_url = "http://172.16.4.90:3000"; + $base_url = $_ENV['ANSIBLE_AUTOMATION_SERVER_LOCATION']; + //$PROJECT_ID= 8; + $PROJECT_ID = $_ENV['ANSIBLE_AUTOMATION_PROJECT_ID']; $url = $base_url . "/api/project/$PROJECT_ID/tasks"; $headers = [ @@ -199,15 +199,15 @@ abstract class BaseController extends Controller $result .= "\n" . 'Get tasks HTTP code: ' . $httpcode; curl_close($ch); - log_message('critical', "***** ***** Provision :: ansibleProvision($httpcode) ".$httpcode); +// log_message('critical', "***** ***** Provision :: ansibleProvision($httpcode) ".$httpcode); ob_start(); var_dump($headers); var_dump($res); $result .= "\n" . ob_get_clean(); return $httpcode; - } + // public function ansibleProvisionBAD($ansibleToken,$params){ // log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ".$ansibleToken); // log_message('critical', "***** ***** Provision CALL:: ansibleProvision() Token ". serialize( $params));