Browse Source

Fuel 9.0 support

Change-Id: Ice0ed3888328448a38cd10d56fd7780f61654b23
Jerry Zhao 1 year ago
parent
commit
5bb205c1b7

+ 5
- 0
.gitreview View File

@@ -0,0 +1,5 @@
1
+[gerrit]
2
+host=review.openstack.org
3
+port=29418
4
+project=openstack/fuel-plugin-fortinet.git
5
+defaultbranch=master

+ 3
- 1
README.md View File

@@ -1,4 +1,6 @@
1 1
 fuel-plugin-fortinet
2 2
 ============
3 3
 
4
-Plugin description
4
+Fuel plugin to deploy Fortinet FortiGate ML2 plugin. This Fuel plugins works
5
+on Fuel 9.0 for OpenStack Mitaka version.
6
+For liberty version, please use stable/8.0 branch to work with Fuel 8.0.

+ 3
- 1
deployment_scripts/puppet/modules/neutron/manifests/configure_fortigate_ml2.pp View File

@@ -42,8 +42,10 @@ class neutron::configure_fortigate_ml2 {
42 42
 #    require  => Exec['upgrade pip'],
43 43
 #  }
44 44
 
45
+# SSL23_GET_SERVER_HELLO: unknown protocol error when use default eventlet
46
+# on ubuntu, have to reinstall eventlet to work.
45 47
   exec { 'upgrade eventlet':
46
-    command => 'pip install -U eventlet',
48
+    command => 'pip install -I --force-reinstall eventlet==0.18.4',
47 49
     path    => '/usr/local/bin/:/usr/bin/:/bin',
48 50
     require => Exec['upgrade pip']
49 51
   }

+ 1
- 1
deployment_scripts/puppet/modules/neutron/manifests/params/openstack.pp View File

@@ -17,7 +17,7 @@
17 17
 class neutron::params::openstack {
18 18
   $fgt_hash                    = hiera('fuel-plugin-fortinet')
19 19
 
20
-  $networking_fortinet_version = '1.1.4'
20
+  $networking_fortinet_version = '2.0.0.0b1'
21 21
 
22 22
   if($::osfamily == 'Redhat') {
23 23
     $fwaas_package      = 'python-neutron-fwaas'

+ 14
- 35
deployment_tasks.yaml View File

@@ -4,16 +4,9 @@
4 4
 - id: configure-fortigate-ml2
5 5
   type: puppet
6 6
   role: [controller, primary-controller]
7
-  requires: [post_deployment_start]
7
+  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
8 8
   required_for: [configure-fortigate-fwaas]
9
-
10
-
11
-#  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
12
-#   cross-depends:
13
-#     - name: deploy_start
14
-#   cross-depended-by:
15
-#     - name: deploy_end
16
-
9
+  requires: [post_deployment_start]
17 10
   parameters:
18 11
     puppet_manifest: puppet/manifests/configure-fortigate-ml2.pp
19 12
     puppet_modules: puppet/modules:/etc/puppet/modules
@@ -22,8 +15,9 @@
22 15
 - id: configure-fortigate-fwaas
23 16
   type: puppet
24 17
   role: [controller, primary-controller]
25
-  requires: [configure-fortigate-ml2]
18
+  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
26 19
   required_for: [post_deployment_end]
20
+  requires: [configure-fortigate-ml2]
27 21
   parameters:
28 22
     puppet_manifest: puppet/manifests/configure-fortigate-fwaas.pp
29 23
     puppet_modules: puppet/modules:/etc/puppet/modules
@@ -32,57 +26,42 @@
32 26
 - id: configure-fortigate-nova
33 27
   type: puppet
34 28
   role: ['compute']
35
-  requires: [post_deployment_start]
29
+  version: 2.0.0              # tasks v2.0.0 is supporting task-based deployment
36 30
   required_for: [post_deployment_end]
31
+  requires: [post_deployment_start]
37 32
   parameters:
38 33
     puppet_manifest: puppet/manifests/configure-fortigate-nova.pp
39 34
     puppet_modules: puppet/modules:/etc/puppet/modules
40 35
     timeout: 360
41 36
 
42
-#- id: fuel-plugin-fortinet-post-deployment-sh
43
-#  version: 2.0.0
44
-#  type: shell
45
-#  role: [fuel-plugin-fortinet_role]
46
-#  requires: [post_deployment_start]
47
-#  required_for: [post_deployment_end]
48
-#  parameters:
49
-#    cmd: echo post_deployment_task_executed > /tmp/post_deployment
50
-#    retries: 3
51
-#    interval: 20
52
-#    timeout: 180
53
-
54
-#- id: fuel-plugin-fortinet-pre-deployment-sh
55
-#  version: 2.0.0
56
-#  type: shell
57
-#  role: [fuel-plugin-fortinet_role]
58
-#  requires: [pre_deployment_start]
59
-#  required_for: [pre_deployment_end]
60
-#  parameters:
61
-#    cmd: echo pre_deployment_task_executed > /tmp/pre_deployment
62
-#    retries: 3
63
-#    interval: 20
64
-#    timeout: 180
65
-
66 37
 - id: primary-openstack-network-agents-l3
38
+  role: [controller, primary-controller]
67 39
   type: skipped
68 40
 
69 41
 - id: openstack-network-agents-l3
42
+  role: [controller, primary-controller]
70 43
   type: skipped
71 44
 
72 45
 - id: primary-openstack-network-agents-dhcp
46
+  role: [controller, primary-controller]
73 47
   type: skipped
74 48
 
75 49
 - id: openstack-network-agents-dhcp
50
+  role: [controller, primary-controller]
76 51
   type: skipped
77 52
 
78 53
 - id: openstack-network-agents-metadata
54
+  role: [controller, primary-controller]
79 55
   type: skipped
80 56
 
81 57
 - id: primary-openstack-network-agents-metadata
58
+  role: [controller, primary-controller]
82 59
   type: skipped
83 60
 
84 61
 - id: openstack-network-networks
62
+  role: [controller, primary-controller]
85 63
   type: skipped
86 64
 
87 65
 - id: openstack-network-routers
66
+  role: [controller, primary-controller]
88 67
   type: skipped

+ 3
- 3
doc/source/installation.rst View File

@@ -4,7 +4,7 @@ Installation Guide
4 4
 How to install Fuel Master
5 5
 --------------------------
6 6
 
7
-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.
7
+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.
8 8
 
9 9
 How to install the plugin
10 10
 -------------------------
@@ -12,7 +12,7 @@ How to install the plugin
12 12
 #. Build the fuel plugin on Fuel Master.
13 13
 
14 14
    .. code:: bash
15
-       git clone https://github.com/jerryz1982/fuel-plugin-fortinet.git
15
+       git clone https://github.com/openstack/fuel-plugin-fortinet.git
16 16
        cd fuel-plugin-fortinet
17 17
        fpb --build ./
18 18
        
@@ -28,4 +28,4 @@ How to install the plugin
28 28
        [root@fuel ~]# fuel plugins
29 29
        id | name                 | version | package_version
30 30
        ---|----------------------|---------|----------------
31
-       1  | fuel-plugin-fortinet | 1.0.0   | 4.0.0         
31
+       1  | fuel-plugin-fortinet | 2.0.0   | 5.0.0         

+ 1
- 1
environment_config.yaml View File

@@ -65,7 +65,7 @@ attributes:
65 65
   fortigate_external_port:
66 66
     value: ""
67 67
     label: "Enter the physical port on FortiGate for external network"
68
-    descrption: "Enter the physical port on FortiGate for external network"
68
+    description: "Enter the physical port on FortiGate for external network"
69 69
     weight: 30
70 70
     type: "text"
71 71
 

+ 5
- 5
metadata.yaml View File

@@ -3,11 +3,11 @@ name: fuel-plugin-fortinet
3 3
 # Human-readable name for your plugin
4 4
 title: Fuel plugin to deploy FortiGate ML2 plugin on OpenStack
5 5
 # Plugin version
6
-version: '1.0.0'
6
+version: '2.0.0'
7 7
 # Description
8 8
 description: Use FortiGate as network node for OpenStack
9 9
 # Required fuel version
10
-fuel_version: ['8.0']
10
+fuel_version: ['9.0']
11 11
 # Specify license of your plugin
12 12
 licenses: ['Apache License Version 2.0']
13 13
 # Specify author or company name
@@ -25,14 +25,14 @@ is_hotpluggable: false
25 25
 # The plugin is compatible with releases in the list
26 26
 releases:
27 27
   - os: ubuntu
28
-    version: liberty-8.0
28
+    version: mitaka-9.0
29 29
     mode: ['ha', 'multinode']
30 30
     deployment_scripts_path: deployment_scripts/
31 31
     repository_path: repositories/ubuntu
32 32
   - os: centos
33
-    version: liberty-8.0
33
+    version: mitaka-9.0
34 34
     mode: ['ha', 'multinode']
35 35
     deployment_scripts_path: deployment_scripts/
36 36
     repository_path: repositories/centos
37 37
 # Version of plugin package
38
-package_version: '4.0.0'
38
+package_version: '5.0.0'

+ 0
- 26
tasks.yaml View File

@@ -1,26 +0,0 @@
1
-# WARNING: `tasks.yaml` will be deprecated in further releases.
2
-# Please, use `deployment_tasks.yaml` to describe tasks istead.
3
-
4
-# This tasks will be applied on controller nodes,
5
-# here you can also specify several roles, for example
6
-# ['cinder', 'compute'] will be applied only on
7
-# cinder and compute nodes
8
-- role: ['controller']
9
-  stage: post_deployment
10
-  type: shell
11
-  parameters:
12
-    cmd: bash deploy.sh
13
-    timeout: 42
14
-# Task is applied for all roles
15
-- role: '*'
16
-  stage: pre_deployment
17
-  type: shell
18
-  parameters:
19
-    cmd: echo all > /tmp/plugin.all
20
-    timeout: 42
21
-# "reboot" task reboots the nodes and waits until they get back online
22
-# - role: '*'
23
-#   stage: pre_deployment
24
-#   type: reboot
25
-#   parameters:
26
-#     timeout: 600

Loading…
Cancel
Save