From abc9323c8e240dbbf1aebc962d471e23d3cec6aa Mon Sep 17 00:00:00 2001
From: Debora Benedetto <debora.benedetto@hpe.com>
Date: Fri, 5 Aug 2022 16:40:45 +0200
Subject: [PATCH] change template location of piacere monitoring main, bugfix
ansible file name
---
.../nginx/{nginx.yaml => main.yaml} | 0
.../piacere_monitoring/{main.yml => main.tpl} | 0
.../piacere_monitoring/main.yaml | 22 +++++++++++++++++++
.../piacere_monitoring.yaml | 1 -
.../nginx_openstack/terraform/main.tf | 16 +++++++-------
.../posidonia/terraform/config.yaml | 5 +++++
plugin/AnsiblePlugin.py | 2 +-
template-location.properties | 2 +-
.../ubuntu/monitoring/{main.yml => main.tpl} | 0
templates/ansible/ubuntu/piacere_init.tpl | 0
10 files changed, 37 insertions(+), 11 deletions(-)
rename output_files_generated/nginx_openstack/nginx/{nginx.yaml => main.yaml} (100%)
rename output_files_generated/nginx_openstack/piacere_monitoring/{main.yml => main.tpl} (100%)
create mode 100644 output_files_generated/nginx_openstack/piacere_monitoring/main.yaml
delete mode 100644 output_files_generated/nginx_openstack/piacere_monitoring/piacere_monitoring.yaml
create mode 100644 output_files_generated/posidonia/terraform/config.yaml
rename templates/ansible/ubuntu/monitoring/{main.yml => main.tpl} (100%)
delete mode 100644 templates/ansible/ubuntu/piacere_init.tpl
diff --git a/output_files_generated/nginx_openstack/nginx/nginx.yaml b/output_files_generated/nginx_openstack/nginx/main.yaml
similarity index 100%
rename from output_files_generated/nginx_openstack/nginx/nginx.yaml
rename to output_files_generated/nginx_openstack/nginx/main.yaml
diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/main.yml b/output_files_generated/nginx_openstack/piacere_monitoring/main.tpl
similarity index 100%
rename from output_files_generated/nginx_openstack/piacere_monitoring/main.yml
rename to output_files_generated/nginx_openstack/piacere_monitoring/main.tpl
diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/main.yaml b/output_files_generated/nginx_openstack/piacere_monitoring/main.yaml
new file mode 100644
index 0000000..a0edc4f
--- /dev/null
+++ b/output_files_generated/nginx_openstack/piacere_monitoring/main.yaml
@@ -0,0 +1,22 @@
+---
+- hosts: localhost
+ tasks:
+ - name: print disclamer
+ debug:
+ msg: this can also be done with "ansible-galaxy install -r requirements"
+ - name: install telegraf from galaxy
+ community.general.ansible_galaxy_install:
+ type: role
+ requirements_file: ansible_requirements.yml
+
+- hosts: all
+ pre_tasks:
+ - name: Ensure gnupg package
+ package:
+ name: gnupg
+ state: present
+ become: true
+ vars_files:
+ - vars/main.yaml
+ roles:
+ - dj-wasabi.telegraf
diff --git a/output_files_generated/nginx_openstack/piacere_monitoring/piacere_monitoring.yaml b/output_files_generated/nginx_openstack/piacere_monitoring/piacere_monitoring.yaml
deleted file mode 100644
index 8b13789..0000000
--- a/output_files_generated/nginx_openstack/piacere_monitoring/piacere_monitoring.yaml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/output_files_generated/nginx_openstack/terraform/main.tf b/output_files_generated/nginx_openstack/terraform/main.tf
index 30cac93..3ceb8fa 100644
--- a/output_files_generated/nginx_openstack/terraform/main.tf
+++ b/output_files_generated/nginx_openstack/terraform/main.tf
@@ -91,6 +91,14 @@ resource "openstack_networking_router_interface_v2" "net1_router_interface" {
+# Create ssh keys
+resource "openstack_compute_keypair_v2" "ssh_key" {
+ name = "user1"
+ # public_key = "user1"
+}
+
+
+
# CREATING SECURITY_GROUP
resource "openstack_compute_secgroup_v2" "icmp" {
@@ -138,11 +146,3 @@ resource "openstack_compute_secgroup_v2" "ssh" {
}
-
-
-# Create ssh keys
-resource "openstack_compute_keypair_v2" "ssh_key" {
- name = "user1"
- # public_key = "user1"
-}
-
diff --git a/output_files_generated/posidonia/terraform/config.yaml b/output_files_generated/posidonia/terraform/config.yaml
new file mode 100644
index 0000000..cefdad1
--- /dev/null
+++ b/output_files_generated/posidonia/terraform/config.yaml
@@ -0,0 +1,5 @@
+---
+engine: terraform
+input: []
+output: []
+...
\ No newline at end of file
diff --git a/plugin/AnsiblePlugin.py b/plugin/AnsiblePlugin.py
index bac5a91..026c5b9 100644
--- a/plugin/AnsiblePlugin.py
+++ b/plugin/AnsiblePlugin.py
@@ -57,7 +57,7 @@ def create_files(step, output_path):
# for resource_params in parameters[resource_name]:
resource_params = parameters[resource_name]
- ansible_output_file_path = output_path + "/".join([step_name, resource_name]) + ".yaml"
+ ansible_output_file_path = output_path + "/".join([step_name, "main"]) + ".yaml"
inventory_output_file_path = output_path + "/".join([step_name, "inventory"]) + ".j2"
config_output_file_path = output_path + "/".join([step_name, "config"]) + ".yaml"
ssh_key_output_file_path = output_path + "/".join([step_name, "ssh_key.j2"])
diff --git a/template-location.properties b/template-location.properties
index d017685..f0617fe 100644
--- a/template-location.properties
+++ b/template-location.properties
@@ -42,7 +42,7 @@ nginx = templates/ansible/ubuntu/nginx.tpl
mysql = templates/ansible/ubuntu/mysql.tpl
wordpress = templates/ansible/ubuntu/wordpress.tpl
postgres = templates/ansible/ubuntu/postgres.tpl
-piacere_monitoring = templates/ansible/ubuntu/piacere_init.tpl
+piacere_monitoring = templates/ansible/ubuntu/monitoring/main.tpl
[ansible.centos]
mysql = templates/ansible/centos/mysql.tpl
diff --git a/templates/ansible/ubuntu/monitoring/main.yml b/templates/ansible/ubuntu/monitoring/main.tpl
similarity index 100%
rename from templates/ansible/ubuntu/monitoring/main.yml
rename to templates/ansible/ubuntu/monitoring/main.tpl
diff --git a/templates/ansible/ubuntu/piacere_init.tpl b/templates/ansible/ubuntu/piacere_init.tpl
deleted file mode 100644
index e69de29..0000000
--
GitLab