diff --git a/README.md b/README.md index 08fdc3f..92a6ef3 100644 --- a/README.md +++ b/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-.fp file will be created in the plugin folder (fuel-plugin-vxlan) +4. The vxlan-.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-.fp root@::/tmp`` + ``scp vxlan-.rpm root@::/tmp`` ``cd /tmp`` 6. Install the vxlan plugin: - ``fuel plugins --install vxlan-.fp`` + ``fuel plugins --install vxlan-.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 diff --git a/deployment_scripts/puppet/manifests/site-compute-post.pp b/deployment_scripts/puppet/manifests/site-compute-post.pp index 058a482..0bc7a39 100644 --- a/deployment_scripts/puppet/manifests/site-compute-post.pp +++ b/deployment_scripts/puppet/manifests/site-compute-post.pp @@ -1,2 +1 @@ -$fuel_settings = parseyaml($astute_settings_yaml) class {'vxlan::compute':} diff --git a/deployment_scripts/puppet/manifests/site-controller-post.pp b/deployment_scripts/puppet/manifests/site-controller-post.pp index 9da1d27..6162daf 100644 --- a/deployment_scripts/puppet/manifests/site-controller-post.pp +++ b/deployment_scripts/puppet/manifests/site-controller-post.pp @@ -1,2 +1 @@ -$fuel_settings = parseyaml($astute_settings_yaml) class {'vxlan::controller':} diff --git a/deployment_scripts/puppet/modules/vxlan/manifests/compute.pp b/deployment_scripts/puppet/modules/vxlan/manifests/compute.pp index d5217a7..c50ed26 100644 --- a/deployment_scripts/puppet/modules/vxlan/manifests/compute.pp +++ b/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, } diff --git a/deployment_scripts/puppet/modules/vxlan/manifests/controller.pp b/deployment_scripts/puppet/modules/vxlan/manifests/controller.pp index 006a98f..2daf938 100644 --- a/deployment_scripts/puppet/modules/vxlan/manifests/controller.pp +++ b/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'; diff --git a/deployment_scripts/puppet/modules/vxlan/manifests/neutron_services.pp b/deployment_scripts/puppet/modules/vxlan/manifests/neutron_services.pp index dc5cdf5..365c6e0 100644 --- a/deployment_scripts/puppet/modules/vxlan/manifests/neutron_services.pp +++ b/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') { - - 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 { +include vxlan::params neutron_plugin_ml2 { 'agent/tunnel_types': value => 'vxlan'; - }-> - exec { "neutron-pluign-openvswitch-agent_restart": - command => "/usr/sbin/crm resource restart p_neutron-plugin-openvswitch-agent", + } ~> Service['neutron-server'] + -> + 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", } - - - } } diff --git a/deployment_scripts/puppet/modules/vxlan/manifests/params.pp b/deployment_scripts/puppet/modules/vxlan/manifests/params.pp index 6e289e7..bb8177c 100644 --- a/deployment_scripts/puppet/modules/vxlan/manifests/params.pp +++ b/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") + } } diff --git a/metadata.yaml b/metadata.yaml index 082aab1..92e041b 100644 --- a/metadata.yaml +++ b/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' diff --git a/tasks.yaml b/tasks.yaml index 46d1fcd..a2400f4 100644 --- a/tasks.yaml +++ b/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