From ab262769737892a0232db75af025a72661905f41 Mon Sep 17 00:00:00 2001 From: Brad Klein Date: Thu, 1 Sep 2016 09:11:01 -0600 Subject: [PATCH] Allow dynamic alarm and notification bootstrapping Change-Id: I10d1e0ab7a7c88b29fd05fbf4173317ac96434c9 --- manifests/alarmdefs.pp | 42 +++++++++---------- .../alarm_definition_config.json.erb | 0 .../notification_assignments.json.erb | 0 .../notification_config.json.erb | 0 4 files changed, 21 insertions(+), 21 deletions(-) rename files/alarm_definition_config.json => templates/alarm_definition_config.json.erb (100%) rename files/notification_assignments.json => templates/notification_assignments.json.erb (100%) rename files/notification_config.json => templates/notification_config.json.erb (100%) diff --git a/manifests/alarmdefs.pp b/manifests/alarmdefs.pp index f94ace3..16d452d 100644 --- a/manifests/alarmdefs.pp +++ b/manifests/alarmdefs.pp @@ -5,13 +5,13 @@ # === Parameters: # # [*alarm_definition_config_source*] -# location of alarm definitions to bootstrap in mysql database +# location of alarm definitions template to bootstrap in mysql database # # [*notification_config_source*] -# location of notification methods to bootstrap in mysql database +# location of notification methods template to bootstrap in mysql database # # [*notification_assignments_source*] -# location of notification assignments to bootstrap in mysql database +# location of notification assignments template to bootstrap in mysql database # # [*admin_username*] # name of the monasca admin user @@ -38,9 +38,9 @@ # flag for whether or not to ensure/update python dependencies # class monasca::alarmdefs( - $alarm_definition_config_source = 'puppet:///modules/monasca/alarm_definition_config.json', - $notification_config_source = 'puppet:///modules/monasca/notification_config.json', - $notification_assignments_source = 'puppet:///modules/monasca/notification_assignments.json', + $alarm_definition_config_source = 'monasca/alarm_definition_config.json.erb', + $notification_config_source = 'monasca/notification_config.json.erb', + $notification_assignments_source = 'monasca/notification_assignments.json.erb', $admin_username = 'monasca-admin', $admin_password = undef, $api_server_url = undef, @@ -87,27 +87,27 @@ class monasca::alarmdefs( } file { $alarm_definition_config: - ensure => file, - source => $alarm_definition_config_source, - mode => '0755', - owner => 'root', - group => 'root', + ensure => file, + content => template($alarm_definition_config_source), + mode => '0755', + owner => 'root', + group => 'root', } file { $notification_config: - ensure => file, - source => $notification_config_source, - mode => '0755', - owner => 'root', - group => 'root', + ensure => file, + content => template($notification_config_source), + mode => '0755', + owner => 'root', + group => 'root', } file { $notification_assignments: - ensure => file, - source => $notification_assignments_source, - mode => '0755', - owner => 'root', - group => 'root', + ensure => file, + content => template($notification_assignments_source), + mode => '0755', + owner => 'root', + group => 'root', } exec { $script: diff --git a/files/alarm_definition_config.json b/templates/alarm_definition_config.json.erb similarity index 100% rename from files/alarm_definition_config.json rename to templates/alarm_definition_config.json.erb diff --git a/files/notification_assignments.json b/templates/notification_assignments.json.erb similarity index 100% rename from files/notification_assignments.json rename to templates/notification_assignments.json.erb diff --git a/files/notification_config.json b/templates/notification_config.json.erb similarity index 100% rename from files/notification_config.json rename to templates/notification_config.json.erb