From fe911a80ad324e4a7d3f573f038521d06b4cb487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=B6rz=2C=20Friedrich?= <friedrich.goerz@tolina.local>
Date: Thu, 17 Nov 2022 13:42:53 +0000
Subject: [PATCH] BugfixRollout main => QA: DEV-699 fixing restore process

---
 group_vars/restore/plain.yml               |  3 ++-
 host_vars/dev-devops-iaas-01.yml           |  2 ++
 host_vars/prodnso-hocr-iaas-01.yml         |  7 +++++++
 host_vars/prodnso-platform-iaas-01.yml     | 11 ++---------
 roles/maria/tasks/main.yml                 |  8 +++++++-
 roles/postgres/tasks/base-requirements.yml |  6 ++++++
 stage-prodnso                              |  1 +
 7 files changed, 27 insertions(+), 11 deletions(-)
 create mode 100644 host_vars/prodnso-hocr-iaas-01.yml

diff --git a/group_vars/restore/plain.yml b/group_vars/restore/plain.yml
index 39cddf5..61bc090 100644
--- a/group_vars/restore/plain.yml
+++ b/group_vars/restore/plain.yml
@@ -1,11 +1,12 @@
 ---
 
 hetzner_server_type: "{{ hetzner_server_type_restore_database | default('cpx21') }}"
-hetzner_server_labels: "stage={{ stage }} service=restore database_engine={{ database_engine | default('') }} manual=''"
+hetzner_server_labels: "stage={{ stage }} service=restore database_engine={{ database_engine | default('') }}"
 
 docker_enabled: false
 traefik_enabled: false
 filebeat_enabled: false
+node_exporter_enabled: false
 
 custom_plattform_users:
   - '{{ backupuser_user_name }}'
diff --git a/host_vars/dev-devops-iaas-01.yml b/host_vars/dev-devops-iaas-01.yml
index c58a2f9..f51337b 100644
--- a/host_vars/dev-devops-iaas-01.yml
+++ b/host_vars/dev-devops-iaas-01.yml
@@ -1,3 +1,5 @@
 ---
 
 pass_tenant_id: "devops"
+
+custom_plattform_users: []
diff --git a/host_vars/prodnso-hocr-iaas-01.yml b/host_vars/prodnso-hocr-iaas-01.yml
new file mode 100644
index 0000000..12017da
--- /dev/null
+++ b/host_vars/prodnso-hocr-iaas-01.yml
@@ -0,0 +1,7 @@
+---
+
+pass_tenant_id: "hocr"
+
+hetzner_server_type: cpx41
+
+custom_plattform_users: []
\ No newline at end of file
diff --git a/host_vars/prodnso-platform-iaas-01.yml b/host_vars/prodnso-platform-iaas-01.yml
index 710496a..867c0aa 100644
--- a/host_vars/prodnso-platform-iaas-01.yml
+++ b/host_vars/prodnso-platform-iaas-01.yml
@@ -2,16 +2,9 @@
 
 pass_tenant_id: "plattform"
 
-hetzner_server_type: cpx41
+hetzner_server_type: cx51
 
-default_plattform_users:
-  - 'claus.paetow'
-  - 'friedrich.goerz'
-  - 'sven.ketelsen'
-  - 'michael.haehnel'
-  - 'hoan.to'
-  - '{{ awx_ansible_user_name }}'
-  - '{{ gitlab_ansible_user_name }}'
+custom_plattform_users:
   - 'daniel.risse'
   - 'esther.fuhrmann'
   - 'philipp.eichhorn'
diff --git a/roles/maria/tasks/main.yml b/roles/maria/tasks/main.yml
index dd73a30..53ee9fb 100644
--- a/roles/maria/tasks/main.yml
+++ b/roles/maria/tasks/main.yml
@@ -58,7 +58,13 @@
       !includedir /etc/mysql/mariadb.conf.d/
   notify: restart mysql
 
-- name: "Create mariadb cnf file"
+- name: "ASSERT: stage_private_server_ip"
+  ansible.builtin.assert:
+    that:
+      - stage_private_server_ip != ''
+    msg: "stage_private_server_ip is EMPTY. plz check tasks/autodiscover_pre_tasks.yml "
+
+- name: "Create mariadb cnf file: bind_address={{ stage_private_server_ip }}"
   vars:
     mariadb_server_bind_address: '{{ stage_private_server_ip }}'
   template:
diff --git a/roles/postgres/tasks/base-requirements.yml b/roles/postgres/tasks/base-requirements.yml
index 5d520d8..c8f1709 100644
--- a/roles/postgres/tasks/base-requirements.yml
+++ b/roles/postgres/tasks/base-requirements.yml
@@ -74,6 +74,12 @@
       - 'DNS:{{ inventory_hostname }}'
 #    selfsigned_ca_trigger_handler: restart postgres
 
+- name: "ASSERT: stage_private_server_ip"
+  ansible.builtin.assert:
+    that:
+      - stage_private_server_ip != ''
+    msg: "stage_private_server_ip is EMPTY. plz check tasks/autodiscover_pre_tasks.yml "
+
 - name: "Ensure postgresql.conf via evil lineinfile..."
   lineinfile:
     state: present
diff --git a/stage-prodnso b/stage-prodnso
index 2bf4e74..b689d4a 100644
--- a/stage-prodnso
+++ b/stage-prodnso
@@ -54,6 +54,7 @@ prodnso-prometheus-01
 
 [ubuntu_docker]
 prodnso-platform-iaas-01
+prodnso-hocr-iaas-01
 
 [webdav]
 #prodnso-webdav-01