From 2d940e20286c600e082d038ced2d3c06f0554004 Mon Sep 17 00:00:00 2001
From: Johan Wassberg <jocar@sunet.se>
Date: Fri, 19 Jan 2024 10:06:01 +0100
Subject: [PATCH] Class from upstream instead

---
 global/overlay/etc/puppet/cosmos-rules.yaml   |  2 +-
 .../puppet/modules/eid/manifests/idm_db.pp    | 13 ------------
 .../templates/idm_db/docker-compose.yml.erb   | 20 -------------------
 3 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp
 delete mode 100644 global/overlay/etc/puppet/modules/eid/templates/idm_db/docker-compose.yml.erb

diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml
index 763346b4..505cce0a 100644
--- a/global/overlay/etc/puppet/cosmos-rules.yaml
+++ b/global/overlay/etc/puppet/cosmos-rules.yaml
@@ -1178,4 +1178,4 @@ eidastest-1.qa.sveidas.se:
 
 idm-sto3-test-db-3\.komreg\.net:
    sunet::dockerhost2:
-   eid::idm_db:
+   sunet::mariadb:
diff --git a/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp b/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp
deleted file mode 100644
index 41986546..00000000
--- a/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-# idm_db
-class eid::idm_db (
-  $bootstrap = undef,
-) {
-
-  sunet::docker_compose { 'mariadb':
-    content          => template('eid/idm_db/docker-compose.yml.erb'),
-    service_name     => 'mariadb',
-    compose_dir      => '/opt/',
-    compose_filename => 'docker-compose.yml',
-    description      => 'mariadb',
-  }
-}
diff --git a/global/overlay/etc/puppet/modules/eid/templates/idm_db/docker-compose.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/idm_db/docker-compose.yml.erb
deleted file mode 100644
index 195f78bc..00000000
--- a/global/overlay/etc/puppet/modules/eid/templates/idm_db/docker-compose.yml.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '3'
-
-services:
-
-  db:
-    image: httpd:latest
-    restart: always
-    volumes:
-      - /etc/mariadb/backups:/backups
-      - /etc/mariadb/conf:/etc/mysql/mariadb.conf.d
-      - /etc/mariadb/datadir:/var/lib/mysql
-      - /etc/mariadb/init:/docker-entrypoint-initdb.d
-      - /etc/mariadb/scripts:/scripts
-    environment:
-      - MYSQL_ROOT_PASSWORD=NOT_SET_IN_HIERA
-      - BOOTSTRAP=
-      - FORCE_BOOTSTRAP=0
-    ports:
-      - "80:80"
-    tty: true