Merge branch 'dev' into 'master'

Dev



See merge request !29

Puppetfile

@@ -16,6 +16,7 @@ metadata
 #    :git => "git://github.com/puppetlabs/puppetlabs-puppet"
 mod 'ceph',
     :git => "https://baltig.infn.it/ocp-tools/ceph.git"
+    :ref => '1.0.0'
 
 # A module from a git branch/tag
 # mod 'puppetlabs-apt',

manifests/role/rhmk.pp

@@ -96,9 +96,9 @@ class iaas::role::rhmk(
     vip_main_address        => $main_address,
     state    	            => $keepalived_state,
     priority 	            => $keepalived_priority,
-    notification_email      => $notification_email,
-    notification_email_from => $notification_email_from,
-    smtp_server 	    => $smtp_server,
+    notification_email      => $keepalived_notification_mail,
+    notification_email_from => $keepalived_notification_mail_from,
+    smtp_server 	    => $keepalived_smtp_server,
   }
   class { 'iaas::profile::rabbitmq': 
     admin_interface => $admin_interface,