Fuel 9.0 support
Change-Id: Ice0ed3888328448a38cd10d56fd7780f61654b23
This commit is contained in:
Jerry Zhao
parent
aad03dd17d
commit
5bb205c1b7
|
|
@ -0,0 +1,5 @@
|
|||
[gerrit]
|
||||
host=review.openstack.org
|
||||
port=29418
|
||||
project=openstack/fuel-plugin-fortinet.git
|
||||
defaultbranch=master
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
fuel-plugin-fortinet
|
||||
============
|
||||
|
||||
Plugin description
|
||||
Fuel plugin to deploy Fortinet FortiGate ML2 plugin. This Fuel plugins works
|
||||
on Fuel 9.0 for OpenStack Mitaka version.
|
||||
For liberty version, please use stable/8.0 branch to work with Fuel 8.0.
|
||||
|
|
|
|||
|
|
@ -42,8 +42,10 @@ class neutron::configure_fortigate_ml2 {
|
|||
# require => Exec['upgrade pip'],
|
||||
# }
|
||||
|
||||
# SSL23_GET_SERVER_HELLO: unknown protocol error when use default eventlet
|
||||
# on ubuntu, have to reinstall eventlet to work.
|
||||
exec { 'upgrade eventlet':
|
||||
command => 'pip install -U eventlet',
|
||||
command => 'pip install -I --force-reinstall eventlet==0.18.4',
|
||||
path => '/usr/local/bin/:/usr/bin/:/bin',
|
||||
require => Exec['upgrade pip']
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
class neutron::params::openstack {
|
||||
$fgt_hash = hiera('fuel-plugin-fortinet')
|
||||
|
||||
$networking_fortinet_version = '1.1.4'
|
||||
$networking_fortinet_version = '2.0.0.0b1'
|
||||
|
||||
if($::osfamily == 'Redhat') {
|
||||
$fwaas_package = 'python-neutron-fwaas'
|
||||
|
|
|
|||
|
|
@ -4,16 +4,9 @@
|
|||
- id: configure-fortigate-ml2
|
||||
type: puppet
|
||||
role: [controller, primary-controller]
|
||||
requires: [post_deployment_start]
|
||||
version: 2.0.0 # tasks v2.0.0 is supporting task-based deployment
|
||||
required_for: [configure-fortigate-fwaas]
|
||||
|
||||
|
||||
# version: 2.0.0 # tasks v2.0.0 is supporting task-based deployment
|
||||
# cross-depends:
|
||||
# - name: deploy_start
|
||||
# cross-depended-by:
|
||||
# - name: deploy_end
|
||||
|
||||
requires: [post_deployment_start]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure-fortigate-ml2.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
|
|
@ -22,8 +15,9 @@
|
|||
- id: configure-fortigate-fwaas
|
||||
type: puppet
|
||||
role: [controller, primary-controller]
|
||||
requires: [configure-fortigate-ml2]
|
||||
version: 2.0.0 # tasks v2.0.0 is supporting task-based deployment
|
||||
required_for: [post_deployment_end]
|
||||
requires: [configure-fortigate-ml2]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
|
|
@ -32,57 +26,42 @@
|
|||
- id: configure-fortigate-nova
|
||||
type: puppet
|
||||
role: ['compute']
|
||||
requires: [post_deployment_start]
|
||||
version: 2.0.0 # tasks v2.0.0 is supporting task-based deployment
|
||||
required_for: [post_deployment_end]
|
||||
requires: [post_deployment_start]
|
||||
parameters:
|
||||
puppet_manifest: puppet/manifests/configure-fortigate-nova.pp
|
||||
puppet_modules: puppet/modules:/etc/puppet/modules
|
||||
timeout: 360
|
||||
|
||||
#- id: fuel-plugin-fortinet-post-deployment-sh
|
||||
# version: 2.0.0
|
||||
# type: shell
|
||||
# role: [fuel-plugin-fortinet_role]
|
||||
# requires: [post_deployment_start]
|
||||
# required_for: [post_deployment_end]
|
||||
# parameters:
|
||||
# cmd: echo post_deployment_task_executed > /tmp/post_deployment
|
||||
# retries: 3
|
||||
# interval: 20
|
||||
# timeout: 180
|
||||
|
||||
#- id: fuel-plugin-fortinet-pre-deployment-sh
|
||||
# version: 2.0.0
|
||||
# type: shell
|
||||
# role: [fuel-plugin-fortinet_role]
|
||||
# requires: [pre_deployment_start]
|
||||
# required_for: [pre_deployment_end]
|
||||
# parameters:
|
||||
# cmd: echo pre_deployment_task_executed > /tmp/pre_deployment
|
||||
# retries: 3
|
||||
# interval: 20
|
||||
# timeout: 180
|
||||
|
||||
- id: primary-openstack-network-agents-l3
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: openstack-network-agents-l3
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: primary-openstack-network-agents-dhcp
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: openstack-network-agents-dhcp
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: openstack-network-agents-metadata
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: primary-openstack-network-agents-metadata
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: openstack-network-networks
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
||||
- id: openstack-network-routers
|
||||
role: [controller, primary-controller]
|
||||
type: skipped
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ Installation Guide
|
|||
How to install Fuel Master
|
||||
--------------------------
|
||||
|
||||
Please refer to `Mirantis official documentation for Fuel 8.0 <https://docs.mirantis.com/openstack/fuel/fuel-8.0/pdfs.html>`_ for the installation of Fuel master node or `this quickstart guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/quickstart-guide.html#installing-mirantis-openstack-manually>`_ to setup a demo environment.
|
||||
Please refer to `Mirantis official documentation for Fuel 9.0 <https://docs.mirantis.com/openstack/fuel/fuel-9.0/pdfs.html>`_ for the installation of Fuel master node or `this quickstart guide <https://docs.mirantis.com/openstack/fuel/fuel-9.0/quickstart-guide.html#installing-mirantis-openstack-manually>`_ to setup a demo environment.
|
||||
|
||||
How to install the plugin
|
||||
-------------------------
|
||||
|
|
@ -12,7 +12,7 @@ How to install the plugin
|
|||
#. Build the fuel plugin on Fuel Master.
|
||||
|
||||
.. code:: bash
|
||||
git clone https://github.com/jerryz1982/fuel-plugin-fortinet.git
|
||||
git clone https://github.com/openstack/fuel-plugin-fortinet.git
|
||||
cd fuel-plugin-fortinet
|
||||
fpb --build ./
|
||||
|
||||
|
|
@ -28,4 +28,4 @@ How to install the plugin
|
|||
[root@fuel ~]# fuel plugins
|
||||
id | name | version | package_version
|
||||
---|----------------------|---------|----------------
|
||||
1 | fuel-plugin-fortinet | 1.0.0 | 4.0.0
|
||||
1 | fuel-plugin-fortinet | 2.0.0 | 5.0.0
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ attributes:
|
|||
fortigate_external_port:
|
||||
value: ""
|
||||
label: "Enter the physical port on FortiGate for external network"
|
||||
descrption: "Enter the physical port on FortiGate for external network"
|
||||
description: "Enter the physical port on FortiGate for external network"
|
||||
weight: 30
|
||||
type: "text"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ name: fuel-plugin-fortinet
|
|||
# Human-readable name for your plugin
|
||||
title: Fuel plugin to deploy FortiGate ML2 plugin on OpenStack
|
||||
# Plugin version
|
||||
version: '1.0.0'
|
||||
version: '2.0.0'
|
||||
# Description
|
||||
description: Use FortiGate as network node for OpenStack
|
||||
# Required fuel version
|
||||
fuel_version: ['8.0']
|
||||
fuel_version: ['9.0']
|
||||
# Specify license of your plugin
|
||||
licenses: ['Apache License Version 2.0']
|
||||
# Specify author or company name
|
||||
|
|
@ -25,14 +25,14 @@ is_hotpluggable: false
|
|||
# The plugin is compatible with releases in the list
|
||||
releases:
|
||||
- os: ubuntu
|
||||
version: liberty-8.0
|
||||
version: mitaka-9.0
|
||||
mode: ['ha', 'multinode']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/ubuntu
|
||||
- os: centos
|
||||
version: liberty-8.0
|
||||
version: mitaka-9.0
|
||||
mode: ['ha', 'multinode']
|
||||
deployment_scripts_path: deployment_scripts/
|
||||
repository_path: repositories/centos
|
||||
# Version of plugin package
|
||||
package_version: '4.0.0'
|
||||
package_version: '5.0.0'
|
||||
|
|
|
|||
26
tasks.yaml
26
tasks.yaml
|
|
@ -1,26 +0,0 @@
|
|||
# WARNING: `tasks.yaml` will be deprecated in further releases.
|
||||
# Please, use `deployment_tasks.yaml` to describe tasks istead.
|
||||
|
||||
# This tasks will be applied on controller nodes,
|
||||
# here you can also specify several roles, for example
|
||||
# ['cinder', 'compute'] will be applied only on
|
||||
# cinder and compute nodes
|
||||
- role: ['controller']
|
||||
stage: post_deployment
|
||||
type: shell
|
||||
parameters:
|
||||
cmd: bash deploy.sh
|
||||
timeout: 42
|
||||
# Task is applied for all roles
|
||||
- role: '*'
|
||||
stage: pre_deployment
|
||||
type: shell
|
||||
parameters:
|
||||
cmd: echo all > /tmp/plugin.all
|
||||
timeout: 42
|
||||
# "reboot" task reboots the nodes and waits until they get back online
|
||||
# - role: '*'
|
||||
# stage: pre_deployment
|
||||
# type: reboot
|
||||
# parameters:
|
||||
# timeout: 600
|
||||
Loading…
Reference in New Issue