Update plugin to support Fuel 8.0

- Plugin now supports Fuel 7.0 and 8.0
- Move tasks.yaml to deployment_tasks.yaml
- Update docs
- Plugin version bump to 1.2.0
- Package version bump to 3.0.0

Change-Id: I2cdbbdc59b33257113b23eb6ae1e587efe2acfdc
This commit is contained in:
Jerzy Mikolajczak 2016-02-05 11:13:24 +01:00
parent 57c8d92cdf
commit 17672aa712
7 changed files with 30 additions and 22 deletions

View File

@ -4,12 +4,12 @@ FWaaS plugin
FWaaS (Firewall-as-a-Service) is a Neutron extension that introduces Firewall feature set.
This repo contains all necessary files to build FWaaS Fuel plugin.
Supported Fuel version is 7.0.
Supported Fuel version is 7.0 and 8.0.
Building the plugin
-------------------
1. Clone the FWaaS plugin repo from `https://github.com/stackforge/fuel-plugin-neutron-fwaas`.
1. Clone the FWaaS plugin repo from `https://github.com/openstack/fuel-plugin-neutron-fwaas`.
2. Install Fuel Plugin Builder:
``pip install fuel-plugin-builder``
@ -50,4 +50,4 @@ Firewall settings can be found on the Openstack Dashboard (Horizon) in
Project -> Network -> Firewall.
Please use official Openstack documentation to obtain more information:
- http://docs.openstack.org/admin-guide-cloud/content/install_neutron-fwaas-agent.html
- http://docs.openstack.org/admin-guide-cloud/networking_introduction.html#firewall-as-a-service-fwaas-overview

View File

@ -6,7 +6,7 @@
2. [Module Description - What the module does and why it is useful](#module-description)
3. [Setup - The basics of getting started with FWaaS](#setup)
* [What FWaaS affects](#what-fwaas-affects)
* [Beginning with VPNaaS](#beginning-with-fwaas)
* [Beginning with FWaaS](#beginning-with-fwaas)
4. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
5. [Limitations - OS compatibility, etc.](#limitations)
@ -27,7 +27,7 @@ It supports one firewall policy and logical firewall instance per project.
* During installation manifests add a couple options in neutron.conf and enable FWaaS tab in Horizon.
### Beginning with VPNaaS
### Beginning with FWaaS
How to use FWaaS you can find here:
http://docs.openstack.org/api/openstack-network/2.0/content/fwaas_ext.html
@ -41,4 +41,4 @@ with things. (We are working on automating this section!)
## Limitations
This plugin supports only the following OS: CentOS 6.4 and Ubuntu 12.04.
This plugin supports only the following OS: Ubuntu 14.04.

View File

@ -1,6 +1,8 @@
- role: ['controller','primary-controller']
stage: post_deployment
- id: neutron-fwaas
type: puppet
role: ['controller','primary-controller']
requires: [post_deployment_start]
required_for: [post_deployment_end]
parameters:
puppet_manifest: puppet/manifests/site.pp
puppet_modules: puppet/modules:/etc/puppet/modules

View File

@ -47,16 +47,16 @@ master_doc = 'index'
# General information about the project.
project = u'The FWaaS plugin for Fuel'
copyright = u'2015, Mirantis Inc.'
copyright = u'2016, Mirantis Inc.'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '1.1-1.1.0-1'
version = '1.2-1.2.0-1'
# The full version, including alpha/beta/rc tags.
release = '1.1-1.1.0-1'
release = '1.2-1.2.0-1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@ -233,7 +233,7 @@ latex_elements = { 'classoptions': ',openany,oneside', 'babel' : '\\usepackage[e
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'fuel-plugin-fwaas', u'Guide to the FWaaS Plugin ver. 1.1-1.1.0-1 for Fuel',
('index', 'fuel-plugin-fwaas', u'Guide to the FWaaS Plugin ver. 1.2-1.2.0-1 for Fuel',
[u'Mirantis Inc.'], 1)
]
@ -276,7 +276,7 @@ pdf_inline_footnotes = True
epub_title = u'The FWaaS Plugin for Fuel'
epub_author = u'Mirantis Inc.'
epub_publisher = u'Mirantis Inc.'
epub_copyright = u'2015, Mirantis Inc.'
epub_copyright = u'2016, Mirantis Inc.'
# The basename for the epub file. It defaults to the project name.
#epub_basename = u'fuel-plugin-openbook'

View File

@ -11,19 +11,19 @@ Installing FWaaS plugin
#. Copy the plug­in on already installed Fuel Master node::
[user@home ~]$ scp fwaas-plugin-1.1-1.1.0-1.noarch.rpm root@:/
[user@home ~]$ scp fwaas-plugin-1.2-1.2.0-1.noarch.rpm root@:/
<the_Fuel_Master_node_IP>:~/
#. Log into the Fuel Master node. Install the plugin::
[root@fuel ~]# fuel plugins --install fwaas-plugin-1.1-1.1.0-1.noarch.rpm
[root@fuel ~]# fuel plugins --install fwaas-plugin-1.2-1.2.0-1.noarch.rpm
#. Verify that the plugin is installed correctly::
[root@fuel ~]# fuel plugins --list
id | name | version | package_version
---|--------------|---------|----------------
1 | fwaas_plugin | 1.1.0 | 2.0.0
1 | fwaas_plugin | 1.2.0 | 3.0.0
Creating Environment with FWaaS

View File

@ -44,8 +44,10 @@ Requirements
| Requirement | Version/Comment |
+============================+================================================+
| Fuel | 7.0 release with Maintenance Update 2 |
| | 8.0 release |
+----------------------------+------------------------------------------------+
| OpenStack compatibility | 2015.1 Kilo with Maintenance Update 2 |
| | liberty-8.0 |
+----------------------------+------------------------------------------------+
| Operating systems | Ubuntu 14.04 LTS |
+----------------------------+------------------------------------------------+
@ -72,4 +74,3 @@ If your environment doesn't contain MU-2, please apply it:
.. target-notes::
.. _[FWaaS] Error firewall state after updating policy or rule: https://bugs.launchpad.net/mos/7.0.x/+bug/1510576
.. _How to apply Mirantis OpenStack 7.0 Maintenance Update: https://docs.mirantis.com/openstack/fuel/fuel-7.0/maintenance-updates.html

View File

@ -3,27 +3,32 @@ name: fwaas-plugin
# Human-readable name for your plugin
title: FWaaS plugin for Neutron
# Plugin version
version: 1.1.0
version: 1.2.0
# Description
description: Neutron extension that introduces FireWall feature set
# Required fuel version
fuel_version: ['7.0']
fuel_version: ['7.0','8.0']
# Specify license of your plugin
licenses: ['Apache License Version 2.0']
# Specify author or company name
authors: ['Andrey Epifanov, Sergey Kolekonov']
# A link to the plugin's page
homepage: 'https://github.com/stackforge/fuel-plugin-neutron-fwaas'
homepage: 'https://github.com/openstack/fuel-plugin-neutron-fwaas'
# Groups
groups: ['network']
# The plugin is compatible with releases in the list
releases:
- os: ubuntu
version: 2015.1-7.0
version: 2015.1.0-7.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
- os: ubuntu
version: liberty-8.0
mode: ['ha']
deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu
# Version of plugin package
package_version: '2.0.0'
package_version: '3.0.0'