summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-15 14:19:35 +0000
committerGerrit Code Review <review@openstack.org>2017-02-15 14:19:35 +0000
commitc86447737214022194f1ed988dacfee8db6d1411 (patch)
tree33f692ad18dbaadda39d14b1a64ae62efd5405e2
parent244325118c336be72df8bbd47cb3302aafe8d319 (diff)
parente007626f1f4c9df3e84af793766ebe2a59d3cb1e (diff)
Merge "Adding support for Fuel 9 deployment over Ethernet"
-rw-r--r--deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp5
-rw-r--r--deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp10
-rw-r--r--metadata.yaml10
-rw-r--r--scripts/common2
4 files changed, 19 insertions, 8 deletions
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
index 6df1198..8fe6b28 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/cinder_iser.pp
@@ -12,6 +12,11 @@ class mellanox_openstack::cinder_iser (
12 cinder_config { 'DEFAULT/iscsi_ip_address' : 12 cinder_config { 'DEFAULT/iscsi_ip_address' :
13 value => "$iser_ip_address" 13 value => "$iser_ip_address"
14 } 14 }
15
16 cinder_config { 'LVM-backend/iscsi_protocol' :
17 value => 'iser'
18 }
19
15 service { $cinder::params::volume_service : 20 service { $cinder::params::volume_service :
16 ensure => running, 21 ensure => running,
17 subscribe => [Cinder_config['DEFAULT/iscsi_protocol'], 22 subscribe => [Cinder_config['DEFAULT/iscsi_protocol'],
diff --git a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
index 5dc3fab..95b888e 100644
--- a/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/mellanox_openstack/manifests/params.pp
@@ -14,15 +14,15 @@ class mellanox_openstack::params {
14 $libvirt_driver_file = '/usr/lib/python2.6/site-packages/nova/virt/libvirt/driver.py' 14 $libvirt_driver_file = '/usr/lib/python2.6/site-packages/nova/virt/libvirt/driver.py'
15 } 15 }
16 'Debian': { 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 $neutron_mlnx_packages_controller = ['python-networking-mlnx'] 18 $neutron_mlnx_packages_controller = ['python-networking-mlnx']
19 $agent_service = ['neutron-plugin-mlnx-agent'] 19 $agent_service = ['neutron-mlnx-agent']
20 $sriov_agent_service_name = 'neutron-plugin-sriov-agent' 20 $sriov_agent_service_name = 'neutron-sriov-agent'
21 $sriov_agent_package_name = 'neutron-plugin-sriov-agent' 21 $sriov_agent_package_name = 'neutron-sriov-agent'
22 $compute_service_name = 'nova-compute' 22 $compute_service_name = 'nova-compute'
23 $openvswitch_mgmt_service = 'openvswitch-switch' 23 $openvswitch_mgmt_service = 'openvswitch-switch'
24 $libvirt_driver_file = '/usr/lib/python2.7/dist-packages/nova/virt/libvirt/driver.py' 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
diff --git a/metadata.yaml b/metadata.yaml
index 85f425b..e7ffd21 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -5,13 +5,13 @@ name: mellanox-plugin
5title: Mellanox ConnectX-4 Openstack Features 5title: Mellanox ConnectX-4 Openstack Features
6 6
7# Plugin version 7# Plugin version
8version: 3.2.1 8version: 3.3.0
9 9
10# Description 10# Description
11description: Enable features over Mellanox ConnectX-4 Adapters 11description: Enable features over Mellanox ConnectX-4 Adapters
12 12
13# Required fuel version 13# Required fuel version
14fuel_version: ['8.0'] 14fuel_version: ['8.0','9.0']
15 15
16# Specify license of your plugin 16# Specify license of your plugin
17licenses: ['Apache License Version 2.0'] 17licenses: ['Apache License Version 2.0']
@@ -32,6 +32,12 @@ releases:
32 mode: ['ha'] 32 mode: ['ha']
33 deployment_scripts_path: deployment_scripts/ 33 deployment_scripts_path: deployment_scripts/
34 repository_path: repositories/ubuntu 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# Version of plugin package 42# Version of plugin package
37package_version: '3.0.0' 43package_version: '3.0.0'
diff --git a/scripts/common b/scripts/common
index 82bc4cd..e2cf130 100644
--- a/scripts/common
+++ b/scripts/common
@@ -1,6 +1,6 @@
1MELLANOX_PLUGIN_NAME="mellanox-plugin-*" 1MELLANOX_PLUGIN_NAME="mellanox-plugin-*"
2PLUGIN_SCRIPTS_DIR=`echo /var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/` 2PLUGIN_SCRIPTS_DIR=`echo /var/www/nailgun/plugins/$MELLANOX_PLUGIN_NAME/scripts/`
3FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap/" 3FUEL_BOOTSTRAP_DIR="/var/www/nailgun/bootstrap*/"
4ORIG_BOOTSTRAP_VERSION_FILE="/opt/orig_bootstrap.txt" 4ORIG_BOOTSTRAP_VERSION_FILE="/opt/orig_bootstrap.txt"
5BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml" 5BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml"
6ORIG_BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml.orig" 6ORIG_BOOTSTRAP_CLI_YAML="/etc/fuel-bootstrap-cli/fuel_bootstrap_cli.yaml.orig"