Merge "Plugin's changes wich follows from driver changes"

deployment_scripts/puppet/manifests/site.pp

@@ -22,7 +22,7 @@ $vsphere_password = $computes['vc_password']
 
 $neutron          = hiera_hash('neutron_config', {})
 $py_root          = '/usr/lib/python2.7/dist-packages'
-$ml2_driver_path  = 'neutron/plugins/ml2/drivers/mech_vmware_dvs'
+$ml2_driver_path  = 'neutron/plugins/ml2/drivers/vmware_dvs'
 $ml2_plugin_path  = 'neutron/cmd/eventlet/plugins/dvs_neutron_agent.py'
 $driver_path      = "${py_root}/${ml2_driver_path}"
 $plugin_path      = "${py_root}/${ml2_plugin_path}"

deployment_scripts/puppet/modules/vmware_dvs/files/dvs_neutron_agent.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import neutron.plugins.ml2.drivers.mech_vmware_dvs.agentDVS.dvs_neutron_agent as agent_main
+import neutron.plugins.ml2.drivers.vmware_dvs.agent.dvs_neutron_agent as agent_main
 
 
 def main():

deployment_scripts/puppet/modules/vmware_dvs/manifests/init.pp

@@ -40,25 +40,24 @@ class vmware_dvs(
   $vsphere_hostname = '192.168.0.1',
   $vsphere_login    = 'administrator@vsphere.loc',
   $vsphere_password = 'StrongPassword!',
-  $driver_path      = 'neutron/plugins/ml2/drivers/mech_vmware_dvs',
+  $driver_path      = 'neutron/plugins/ml2/drivers/vmware_dvs',
   $plugin_path      = 'neutron/cmd/eventlet/plugins/dvs_neutron_agent.py',
 )
 {
   neutron_config {
     'DEFAULT/notification_driver': value => 'messagingv2';
-    'DEFAULT/notification_topics': value => 'notifications,vmware_dvs';
     }->
     neutron_plugin_ml2 {
       'ml2_vmware/vsphere_hostname': value => $vsphere_hostname;
       'ml2_vmware/vsphere_login':    value => $vsphere_login;
       'ml2_vmware/vsphere_password': value => $vsphere_password;
       } ->
-      package { ['python-suds','python-mech-vmware-dvs']:
+      package { ['python-suds','python-vmware-dvs']:
         ensure => present,
         }->
         file {$driver_path:
           ensure => 'link',
-          target => '/usr/local/lib/python2.7/dist-packages/mech_vmware_dvs',
+          target => '/usr/local/lib/python2.7/dist-packages/vmware_dvs',
         }
         file {'dvs_neutron_agent.py':
           path   => $plugin_path,
@@ -71,7 +70,7 @@ class vmware_dvs(
           owner   => 'root',
           group   => 'root',
           mode    => '0755',
-          require => Package['python-mech-vmware-dvs'],
+          require => Package['python-vmware-dvs'],
         }->
         file {'/usr/local/bin/neutron-dvs-agent':
           ensure => 'link',

metadata.yaml

@@ -3,7 +3,7 @@ name: fuel-plugin-vmware-dvs
 # Human-readable name for your plugin
 title: Neutron VMware DVS ML2 plugin
 # Plugin version
-version: '2.1.10'
+version: '2.1.14'
 # Description
 description: Enable to use plugin vmware_dvs for Neutron
 # Required fuel version