From bd3b6937c294a170be8e06d7dbca83e043c70078 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 14 Aug 2018 13:11:25 +0200
Subject: [PATCH] avoid duplicate decl

---
 .../etc/puppet/manifests/cosmos-site.pp       | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 4611a7d4..f4aa744b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -245,9 +245,9 @@ class md_repo_server($hostname) {
       volumes  => ['/etc/dehydrated:/etc/dehydrated','/home/git:/home/git'],
       ports    => ['443:443','80:80'],
       env      => ["HOSTNAME=$hostname","ACMEDIR=/etc/dehydrated","KEYDIR=/etc/dehydrated"]
-   } ->
-   class {'webserver': } ->
-   class {'https_server': }
+   }
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class eidas_sp($version="1.0.0",$hostname='localhost') {
@@ -269,8 +269,8 @@ class eidas_sp($version="1.0.0",$hostname='localhost') {
                    "SPRING_PROFILES_ACTIVE=qa",
                    "SP_BASE_URI=https://$_hostname"]
    }
-   ensure_resource(class,'webserver',{})
-   ensure_resource(class,'https_server',{})
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class swedenconnect_refidp($version="1.0.3",$hostname='localhost') {
@@ -294,8 +294,8 @@ class swedenconnect_refidp($version="1.0.3",$hostname='localhost') {
                    "IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt",
                    "IDP_FTICKS_SALT=$idp_fticks_salt"]
    }
-   ensure_resource(class,'webserver',{})
-   ensure_resource(class,'https_server',{})
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class eidas_connector($version="1.0.6",$hostname='localhost') {
@@ -344,9 +344,9 @@ class eidas_connector($version="1.0.6",$hostname='localhost') {
                    "IDP_PERSISTENT_ID_SALT=$idp_persistent_id_salt",
                    "IDP_SEALER_PASSWORD=$idp_sealer_password",
                    "IDP_FTICKS_SALT=$idp_fticks_salt"]
-   } ->
-   class {'webserver': } ->
-   class {'https_server': }
+   }
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class eidas_proxy($version='1.0.0',$country='se',$hostname='localhost') {
@@ -380,9 +380,9 @@ class eidas_proxy($version='1.0.0',$country='se',$hostname='localhost') {
                    "CERTNAME=${::fqdn}_infra",
                    "SPRING_CONFIG_LOCATION=/etc/eidas-proxy/$_country/cfg/",
                    "PROXY_SERVICE_COOKIEENCRYPTPW=$proxy_service_cookie_encrypt_pw"]
-   } ->
-   class {'webserver': } ->
-   class {'https_server': }
+   }
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class prid($version="1.0.0",$clients) {
@@ -419,9 +419,9 @@ class validator($version="2.0.0") {
                     '/etc/localtime:/etc/localtime:ro'],
       env       => ["SPRING_CONFIG_LOCATION=/opt/webapp/mdval/cfg/",
                     "CERTNAME=${hostname}_infra"]
-   } ->
-   class {'webserver': } ->
-   class {'https_server': }
+   }
+   ensure_resource('class','webserver',{})
+   ensure_resource('class','https_server',{})
 }
 
 class github_client_credential {
@@ -439,7 +439,7 @@ class pages($version=undef) {
       ports   => ['80:80'],
       volumes => ['/var/www:/usr/local/apache2/vhosts']
    }
-   class { 'webserver': }
+   ensure_resource('class','webserver',{})
 }
 
 class metadatamgrs {