Update to packaging 2.0 from 1.0

Delete old parsing method
Correct space/tabulation/duplicate comment

Change-Id: I32c701365f2914b60c0ddd2d386b639c4ed11c0a

README.md

@@ -15,7 +15,7 @@ Requirements
 
 | Requirement                      | Version/Comment                                         |
 |----------------------------------|---------------------------------------------------------|
-| Mirantis Openstack compatibility | 6.0                                                     |
+| Mirantis Openstack compatibility | 6.1                                                   |
 |----------------------------------|---------------------------------------------------------|
 
 
@@ -47,18 +47,21 @@ Vxlan plugin installation
 
    ``fpb --build fuel-plugin-vxlan/``
 
-4. The vxlan-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-vxlan)
+4. The vxlan-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-vxlan)
 
 5. Move this file to the Fuel Master node with secure copy (scp):
 
-   ``scp vxlan-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
+   ``scp vxlan-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
    ``cd /tmp``
 
 6. Install the vxlan plugin:
 
-   ``fuel plugins --install vxlan-<x.x.x>.fp``
+   ``fuel plugins --install vxlan-<x.x.x>.rpm``
 
-6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
+7.  Verify that the plugin is installed correctly:
+   ``fuel plugins --list``
+
+8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
 
 User Guide
 ==========
@@ -96,5 +99,7 @@ Release Notes
 
 * Initial release of the plugin
 
+**2.0.0**
 
+* migrate plugins from 1.0.0 to 2.0.0 package version
 

deployment_scripts/puppet/manifests/site-compute-post.pp

@@ -1,2 +1 @@
-$fuel_settings = parseyaml($astute_settings_yaml)
 class {'vxlan::compute':}

deployment_scripts/puppet/manifests/site-controller-post.pp

@@ -1,2 +1 @@
-$fuel_settings = parseyaml($astute_settings_yaml)
 class {'vxlan::controller':}

deployment_scripts/puppet/modules/vxlan/manifests/compute.pp

@@ -45,11 +45,11 @@ include vxlan::params
 
   neutron_plugin_ml2 {
       'ml2/type_drivers': value => 'vxlan,flat,vlan,gre';
-  }~> Service['neutron-plugin-openvswitch-agent']
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
 
   neutron_plugin_ml2 {
       'ml2/tenant_network_types': value => 'vxlan,flat,vlan,gre';
-  }~> Service['neutron-plugin-openvswitch-agent']
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
 
 
   neutron_plugin_ml2 {
@@ -58,7 +58,7 @@ include vxlan::params
 
   neutron_plugin_ml2 { 
       'agent/tunnel_types': value => 'vxlan,gre';
-  }~> Service['neutron-plugin-openvswitch-agent']
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
 
   class {'::firewall':}
 
@@ -80,7 +80,7 @@ include vxlan::params
 
 
 
-  service { 'neutron-plugin-openvswitch-agent':
+  service { "$vxlan::params::openvswitch_agent_compute":
     ensure  => running,
     enable  => true,
   }

deployment_scripts/puppet/modules/vxlan/manifests/controller.pp

@@ -41,6 +41,14 @@ class vxlan::controller (
 include vxlan::params
 
 
+  neutron_router_interface { "router04:net04__subnet":
+    ensure => absent,
+  }
+
+  neutron_network { 'net04':
+    ensure                    => absent,
+  }
+
   #update  ml2 configuration
   neutron_plugin_ml2 {
       'ml2/type_drivers': value => 'vxlan,flat,vlan,gre';

deployment_scripts/puppet/modules/vxlan/manifests/neutron_services.pp

@@ -36,33 +36,17 @@
 # Copyright 2014 Your name here, unless otherwise noted.
 #
 class vxlan::neutron_services (){
-  if ($::fuel_settings['deployment_mode'] == 'multinode') {
+include vxlan::params
-
-    neutron_plugin_ml2 { 
-        'agent/tunnel_types': value => 'vxlan,gre';
-    }~> Service['neutron-plugin-openvswitch-agent']
-    service { 'neutron-plugin-openvswitch-agent':
-      ensure  => running,
-      enable  => true,
-    }
-    service { 'neutron-l3-agent':
-      ensure  => running,
-      enable  => true,
-    }
-  }
-  else {
 
     neutron_plugin_ml2 {
         'agent/tunnel_types': value => 'vxlan';
-    }->
+    } ~> Service['neutron-server']
-    exec { "neutron-pluign-openvswitch-agent_restart":
+    ->
-      command => "/usr/sbin/crm resource restart p_neutron-plugin-openvswitch-agent",
+    exec { "neutron-plugin-openvswitch-agent_restart":
+      command => "/usr/sbin/crm resource restart $vxlan::params::openvswitch_agent",
     }->
     exec { "neutron-l3-agent_restart":
       command => "/usr/sbin/crm resource restart p_neutron-l3-agent",
     }
 
-
-
-  }
 }

deployment_scripts/puppet/modules/vxlan/manifests/params.pp

@@ -1,3 +1,16 @@
 class vxlan::params {
   $ml2_conf_file = '/etc/neutron/plugins/ml2/ml2_conf.ini'
+
+
+  if $::osfamily == 'Debian' {
+
+    $openvswitch_agent = 'p_neutron-plugin-openvswitch-agent'
+    $openvswitch_agent_compute = 'neutron-plugin-openvswitch-agent'
+  } elsif($::osfamily == 'RedHat') {
+
+    $openvswitch_agent = 'p_neutron-openvswitch-agent'
+    $openvswitch_agent_compute = 'neutron-openvswitch-agent'
+  } else {
+    fail("unsuported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
+  }
 }

metadata.yaml

@@ -2,24 +2,31 @@
 name: vxlan
 title: Vxlan plugin for Neutron
 # Plugin version
-version: 1.0.0
+version: 2.0.0
 # Description
 description: Enables Vxlan for Neutron, works in multinode mode only
 # Required fuel version
-fuel_version: ['6.0']
+fuel_version: ['6.1']
-
+# Specify license of your plugin
+licenses: ['Apache License Version 2.0']
+# Specify author or company name
+authors: ['Orange']
+# A link to the plugin's page
+homepage: 'https://github.com/stackforge/fuel-plugin-nova-nfs'
+# Specify a group which your plugin implements, possible options:
+# network, storage, storage::cinder, storage::glance, hypervisor
+groups: ['network']
 # The plugin is compatible with releases in the list
 releases:
   - os: ubuntu
-    version: 2014.2-6.0
+    version: 2014.2.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/ubuntu
   - os: centos
-    version: 2014.2-6.0
+    version: 2014.2.2-6.1
     mode: ['ha', 'multinode']
     deployment_scripts_path: deployment_scripts/
     repository_path: repositories/centos
-
 # Version of plugin package
-package_version: '1.0.0'
+package_version: '2.0.0'

tasks.yaml

@@ -1,13 +1,13 @@
 # Deployment is required for controllers
 - role: ['primary-controller', 'controller']
-  stage: post_deployment
+  stage: post_deployment/4000
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/site-controller-post.pp
     puppet_modules: puppet/modules:/etc/puppet/modules/
     timeout: 360
 - role: ['compute']
-  stage: post_deployment
+  stage: post_deployment/4001
   type: puppet
   parameters:
     puppet_manifest: puppet/manifests/site-compute-post.pp