From 0a37cd5fe3a13955f5d35b196b836233a2c01be2 Mon Sep 17 00:00:00 2001
From: Gorka Benguria <gorka.benguria@tecnalia.com>
Date: Thu, 15 Sep 2022 21:34:51 +0200
Subject: [PATCH] splits requirements from monitoring
---
config.yaml | 1 +
piacere_monitoring/ansible.cfg | 2 --
piacere_monitoring/hosts.yaml | 4 ---
.../install_playbook_requirements.sh | 33 -------------------
piacere_monitoring/main.yml | 30 ++++++++++-------
piacere_monitoring/run-playbook.sh | 33 -------------------
piacere_monitoring/site.yaml | 30 -----------------
piacere_monitoring_requirements/ansible.cfg | 5 +++
.../ansible_requirements.yml | 0
piacere_monitoring_requirements/config.yaml | 6 ++++
piacere_monitoring_requirements/inventory.j2 | 1 +
piacere_monitoring_requirements/main.yml | 11 +++++++
.../vars/main.yaml | 0
13 files changed, 43 insertions(+), 113 deletions(-)
delete mode 100644 piacere_monitoring/hosts.yaml
delete mode 100644 piacere_monitoring/install_playbook_requirements.sh
delete mode 100644 piacere_monitoring/run-playbook.sh
delete mode 100644 piacere_monitoring/site.yaml
create mode 100644 piacere_monitoring_requirements/ansible.cfg
rename {piacere_monitoring => piacere_monitoring_requirements}/ansible_requirements.yml (100%)
create mode 100644 piacere_monitoring_requirements/config.yaml
create mode 100644 piacere_monitoring_requirements/inventory.j2
create mode 100644 piacere_monitoring_requirements/main.yml
rename {piacere_monitoring => piacere_monitoring_requirements}/vars/main.yaml (100%)
diff --git a/config.yaml b/config.yaml
index 082e5e5..83fbfa3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,6 +1,7 @@
---
iac:
- terraform
+- piacere_monitoring_requirements
- piacere_monitoring
- nginx
...
\ No newline at end of file
diff --git a/piacere_monitoring/ansible.cfg b/piacere_monitoring/ansible.cfg
index 660a5eb..885456a 100644
--- a/piacere_monitoring/ansible.cfg
+++ b/piacere_monitoring/ansible.cfg
@@ -1,7 +1,5 @@
# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
[defaults]
host_key_checking = False
-inventory = {{CWD}}/hosts.yaml ; This points to the file that lists your hosts
-remote_user = esilab
deprecation_warnings=False ; to remove the python version depretation warning
display_skipped_hosts = no
\ No newline at end of file
diff --git a/piacere_monitoring/hosts.yaml b/piacere_monitoring/hosts.yaml
deleted file mode 100644
index b9cbfc6..0000000
--- a/piacere_monitoring/hosts.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-all:
- hosts:
- localhost:
- ansible_connection: local
diff --git a/piacere_monitoring/install_playbook_requirements.sh b/piacere_monitoring/install_playbook_requirements.sh
deleted file mode 100644
index 843bf3b..0000000
--- a/piacere_monitoring/install_playbook_requirements.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-SCRIPT_DIR=$(dirname "$0")
-
-# to avoid the being run in a world writable directory we explicitly assign the ANSIBLE_CONFIG variable
-if [[ -f ./ansible.cfg ]]
-then
- export ANSIBLE_CONFIG=./ansible.cfg
-else
- if [[ -f $SCRIPT_DIR/ansible.cfg ]]
- then
- export ANSIBLE_CONFIG=$SCRIPT_DIR/ansible.cfg
- fi
-fi
-
-if [[ -z "$ANSIBLE_CONFIG" ]]
-then
- echo ANSIBLE_CONFIG to assigned using default https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-else
- echo ANSIBLE_CONFIG=$ANSIBLE_CONFIG
-fi
-
-if [[ -z "$1" ]]
-then
- # echo without params
- echo ansible-playbook $SCRIPT_DIR/site_requirements.yaml
- ansible-playbook $SCRIPT_DIR/site_requirements.yaml
-else
- # echo with params
- echo ansible-playbook $SCRIPT_DIR/site_requirements.yaml --extra-vars "$1"
- ansible-playbook $SCRIPT_DIR/site_requirements.yaml --extra-vars "$1"
-fi
diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml
index a0edc4f..e1ed843 100644
--- a/piacere_monitoring/main.yml
+++ b/piacere_monitoring/main.yml
@@ -1,21 +1,29 @@
----
-- 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: 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
roles:
diff --git a/piacere_monitoring/run-playbook.sh b/piacere_monitoring/run-playbook.sh
deleted file mode 100644
index f2bba22..0000000
--- a/piacere_monitoring/run-playbook.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-SCRIPT_DIR=$(dirname "$0")
-
-# to avoid the being run in a world writable directory we explicitly assign the ANSIBLE_CONFIG variable
-if [[ -f ./ansible.cfg ]]
-then
- export ANSIBLE_CONFIG=./ansible.cfg
-else
- if [[ -f $SCRIPT_DIR/ansible.cfg ]]
- then
- export ANSIBLE_CONFIG=$SCRIPT_DIR/ansible.cfg
- fi
-fi
-
-if [[ -z "$ANSIBLE_CONFIG" ]]
-then
- echo ANSIBLE_CONFIG to assigned using default https://docs.ansible.com/ansible/latest/reference_appendices/config.html
-else
- echo ANSIBLE_CONFIG=$ANSIBLE_CONFIG
-fi
-
-if [[ -z "$1" ]]
-then
- # echo without params
- echo ansible-playbook $SCRIPT_DIR/site.yaml
- ansible-playbook $SCRIPT_DIR/site.yaml
-else
- # echo with params
- echo ansible-playbook $SCRIPT_DIR/site.yaml --extra-vars "$1"
- ansible-playbook $SCRIPT_DIR/site.yaml --extra-vars "$1"
-fi
diff --git a/piacere_monitoring/site.yaml b/piacere_monitoring/site.yaml
deleted file mode 100644
index 531dbf5..0000000
--- a/piacere_monitoring/site.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-- hosts: all
- 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
- roles:
- - dj-wasabi.telegraf
diff --git a/piacere_monitoring_requirements/ansible.cfg b/piacere_monitoring_requirements/ansible.cfg
new file mode 100644
index 0000000..885456a
--- /dev/null
+++ b/piacere_monitoring_requirements/ansible.cfg
@@ -0,0 +1,5 @@
+# https://docs.ansible.com/ansible/latest/reference_appendices/config.html
+[defaults]
+host_key_checking = False
+deprecation_warnings=False ; to remove the python version depretation warning
+display_skipped_hosts = no
\ No newline at end of file
diff --git a/piacere_monitoring/ansible_requirements.yml b/piacere_monitoring_requirements/ansible_requirements.yml
similarity index 100%
rename from piacere_monitoring/ansible_requirements.yml
rename to piacere_monitoring_requirements/ansible_requirements.yml
diff --git a/piacere_monitoring_requirements/config.yaml b/piacere_monitoring_requirements/config.yaml
new file mode 100644
index 0000000..8ddae8c
--- /dev/null
+++ b/piacere_monitoring_requirements/config.yaml
@@ -0,0 +1,6 @@
+
+---
+input: []
+output: []
+engine: ansible
+...
diff --git a/piacere_monitoring_requirements/inventory.j2 b/piacere_monitoring_requirements/inventory.j2
new file mode 100644
index 0000000..05614f6
--- /dev/null
+++ b/piacere_monitoring_requirements/inventory.j2
@@ -0,0 +1 @@
+localhost ansible_connection=local
\ No newline at end of file
diff --git a/piacere_monitoring_requirements/main.yml b/piacere_monitoring_requirements/main.yml
new file mode 100644
index 0000000..734e9e9
--- /dev/null
+++ b/piacere_monitoring_requirements/main.yml
@@ -0,0 +1,11 @@
+- name: "Intalling requirements"
+ hosts: localhost
+ connection: local
+ 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
diff --git a/piacere_monitoring/vars/main.yaml b/piacere_monitoring_requirements/vars/main.yaml
similarity index 100%
rename from piacere_monitoring/vars/main.yaml
rename to piacere_monitoring_requirements/vars/main.yaml
--
GitLab