From d9393a8ca049086332e990938596a68a7a04e613 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 4 May 2018 14:38:53 +0200 Subject: [PATCH 01/10] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index f12defaa..0f8b8a03 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -77,7 +77,6 @@ classes: sunetops: null kvmeidas-fre-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -86,7 +85,6 @@ classes: sunetops: null kvmeidas-tug-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -95,12 +93,11 @@ classes: sunetops: null kvmfe-fre-3.komreg.net: common: null - eid::kvm_vms: + eid::kvmhost: vms: fe-fre-3.komreg.net: {bridge: br-fe, cpus: '4', description: eid fre frontend, gateway: 94.176.224.161, ip: 94.176.224.165, mac: '52:54:20:01:00:01', memory: '4096', netmask: 255.255.255.240} - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -109,7 +106,6 @@ classes: sunetops: null kvmfe-tug-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -118,7 +114,6 @@ classes: sunetops: null kvminfra-fre-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -127,7 +122,6 @@ classes: sunetops: null kvminfra-tug-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -136,7 +130,6 @@ classes: sunetops: null kvmmeta-fre-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -145,7 +138,6 @@ classes: sunetops: null kvmmeta-tug-3.komreg.net: common: null - eid::kvmhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 @@ -262,10 +254,7 @@ members: kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net] - eid::kvm_vms: [kvmfe-fre-3.komreg.net] - eid::kvmhost: [kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, - kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, - kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net] + eid::kvmhost: [kvmfe-fre-3.komreg.net] eidas_connector: [eidas-node-1.qa.sveidas.se] eidas_proxy: [eidas-proxy-1.qa.sveidas.se] entropyclient: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, From 81292466c2707c72140176a589d5b2844b38b40e Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 4 May 2018 14:39:11 +0200 Subject: [PATCH 02/10] clean up kvm vms --- global/overlay/etc/puppet/cosmos-rules.yaml | 5 +---- global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp | 5 ----- global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp | 7 +++++-- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 2360ab68..fbe314d6 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -8,9 +8,6 @@ domain: sunet.se sunet::rsyslog: -'^kvm.+-.+-\d+\.komreg\.net$': - eid::kvmhost: - jmp.komreg.net: konsulter: sunet_iaas_cloud: @@ -21,7 +18,7 @@ jmp.komreg.net: autoupdate: kvmfe-fre-3.komreg.net: - eid::kvm_vms: + eid::kvmhost: vms: fe-fre-3.komreg.net: mac: '52:54:20:01:00:01' diff --git a/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp b/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp deleted file mode 100644 index f5f4aa8b..00000000 --- a/global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp +++ /dev/null @@ -1,5 +0,0 @@ -class eid::kvm_vms( - Hash $vms -) { - create_resources('eid::cloudimage', $vms) -} diff --git a/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp b/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp index c3f72bcd..f233cbc5 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp @@ -1,6 +1,7 @@ class eid::kvmhost( - $proxy_server = hiera('eid_proxy_server'), - $no_proxy = hiera('eid_no_proxy'), + String $proxy_server = hiera('eid_proxy_server'), + String $no_proxy = hiera('eid_no_proxy'), + Hash $vms = [], ) { file { '/etc/cosmos-manual-reboot': @@ -37,4 +38,6 @@ class eid::kvmhost( line => '8021q', ; } + + create_resources('eduid::cloudimage', $vms) } From 2226444d3dbfd56f0187a641677e0b6f9bc6a66a Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 4 May 2018 14:41:06 +0200 Subject: [PATCH 03/10] update db --- global/overlay/etc/puppet/cosmos-db.yaml | 30 +++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-db.yaml b/global/overlay/etc/puppet/cosmos-db.yaml index 0f8b8a03..bc0ef740 100644 --- a/global/overlay/etc/puppet/cosmos-db.yaml +++ b/global/overlay/etc/puppet/cosmos-db.yaml @@ -2,7 +2,7 @@ classes: eidas-node-1.qa.sveidas.se: autoupdate: null common: null - eidas_connector: {hostname: qa.connector.eidas.swedenconnect.se, version: 1.2.3} + eidas_connector: {hostname: qa.connector.eidas.swedenconnect.se, version: 1.3.1} entropyclient: null infra_ca_rp: null konsulter: null @@ -38,10 +38,12 @@ classes: sunetops: null fe-fre-3.komreg.net: common: null + eid::dockerhost: null entropyclient: null infra_ca_rp: null mailclient: *id001 nrpe: null + sunet::frontend::load_balancer: null sunet::rsyslog: null sunetops: null jmp.komreg.net: @@ -238,13 +240,21 @@ classes: sunet::rsyslog: null sunet_iaas_cloud: null sunetops: null + web-1.qa.sveidas.se: + common: null + entropyclient: null + infra_ca_rp: null + mailclient: *id001 + nrpe: null + sunet::rsyslog: null + sunetops: null members: all: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] autoupdate: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net] @@ -253,7 +263,8 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] + eid::dockerhost: [fe-fre-3.komreg.net] eid::kvmhost: [kvmfe-fre-3.komreg.net] eidas_connector: [eidas-node-1.qa.sveidas.se] eidas_proxy: [eidas-proxy-1.qa.sveidas.se] @@ -262,13 +273,13 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] infra_ca_rp: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, kvmeidas-fre-3.komreg.net, kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] konsulter: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, jump-fre-3.komreg.net, jump-tug-3.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net, prid-1.qa.sveidas.se] @@ -277,7 +288,7 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] md_publisher: [p1.komreg.net, p2.qa.komreg.net] md_repo_client: [md-eu1.qa.komreg.net] md_repo_server: [r1.komreg.net] @@ -288,12 +299,13 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] openstack_dockerhost: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, md-eu1.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net] prid: [prid-1.qa.sveidas.se] servicemonitor: [eidas-proxy-1.qa.sveidas.se, prid-1.qa.sveidas.se] sunet::dehydrated: [r1.komreg.net] + sunet::frontend::load_balancer: [fe-fre-3.komreg.net] sunet::frontend::register_sites: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, p1.komreg.net, p2.qa.komreg.net] sunet::rsyslog: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, fe-fre-3.komreg.net, @@ -301,7 +313,7 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] sunet_iaas_cloud: [eidas-node-1.qa.sveidas.se, eidas-proxy-1.qa.sveidas.se, jmp.komreg.net, md-eu1.qa.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, prid-1.qa.sveidas.se, r1.komreg.net] @@ -310,5 +322,5 @@ members: kvmeidas-tug-3.komreg.net, kvmfe-fre-3.komreg.net, kvmfe-tug-3.komreg.net, kvminfra-fre-3.komreg.net, kvminfra-tug-3.komreg.net, kvmmeta-fre-3.komreg.net, kvmmeta-tug-3.komreg.net, md-eu1.qa.komreg.net, md1.komreg.net, nic.komreg.net, p1.komreg.net, p2.qa.komreg.net, - prid-1.qa.sveidas.se, r1.komreg.net] + prid-1.qa.sveidas.se, r1.komreg.net, web-1.qa.sveidas.se] From eba2e4fecc5a0f2edfa153a169ab439ff870b4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 14:46:05 +0200 Subject: [PATCH 04/10] changed docker version --- global/overlay/etc/hiera/data/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 792a8a4d..562a0ef8 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -1,5 +1,5 @@ --- -eid_docker_version: '18.02.0~ce-0~ubuntu' +eid_docker_version: '18.03.0~ce-0~ubuntu' eid_docker_compose_version: '1.15.0' eid_proxy_server: "" From 6fb89271a3289063d4af54e781c009e3b1e89ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 14:53:54 +0200 Subject: [PATCH 05/10] changed docker version to test --- global/overlay/etc/hiera/data/common.yaml | 1 + global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 562a0ef8..d5d6f36a 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -1,6 +1,7 @@ --- eid_docker_version: '18.03.0~ce-0~ubuntu' eid_docker_compose_version: '1.15.0' +eid_docker_repo: 'test' eid_proxy_server: "" eid_no_proxy: true diff --git a/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp b/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp index 984828b4..7aa64f74 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp @@ -2,7 +2,7 @@ class eid::dockerhost( String $version = safe_hiera('eid_docker_version'), String $package_name = hiera('eid_docker_package_name', 'docker-ce'), - Enum['stable', 'edge'] $docker_repo = hiera('eid_docker_repo', 'stable'), + Enum['stable', 'edge', 'test'] $docker_repo = hiera('eid_docker_repo', 'stable'), String $compose_version = safe_hiera('eid_docker_compose_version'), String $docker_args = '', Optional[String] $docker_dns = undef, From 0e0e3cf8c1154b859d38b1cb74c66db877184274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 14:55:57 +0200 Subject: [PATCH 06/10] changed docker version to 18.05 --- global/overlay/etc/hiera/data/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index d5d6f36a..1f88e2f2 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -1,5 +1,5 @@ --- -eid_docker_version: '18.03.0~ce-0~ubuntu' +eid_docker_version: '18.05.0~ce-0~ubuntu' eid_docker_compose_version: '1.15.0' eid_docker_repo: 'test' From 825c04a4737a136203df64abf65c21a31c9ab53a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 14:57:36 +0200 Subject: [PATCH 07/10] changed docker version to 18.05.0~ce~2.1.rc1-0~ubuntu --- global/overlay/etc/hiera/data/common.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/hiera/data/common.yaml b/global/overlay/etc/hiera/data/common.yaml index 1f88e2f2..b4d26d90 100644 --- a/global/overlay/etc/hiera/data/common.yaml +++ b/global/overlay/etc/hiera/data/common.yaml @@ -1,5 +1,5 @@ --- -eid_docker_version: '18.05.0~ce-0~ubuntu' +eid_docker_version: '18.05.0~ce~2.1.rc1-0~ubuntu' eid_docker_compose_version: '1.15.0' eid_docker_repo: 'test' From 63f24d9db4bebfadc3dda183f23f6c95ff12378c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 15:08:37 +0200 Subject: [PATCH 08/10] changed cosmos-modules --- global/overlay/etc/puppet/cosmos-modules.conf | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-modules.conf b/global/overlay/etc/puppet/cosmos-modules.conf index 981d7658..d83768de 100644 --- a/global/overlay/etc/puppet/cosmos-modules.conf +++ b/global/overlay/etc/puppet/cosmos-modules.conf @@ -1,23 +1,23 @@ # name source (puppetlabs fq name or git url) upgrade (yes/no) # -concat git://github.com/SUNET/puppetlabs-concat.git yes sunet_dev-* -stdlib git://github.com/SUNET/puppetlabs-stdlib.git yes sunet-* -cosmos git://github.com/SUNET/puppet-cosmos.git yes sunet-* -ufw git://github.com/SUNET/puppet-module-ufw.git yes sunet-* -apt git://github.com/SUNET/puppetlabs-apt.git yes sunet-* -vcsrepo git://github.com/SUNET/puppetlabs-vcsrepo.git yes sunet-* -xinetd git://github.com/SUNET/puppetlabs-xinetd.git yes sunet-* -python git://github.com/SUNET/puppet-python.git yes sunet-* -hiera-gpg git://github.com/SUNET/hiera-gpg.git yes sunet-* -pound git://github.com/SUNET/puppet-pound.git yes sunet-* -augeas git://github.com/SUNET/puppet-augeas.git yes sunet-* -bastion git://github.com/SUNET/puppet-bastion.git yes sunet-* +concat git://github.com/SUNET/puppetlabs-concat.git yes sunet_dev-2* +stdlib git://github.com/SUNET/puppetlabs-stdlib.git yes sunet-2* +cosmos git://github.com/SUNET/puppet-cosmos.git yes sunet-2* +ufw git://github.com/SUNET/puppet-module-ufw.git yes sunet-2* +apt git://github.com/SUNET/puppetlabs-apt.git yes sunet-2* +vcsrepo git://github.com/SUNET/puppetlabs-vcsrepo.git yes sunet-2* +xinetd git://github.com/SUNET/puppetlabs-xinetd.git yes sunet-2* +python git://github.com/SUNET/puppet-python.git yes sunet-2* +hiera-gpg git://github.com/SUNET/hiera-gpg.git yes sunet-2* +pound git://github.com/SUNET/puppet-pound.git yes sunet-2* +augeas git://github.com/SUNET/puppet-augeas.git yes sunet-2* +bastion git://github.com/SUNET/puppet-bastion.git yes sunet-2* pyff git://github.com/samlbits/puppet-pyff.git yes puppet-pyff-* -dhcp git://github.com/SUNET/puppetlabs-dhcp.git yes sunet_dev-* +dhcp git://github.com/SUNET/puppetlabs-dhcp.git yes sunet_dev-2* varnish git://github.com/samlbits/puppet-varnish.git yes puppet-varnish-* -apparmor https://github.com/SUNET/puppet-apparmor.git yes sunet-* -docker git://github.com/SUNET/garethr-docker.git yes sunet-* -network git://github.com/SUNET/attachmentgenie-network.git yes sunet-* -sunet git://github.com/SUNET/puppet-sunet.git yes sunet-* -sysctl git://github.com/SUNET/puppet-sysctl.git yes sunet-* -nagioscfg git://github.com/SUNET/puppet-nagioscfg.git yes sunet-* +apparmor https://github.com/SUNET/puppet-apparmor.git yes sunet-2* +docker git://github.com/SUNET/garethr-docker.git yes sunet-2* +network git://github.com/SUNET/attachmentgenie-network.git yes sunet-2* +sunet git://github.com/SUNET/puppet-sunet.git yes sunet_dev-2* +sysctl git://github.com/SUNET/puppet-sysctl.git yes sunet-2* +nagioscfg git://github.com/SUNET/puppet-nagioscfg.git yes sunet-2* From de81ea2c4764fdac99f597cd748f7dd9e69f0c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 15:26:14 +0200 Subject: [PATCH 09/10] added bgp peers for fe --- fe-common/overlay/etc/hiera/data/group.yaml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/fe-common/overlay/etc/hiera/data/group.yaml b/fe-common/overlay/etc/hiera/data/group.yaml index cb85b8fc..9120a5b2 100644 --- a/fe-common/overlay/etc/hiera/data/group.yaml +++ b/fe-common/overlay/etc/hiera/data/group.yaml @@ -24,25 +24,22 @@ sunet_frontend: remote_ip: '2001:6b0:8:4::111' - websites2_disabled: + websites2: 'www': - site_name: 'www.dev.eduid.se' + site_name: 'www.komreg.net' frontends: - 'fe-fre-1.eduid.se': - ips: ['130.242.131.61', '2001:6b0:54:fe::61'] - 'fe-tug-1.eduid.se': - ips: ['130.242.131.62', '2001:6b0:54:fe::62'] + 'fe-fre-3.komreg.net': + ips: ['94.176.224.180'] + 'fe-tug-3.komreg.net': + ips: ['94.176.224.181'] backends: default: - 'www-fre-1.eduid.se': - ips: ['130.242.130.200'] + 'www-fre-1.komreg.net': + ips: ['94.176.224.132'] server_args: 'ssl check verify none' - csp_ext_src: 'https://dev.eduid.se https://www.dev.eduid.se' allow_ports: - 443 - letsencrypt_server: 'acme-c.dev.eduid.se' - varnish_enabled: true - varnish_imagetag: 'staging' + letsencrypt_server: 'acme-c.sunet.se' haproxy_imagetag: 'staging' From 4a0d0e651ac04cd6e6904eaadc0f6bddb5dba44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Bergstro=CC=88m?= Date: Fri, 4 May 2018 15:36:01 +0200 Subject: [PATCH 10/10] added ipv6 to fe-fre-3.komreg.net --- .../overlay/etc/netplan/99-static-ipv6.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 fe-fre-3.komreg.net/overlay/etc/netplan/99-static-ipv6.yaml diff --git a/fe-fre-3.komreg.net/overlay/etc/netplan/99-static-ipv6.yaml b/fe-fre-3.komreg.net/overlay/etc/netplan/99-static-ipv6.yaml new file mode 100644 index 00000000..bdb5e39e --- /dev/null +++ b/fe-fre-3.komreg.net/overlay/etc/netplan/99-static-ipv6.yaml @@ -0,0 +1,9 @@ +network: + version: 2 + ethernets: + eth0: + addresses: + - 2001:6b0:64:2::165/64 + gateway6: 2001:6b0:64:2::1 + match: + name: eth0