diff --git a/icgparser/PiacereInternalToolsIntegrator.py b/icgparser/PiacereInternalToolsIntegrator.py index 722ae5bb9a97084c9fc06c69492d44f6ed5820b9..ab65804e5b97b646d995f171390f9263312d2723 100644 --- a/icgparser/PiacereInternalToolsIntegrator.py +++ b/icgparser/PiacereInternalToolsIntegrator.py @@ -7,8 +7,9 @@ from icgparser.IntermediateRepresentationUtility import IntermediateRepresentati def extract_info_for_monitoring_agents(intermediate_representation): logging.info("Adding info for monitoring step") - monitoring_object_step = {"programming_language": "ansible", "step_name": "piacere_monitoring", - "data": {"piacere_monitoring": {}}} + monitoring_object_step = {"programming_language": "ansible", + "step_name": "piacere_monitoring", + "data": {"piacere_monitoring": {"name": "piacere_monitoring"}}} vms = IntermediateRepresentationUtility.find_objects(IntermediateRepresentationResources.VIRTUAL_MACHINES, intermediate_representation) # TODO restore these 2 commented lines: monitoring could be installed on multiple nodes! @@ -36,4 +37,4 @@ def add_files_for_monitoring_agents(template_generated_folder_path): def add_files_for_piacere_internal_tools(template_generated_folder_path): - add_files_for_monitoring_agents(template_generated_folder_path) \ No newline at end of file + add_files_for_monitoring_agents(template_generated_folder_path) diff --git a/input_file_generated/ir.json b/input_file_generated/ir.json index c0f69cc5bb4f4a395ef0b71fc4ee4c3ffa6920a8..4f3fb5afc27da092cbe3821a5bd760f2d84203cb 100644 --- a/input_file_generated/ir.json +++ b/input_file_generated/ir.json @@ -92,6 +92,7 @@ { "data": { "piacere_monitoring": { + "name": "piacere_monitoring", "node": { "credentials": "ssh_key", "group": "sg", diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2 b/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2 index 13bf63f916847df970ee5df23e6a75436e70812b..2eaf2660367c17d52f3a287a33c12ae571df7ba4 100644 --- a/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2 +++ b/output_files_generated/nginx_openstack/piacere_monitoring/inventory.j2 @@ -1,9 +1,9 @@ -[servers_for_] +[servers_for_piacere_monitoring] {{ instance_ip_nginx-host }} -[servers_for_:vars] +[servers_for_piacere_monitoring:vars] ansible_connection=ssh ansible_user=ubuntu ansible_ssh_private_key_file=ssh_key