Browse Source

Adding support for Fuel 9 deployment over Ethernet

With SR-IOV and iSER over Cinder

Change-Id: Ic8456cd73e57e74c372ba751f061e9849a65fffc
tags/fuel8_cx5
Aviram Bar-Haim 2 years ago
parent
commit
e007626f1f

+ 5
- 0
deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp View File

@@ -12,6 +12,11 @@ class mellanox_openstack::cinder_iser (
12 12
   cinder_config { 'DEFAULT/iscsi_ip_address' :
13 13
     value => "$iser_ip_address"
14 14
   }
15
+
16
+  cinder_config { 'LVM-backend/iscsi_protocol' :
17
+    value => 'iser'
18
+  }
19
+
15 20
   service { $cinder::params::volume_service :
16 21
     ensure    => running,
17 22
     subscribe => [Cinder_config['DEFAULT/iscsi_protocol'],

+ 5
- 5
deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp View File

@@ -14,15 +14,15 @@ class mellanox_openstack::params {
14 14
       $libvirt_driver_file      = '/usr/lib/python2.6/site-packages/nova/virt/libvirt/driver.py'
15 15
     }
16 16
     'Debian': {
17
-      $neutron_mlnx_packages_compute    = ['neutron-plugin-mlnx','neutron-plugin-mlnx-agent', 'python-networking-mlnx']
17
+      $neutron_mlnx_packages_compute    = ['neutron-plugin-mlnx','neutron-mlnx-agent', 'python-networking-mlnx']
18 18
       $neutron_mlnx_packages_controller = ['python-networking-mlnx']
19
-      $agent_service                    = ['neutron-plugin-mlnx-agent']
20
-      $sriov_agent_service_name         = 'neutron-plugin-sriov-agent'
21
-      $sriov_agent_package_name         = 'neutron-plugin-sriov-agent'
19
+      $agent_service                    = ['neutron-mlnx-agent']
20
+      $sriov_agent_service_name         = 'neutron-sriov-agent'
21
+      $sriov_agent_package_name         = 'neutron-sriov-agent'
22 22
       $compute_service_name             = 'nova-compute'
23 23
       $openvswitch_mgmt_service         = 'openvswitch-switch'
24 24
       $libvirt_driver_file              = '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py'
25
-      $mlnx_agent_init_file             = '/etc/init/neutron-plugin-mlnx-agent.conf'
25
+      $mlnx_agent_init_file             = '/etc/init/neutron-mlnx-agent.conf'
26 26
     }
27 27
   }
28 28
 

+ 8
- 2
metadata.yaml View File

@@ -5,13 +5,13 @@ name: mellanox-plugin
5 5
 title: Mellanox ConnectX-4 Openstack Features
6 6
 
7 7
 # Plugin version
8
-version: 3.2.1
8
+version: 3.3.0
9 9
 
10 10
 # Description
11 11
 description: Enable features over Mellanox ConnectX-4 Adapters
12 12
 
13 13
 # Required fuel version
14
-fuel_version: ['8.0']
14
+fuel_version: ['8.0','9.0']
15 15
 
16 16
 # Specify license of your plugin
17 17
 licenses: ['Apache License Version 2.0']
@@ -32,6 +32,12 @@ releases:
32 32
     mode: ['ha']
33 33
     deployment_scripts_path: deployment_scripts/
34 34
     repository_path: repositories/ubuntu
35
+  - os: ubuntu
36
+    version: mitaka-9.0
37
+    mode: ['ha']
38
+    deployment_scripts_path: deployment_scripts/
39
+    repository_path: repositories/ubuntu
40
+
35 41
 
36 42
 # Version of plugin package
37 43
 package_version: '3.0.0'

+ 1
- 1
scripts/common View File

@@ -1,6 +1,6 @@
1 1
 MELLANOX_PLUGIN_NAME="mellanox-plugin-*"
2 2
 PLUGIN_SCRIPTS_DIR=`echo /var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/`
3
-FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap/"
3
+FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap*/"
4 4
 ORIG_BOOTSTRAP_VERSION_FILE="/opt/orig_bootstrap.txt"
5 5
 BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml"
6 6
 ORIG_BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml.orig"

Loading…
Cancel
Save