From 098fdc3e10a33091cb6ec839ae17655e99c627eb Mon Sep 17 00:00:00 2001
From: Niculut <laurentiu.niculut@hpe.com>
Date: Thu, 22 Jun 2023 14:22:31 +0200
Subject: [PATCH] y2 release

---
 .../ubuntu/performance_monitoring_main.tpl    | 42 -------------------
 templates/terraform/vsphere/config.tpl        |  7 ++--
 2 files changed, 3 insertions(+), 46 deletions(-)
 delete mode 100644 templates/ansible/ubuntu/performance_monitoring_main.tpl

diff --git a/templates/ansible/ubuntu/performance_monitoring_main.tpl b/templates/ansible/ubuntu/performance_monitoring_main.tpl
deleted file mode 100644
index 8b32d63..0000000
--- a/templates/ansible/ubuntu/performance_monitoring_main.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- 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: servers_for_performance_monitoring
-  pre_tasks:
-    - name: Check parameters
-      fail:
-        msg: 'variable {{item}} not defined'
-      when: item is not defined
-      with_items:
-        - pma_deployment_id
-        - pma_influxdb_bucket
-        - pma_influxdb_token
-        - pma_influxdb_org
-        - pma_influxdb_addr
-    - name: Print parameters
-      debug:
-        msg: 
-          - "pma_deployment_id: {{ pma_deployment_id }}"
-          - "pma_influxdb_bucket: {{ pma_influxdb_bucket }}"
-          - "pma_influxdb_token: {{ pma_influxdb_token }}"
-          - "pma_influxdb_org: {{ pma_influxdb_org }}"
-          - "pma_influxdb_addr: {{ pma_influxdb_addr }}"
-    - name: Ensure gnupg package
-      package:
-        name: gnupg
-        state: present
-      become: true
-  vars_files:
-    - vars/main.yaml
-  tasks:
-    - name: Install telegraf
-      ansible.builtin.include_role:
-        name: dj-wasabi.telegraf
diff --git a/templates/terraform/vsphere/config.tpl b/templates/terraform/vsphere/config.tpl
index 57da218..515fdae 100644
--- a/templates/terraform/vsphere/config.tpl
+++ b/templates/terraform/vsphere/config.tpl
@@ -17,10 +17,9 @@
 ---
 engine: terraform
 input:
-  - VSPHERE_USER
-  - VSPHERE_PASSWORD
-  - VSPHERE_SERVER
-  - VSPHERE_ALLOW_UNVERIFIED_SSL
+  - AWS_ACCESS_KEY_ID
+  - AWS_SECRET_ACCESS_KEY
+  - AWS_REGION
 output:
 {% for vm in vms %}
   - instance_server_public_key_{{ vm.credentials }}
-- 
GitLab