Fix python-virtualenv references for puppet4

In order for this module to be used with puppet-python on puppet4, we
need to reference the virtualenv package by title ("virtualenv") instead
of by name ("python-virtualenv").

Change-Id: I24d40a499a805d8cdc1024e533ba8500115e4ea2

manifests/alarmdefs.pp

@@ -65,7 +65,14 @@ class monasca::alarmdefs(
   $sql_port = $::monasca::params::sql_port
 
   if $install_python_deps {
-    package { ['python-virtualenv', 'python-dev']:
+    # Name virtualenv instead of python-virtualenv for compat with puppet-python
+    package { 'virtualenv':
+      ensure => $python_dep_ensure,
+      name   => 'python-virtualenv',
+      before => Python::Virtualenv[$virtual_env],
+    }
+
+    package { 'python-dev':
       ensure => $python_dep_ensure,
       before => Python::Virtualenv[$virtual_env],
     }
@@ -75,7 +82,7 @@ class monasca::alarmdefs(
     owner   => 'root',
     group   => 'root',
     before  => [Exec[$script], File[$script]],
-    require => [Package['python-virtualenv'],Package['python-dev']],
+    require => [Package['virtualenv'],Package['python-dev']],
   }
 
   file { $script:

manifests/notification.pp

@@ -115,7 +115,14 @@ class monasca::notification(
   $startup_script = '/etc/init/monasca-notification.conf'
 
   if $install_python_deps {
-    package { ['python-virtualenv', 'python-dev']:
+    # Name virtualenv instead of python-virtualenv for compat with puppet-python
+    package { 'virtualenv':
+      ensure => $python_dep_ensure,
+      name   => 'python-virtualenv',
+      before => Python::Virtualenv[$virtual_env],
+    }
+
+    package { 'python-dev':
       ensure => $python_dep_ensure,
       before => Python::Virtualenv[$virtual_env],
     }
@@ -124,7 +131,7 @@ class monasca::notification(
   python::virtualenv { $virtual_env :
     owner   => 'root',
     group   => 'root',
-    require => [Package['python-virtualenv'],Package['python-dev']],
+    require => [Package['virtualenv'],Package['python-dev']],
   }
 
   python::pip { 'monasca-notification' :

manifests/vertica/config.pp

@@ -157,7 +157,7 @@ class monasca::vertica::config (
     owner   => 'root',
     group   => 'root',
     before  => [File[$prune_script], File[$partition_drop_script]],
-    require => [Package['python-virtualenv'],Package['python-dev']],
+    require => [Package['virtualenv'],Package['python-dev']],
   }
 
   file { $prune_script: