From ec441d0b5e3a9081bedb1b694d9abab5726cae72 Mon Sep 17 00:00:00 2001 From: Patrik Holmqvist Date: Fri, 17 Jan 2025 13:18:13 +0100 Subject: [PATCH] Fail if backup_nodename is not set --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 - .../etc/puppet/modules/net/manifests/baas2_restoretest.pp | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 30e2dbe..cb171d7 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -37,7 +37,6 @@ baas2-backuptest-prod-1.sunet.se: baas2-restoretest-prod-1.sunet.se: net::baas2_restoretest: node_type: 'restorenode' - backup_nodename: 378A9E0ADCC5 sunet::baas2: nodename: B0DA416B08FC backup_dirs: diff --git a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp index 214c7db..cdda451 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/baas2_restoretest.pp @@ -3,7 +3,7 @@ # Jira-ref: SUNETOPS-1997 class net::baas2_restoretest( Enum['backupnode', 'restorenode'] $node_type, - String $backup_nodename, + Optional[String] $backup_nodename = undef, ) { file { '/opt/baas2': @@ -14,6 +14,9 @@ class net::baas2_restoretest( } if $node_type == 'restorenode' { + if $backup_nodename == undef { + fail{'Variable backup_nodename must be set for a restorenode':} + } package { 'expect': ensure => installed } file { '/opt/restore-target': ensure => directory,