Browse Source

Update to packaging 2.0 from 1.0

Delete old parsing method
Correct space/tabulation/duplicate comment

Change-Id: I32c701365f2914b60c0ddd2d386b639c4ed11c0a
Lnic 3 years ago
parent
commit
00beff05b0

+ 10
- 5
README.md View File

@@ -15,7 +15,7 @@ Requirements
15 15
 
16 16
 | Requirement                      | Version/Comment                                         |
17 17
 |----------------------------------|---------------------------------------------------------|
18
-| Mirantis Openstack compatibility | 6.0                                                     |
18
+| Mirantis Openstack compatibility | 6.1                                                   |
19 19
 |----------------------------------|---------------------------------------------------------|
20 20
 
21 21
 
@@ -47,18 +47,21 @@ Vxlan plugin installation
47 47
 
48 48
    ``fpb --build fuel-plugin-vxlan/``
49 49
 
50
-4. The vxlan-<x.x.x>.fp file will be created in the plugin folder (fuel-plugin-vxlan)
50
+4. The vxlan-<x.x.x>.rpm file will be created in the plugin folder (fuel-plugin-vxlan)
51 51
 
52 52
 5. Move this file to the Fuel Master node with secure copy (scp):
53 53
 
54
-   ``scp vxlan-<x.x.x>.fp root@:<the_Fuel_Master_node_IP address>:/tmp``
54
+   ``scp vxlan-<x.x.x>.rpm root@:<the_Fuel_Master_node_IP address>:/tmp``
55 55
    ``cd /tmp``
56 56
 
57 57
 6. Install the vxlan plugin:
58 58
 
59
-   ``fuel plugins --install vxlan-<x.x.x>.fp``
59
+   ``fuel plugins --install vxlan-<x.x.x>.rpm``
60 60
 
61
-6. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
61
+7.  Verify that the plugin is installed correctly:
62
+   ``fuel plugins --list``
63
+
64
+8. Plugin is ready to use and can be enabled on the Settings tab of the Fuel web UI.
62 65
 
63 66
 User Guide
64 67
 ==========
@@ -96,5 +99,7 @@ Release Notes
96 99
 
97 100
 * Initial release of the plugin
98 101
 
102
+**2.0.0**
99 103
 
104
+* migrate plugins from 1.0.0 to 2.0.0 package version
100 105
 

+ 0
- 1
deployment_scripts/puppet/manifests/site-compute-post.pp View File

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

+ 0
- 1
deployment_scripts/puppet/manifests/site-controller-post.pp View File

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

+ 4
- 4
deployment_scripts/puppet/modules/vxlan/manifests/compute.pp View File

@@ -45,11 +45,11 @@ include vxlan::params
45 45
 
46 46
   neutron_plugin_ml2 {
47 47
       'ml2/type_drivers': value => 'vxlan,flat,vlan,gre';
48
-  }~> Service['neutron-plugin-openvswitch-agent']
48
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
49 49
 
50 50
   neutron_plugin_ml2 {
51 51
       'ml2/tenant_network_types': value => 'vxlan,flat,vlan,gre';
52
-  }~> Service['neutron-plugin-openvswitch-agent']
52
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
53 53
 
54 54
 
55 55
   neutron_plugin_ml2 {
@@ -58,7 +58,7 @@ include vxlan::params
58 58
 
59 59
   neutron_plugin_ml2 { 
60 60
       'agent/tunnel_types': value => 'vxlan,gre';
61
-  }~> Service['neutron-plugin-openvswitch-agent']
61
+  }~> Service["$vxlan::params::openvswitch_agent_compute"]
62 62
 
63 63
   class {'::firewall':}
64 64
 
@@ -80,7 +80,7 @@ include vxlan::params
80 80
 
81 81
 
82 82
 
83
-  service { 'neutron-plugin-openvswitch-agent':
83
+  service { "$vxlan::params::openvswitch_agent_compute":
84 84
     ensure  => running,
85 85
     enable  => true,
86 86
   }

+ 8
- 0
deployment_scripts/puppet/modules/vxlan/manifests/controller.pp View File

@@ -41,6 +41,14 @@ class vxlan::controller (
41 41
 include vxlan::params
42 42
 
43 43
 
44
+  neutron_router_interface { "router04:net04__subnet":
45
+    ensure => absent,
46
+  }
47
+
48
+  neutron_network { 'net04':
49
+    ensure                    => absent,
50
+  }
51
+
44 52
   #update  ml2 configuration
45 53
   neutron_plugin_ml2 {
46 54
       'ml2/type_drivers': value => 'vxlan,flat,vlan,gre';

+ 5
- 21
deployment_scripts/puppet/modules/vxlan/manifests/neutron_services.pp View File

@@ -36,33 +36,17 @@
36 36
 # Copyright 2014 Your name here, unless otherwise noted.
37 37
 #
38 38
 class vxlan::neutron_services (){
39
-  if ($::fuel_settings['deployment_mode'] == 'multinode') {
40
-
41
-    neutron_plugin_ml2 { 
42
-        'agent/tunnel_types': value => 'vxlan,gre';
43
-    }~> Service['neutron-plugin-openvswitch-agent']
44
-    service { 'neutron-plugin-openvswitch-agent':
45
-      ensure  => running,
46
-      enable  => true,
47
-    }
48
-    service { 'neutron-l3-agent':
49
-      ensure  => running,
50
-      enable  => true,
51
-    }
52
-  }
53
-  else {
39
+include vxlan::params
54 40
 
55 41
     neutron_plugin_ml2 {
56 42
         'agent/tunnel_types': value => 'vxlan';
57
-    }->
58
-    exec { "neutron-pluign-openvswitch-agent_restart":
59
-      command => "/usr/sbin/crm resource restart p_neutron-plugin-openvswitch-agent",
43
+    } ~> Service['neutron-server']
44
+    ->
45
+    exec { "neutron-plugin-openvswitch-agent_restart":
46
+      command => "/usr/sbin/crm resource restart $vxlan::params::openvswitch_agent",
60 47
     }->
61 48
     exec { "neutron-l3-agent_restart":
62 49
       command => "/usr/sbin/crm resource restart p_neutron-l3-agent",
63 50
     }
64 51
 
65
-
66
-
67
-  }
68 52
 }

+ 13
- 0
deployment_scripts/puppet/modules/vxlan/manifests/params.pp View File

@@ -1,3 +1,16 @@
1 1
 class vxlan::params {
2 2
   $ml2_conf_file = '/etc/neutron/plugins/ml2/ml2_conf.ini'
3
+
4
+
5
+  if $::osfamily == 'Debian' {
6
+
7
+    $openvswitch_agent = 'p_neutron-plugin-openvswitch-agent'
8
+    $openvswitch_agent_compute = 'neutron-plugin-openvswitch-agent'
9
+  } elsif($::osfamily == 'RedHat') {
10
+
11
+    $openvswitch_agent = 'p_neutron-openvswitch-agent'
12
+    $openvswitch_agent_compute = 'neutron-openvswitch-agent'
13
+  } else {
14
+    fail("unsuported osfamily ${::osfamily}, currently Debian and Redhat are the only supported platforms")
15
+  }
3 16
 }

+ 14
- 7
metadata.yaml View File

@@ -2,24 +2,31 @@
2 2
 name: vxlan
3 3
 title: Vxlan plugin for Neutron
4 4
 # Plugin version
5
-version: 1.0.0
5
+version: 2.0.0
6 6
 # Description
7 7
 description: Enables Vxlan for Neutron, works in multinode mode only
8 8
 # Required fuel version
9
-fuel_version: ['6.0']
10
-
9
+fuel_version: ['6.1']
10
+# Specify license of your plugin
11
+licenses: ['Apache License Version 2.0']
12
+# Specify author or company name
13
+authors: ['Orange']
14
+# A link to the plugin's page
15
+homepage: 'https://github.com/stackforge/fuel-plugin-nova-nfs'
16
+# Specify a group which your plugin implements, possible options:
17
+# network, storage, storage::cinder, storage::glance, hypervisor
18
+groups: ['network']
11 19
 # The plugin is compatible with releases in the list
12 20
 releases:
13 21
   - os: ubuntu
14
-    version: 2014.2-6.0
22
+    version: 2014.2.2-6.1
15 23
     mode: ['ha', 'multinode']
16 24
     deployment_scripts_path: deployment_scripts/
17 25
     repository_path: repositories/ubuntu
18 26
   - os: centos
19
-    version: 2014.2-6.0
27
+    version: 2014.2.2-6.1
20 28
     mode: ['ha', 'multinode']
21 29
     deployment_scripts_path: deployment_scripts/
22 30
     repository_path: repositories/centos
23
-
24 31
 # Version of plugin package
25
-package_version: '1.0.0'
32
+package_version: '2.0.0'

+ 2
- 2
tasks.yaml View File

@@ -1,13 +1,13 @@
1 1
 # Deployment is required for controllers
2 2
 - role: ['primary-controller', 'controller']
3
-  stage: post_deployment
3
+  stage: post_deployment/4000
4 4
   type: puppet
5 5
   parameters:
6 6
     puppet_manifest: puppet/manifests/site-controller-post.pp
7 7
     puppet_modules: puppet/modules:/etc/puppet/modules/
8 8
     timeout: 360
9 9
 - role: ['compute']
10
-  stage: post_deployment
10
+  stage: post_deployment/4001
11 11
   type: puppet
12 12
   parameters:
13 13
     puppet_manifest: puppet/manifests/site-compute-post.pp

Loading…
Cancel
Save