x
/
fuel-plugin-networking-sfc
Code Issues Proposed changes

Backport for Fuel 10.0 

Change-Id: I54bc081979d7b425667c9cbb3430e4fb5dd52f82
This commit is contained in:
Maciej Relewicz 2016-07-01 15:03:00 +02:00
parent b1f668cb2d
commit c73e535747
5 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -62,7 +62,8 @@ Networking SFC plugin configuration
1. Create an environment. 1. Create an environment.
2. Enable L2 Population in network tab. 2. Enable L2 Population in network tab.
3. Enable the plugin on the Settings tab of the Fuel web UI. 3. Enable the plugin on the Settings tab of the Fuel web UI.
4. Deploy the environment. 4. In tab 'Settings', in section 'General' -> 'Provision' -> 'Initial packages' please change the name of the installed kernel stack from trusty to xenial. For both packages, from linux-headers-generic-lts-trusty and linux-image-generic-lts-trusty to linux-headers-generic-lts-xenial and linux-image-generic-lts-xenial.
5. Deploy the environment.
Known issues Known issues
------------ ------------

5
deployment_scripts/puppet/manifests/networking-sfc-compute.pp
View File

@ -13,9 +13,6 @@
# under the License. # under the License.
notice('MODULAR: networking-sfc/networking-sfc-compute.pp') notice('MODULAR: networking-sfc/networking-sfc-compute.pp')
$use_neutron = hiera('use_neutron', false)
if $use_neutron {
include ::neutron::params include ::neutron::params
$neutron_config = hiera_hash('neutron_config') $neutron_config = hiera_hash('neutron_config')
@ -48,5 +45,3 @@ if $use_neutron {
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
neutron_config { 'sfc/drivers': value => 'ovs' } neutron_config { 'sfc/drivers': value => 'ovs' }
}

5
deployment_scripts/puppet/manifests/networking-sfc-controller.pp
View File

@ -14,9 +14,6 @@
notice('MODULAR: networking-sfc/networking-sfc-controller.pp') notice('MODULAR: networking-sfc/networking-sfc-controller.pp')
$use_neutron = hiera('use_neutron', false)
if $use_neutron {
include ::neutron::params include ::neutron::params
$primary_controller = hiera('primary_controller') $primary_controller = hiera('primary_controller')
@ -80,5 +77,3 @@ if $use_neutron {
neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins } neutron_config { 'DEFAULT/service_plugins': value => $enabled_plugins }
neutron_config { 'sfc/drivers': value => 'ovs' } neutron_config { 'sfc/drivers': value => 'ovs' }
}

8
metadata.yaml
View File

@ -3,15 +3,15 @@ name: networking-sfc
# Human-readable name for your plugin # Human-readable name for your plugin
title: Service Function Chaining Extension for OpenStack Networking title: Service Function Chaining Extension for OpenStack Networking
# Plugin version # Plugin version
version: '1.0.0' version: '2.0.0'
# Description # Description
description: Service Function Chaining is a mechanism for overriding the basic destination based forwarding that is typical of IP networks. description: Service Function Chaining is a mechanism for overriding the basic destination based forwarding that is typical of IP networks.
# Required fuel version # Required fuel version
fuel_version: ['9.0'] fuel_version: ['10.0']
# Specify license of your plugin # Specify license of your plugin
licenses: ['Apache License Version 2.0'] licenses: ['Apache License Version 2.0']
# Specify author or company name # Specify author or company name
authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>'] authors: ['Maciej Relewicz <mrelewicz@mirantis.com>', 'Damian Szeluga <dszeluga@mirantis.com>', 'Bartosz Kupidura <bkupidura@mirantis.com>']
# A link to the plugin's page # A link to the plugin's page
homepage: 'https://github.com/damjanek/fuel-plugin-networking-sfc' homepage: 'https://github.com/damjanek/fuel-plugin-networking-sfc'
# Specify a group which your plugin implements, possible options: # Specify a group which your plugin implements, possible options:
@ -24,7 +24,7 @@ is_hotpluggable: false
# The plugin is compatible with releases in the list # The plugin is compatible with releases in the list
releases: releases:
- os: ubuntu - os: ubuntu
version: mitaka-9.0 version: newton-10.0
mode: ['ha'] mode: ['ha']
deployment_scripts_path: deployment_scripts/ deployment_scripts_path: deployment_scripts/
repository_path: repositories/ubuntu repository_path: repositories/ubuntu

2
pre_build_hook
View File

@ -12,7 +12,7 @@ GIT_LAST_WORKING_COMMIT=5d69969e999c5fb9a98fb37bb627f1fca789c54c
#package information #package information
VERSION_NUMBER=${VERSION_NUMBER:-0.0.1} VERSION_NUMBER=${VERSION_NUMBER:-0.0.1}
DESCRIPTION="Networking SFC for Openstack" DESCRIPTION="Networking SFC for Openstack"
MAINTAINERS="Maciej Relewicz, Damian Szeluga" MAINTAINERS="Maciej Relewicz, Damian Szeluga, Bartosz Kupidura"
DIR="$(dirname `readlink -f $0`)" DIR="$(dirname `readlink -f $0`)"
TMP_DIR="${DIR}/tmp" TMP_DIR="${DIR}/tmp"