Merge branch 'rhmk-fix' into 'dev'

fixed common.yaml variables due to merge in dev



See merge request !18

examples/hieradata/common.yaml

@@ -29,7 +29,6 @@ iaas::profile::base::dns_searchdomain: .openstacklocal
 iaas::profile::keepalived::notification_email: 'account@domain1'
 iaas::profile::keepalived::notification_email_from: 'noreply-keepalived-ocpops1@cnaf.infn.it'
 iaas::profile::keepalived::smtp_server: 'smtp.server1'
-iaas::profile::keepalived::vip_address: '10.101.32.x'
 iaas::profile::keepalived::lvs_interface: 'eth0'
 
 # HAProxy

manifests/profile/keepalived.pp

 class iaas::profile::keepalived (
   $admin_interface = hiera('iaas::admin_interface', undef),
   $public_interface = hiera('iaas::public_interface', undef),
-  $vip_admin_address = hiera('iaas::admin_vip',undef),
-  $vip_main_address = hiera('iaas::main_vip',undef),
+  $vip_admin_address = hiera('iaas::admin_address',undef),
+  $vip_main_address = hiera('iaas::main_address',undef),
   $notification_email = undef,
   $notification_email_from = undef,
   $smtp_server = undef,