From 6baf2bd8a9b1c30f1b7e286b2f9bd537a04c2c4c Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 13 Jun 2023 15:35:49 +0200 Subject: [PATCH] removing redis servers Ref: SC-1631 --- eidas-redis-1.sveidas.se/README | 3 - eidas-redis-2.sveidas.se/README | 3 - eidas-redis-3.sveidas.se/README | 3 - eidas-redis-4.sveidas.se/README | 3 - eidas-redis-fe-1.sveidas.se/README | 3 - eidas-redis-fe-2.sveidas.se/README | 3 - global/overlay/etc/puppet/cosmos-rules.yaml | 79 --------------------- 7 files changed, 97 deletions(-) delete mode 100644 eidas-redis-1.sveidas.se/README delete mode 100644 eidas-redis-2.sveidas.se/README delete mode 100644 eidas-redis-3.sveidas.se/README delete mode 100644 eidas-redis-4.sveidas.se/README delete mode 100644 eidas-redis-fe-1.sveidas.se/README delete mode 100644 eidas-redis-fe-2.sveidas.se/README diff --git a/eidas-redis-1.sveidas.se/README b/eidas-redis-1.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-1.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/eidas-redis-2.sveidas.se/README b/eidas-redis-2.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-2.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/eidas-redis-3.sveidas.se/README b/eidas-redis-3.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-3.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/eidas-redis-4.sveidas.se/README b/eidas-redis-4.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-4.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/eidas-redis-fe-1.sveidas.se/README b/eidas-redis-fe-1.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-fe-1.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/eidas-redis-fe-2.sveidas.se/README b/eidas-redis-fe-2.sveidas.se/README deleted file mode 100644 index a18dac1c..00000000 --- a/eidas-redis-fe-2.sveidas.se/README +++ /dev/null @@ -1,3 +0,0 @@ - -The system documentation is in the docs directory of the multiverse repository. - diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 907891bf..0035137c 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -172,39 +172,6 @@ kvmeidas-tug-3.komreg.net: cpus: '8' memory: '8192' image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img' - eidas-redis-fe-2.sveidas.se: - mac: '52:54:20:02:04:03' - ip: '94.176.224.7' - netmask: '255.255.255.240' - gateway: '94.176.224.1' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid tug redis frontend' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' - eidas-redis-2.sveidas.se: - mac: '52:54:20:02:04:05' - ip: '94.176.224.9' - netmask: '255.255.255.240' - gateway: '94.176.224.1' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid tug redis cluster' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' - eidas-redis-4.sveidas.se: - mac: '52:54:20:02:04:06' - ip: '94.176.224.10' - netmask: '255.255.255.240' - gateway: '94.176.224.1' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid tug redis cluster' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' eidas-test-2.sveidas.se: mac: '52:54:20:02:04:07' ip: '94.176.224.11' @@ -371,28 +338,6 @@ kvmeidas-fre-3.komreg.net: cpus: '8' memory: '8192' image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img' - eidas-redis-1.sveidas.se: - mac: '52:54:20:01:04:03' - ip: '94.176.224.135' - netmask: '255.255.255.240' - gateway: '94.176.224.129' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid fre redis cluster' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' - eidas-redis-3.sveidas.se: - mac: '52:54:20:01:04:06' - ip: '94.176.224.138' - netmask: '255.255.255.240' - gateway: '94.176.224.129' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid fre redis cluster' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' prid-1.sveidas.se: mac: '52:54:20:01:04:04' ip: '94.176.224.136' @@ -404,17 +349,6 @@ kvmeidas-fre-3.komreg.net: cpus: '8' memory: '8192' image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img' - eidas-redis-fe-1.sveidas.se: - mac: '52:54:20:01:04:05' - ip: '94.176.224.137' - netmask: '255.255.255.240' - gateway: '94.176.224.129' - bridge: 'br-eidas' - search: ['sveidas.se'] - description: 'eid fre redis frontend' - cpus: '8' - memory: '8192' - image_url: 'https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img' eidas-test-1.sveidas.se: mac: '52:54:20:01:04:07' ip: '94.176.224.139' @@ -1000,19 +934,6 @@ validator-test-1.komreg.net: - 'fe-tug-3.komreg.net' port: '443' -'^eidas-redis-fe-[0-9]\.sveidas\.se$': - eid::dockerhost: - version: '5:23.0.6-1~ubuntu.20.04~focal' - autoupdate: - redis_frontend_node: - hostname: redis.sveidas.se - -'^eidas-redis-[0-9]\.sveidas\.se$': - eid::dockerhost: - version: '5:23.0.6-1~ubuntu.20.04~focal' - autoupdate: - redis_cluster_node: - log-2.sveidas.se: autoupdate: konsulter: