Modified the new SFC features for ODL Boron
Enabling SFC implies ODL Boron usage. Change-Id: Ia5e6339c2726822baa26e733ca8b8c9f79243446 Signed-off-by: Manuel Buil <manuel.buil@ericsson.com> Signed-off-by: Michal Skalski <mskalski@mirantis.com>
This commit is contained in:
Manuel Buil
Michal Skalski
parent
5d80efce6d
commit
da08a2b5e7
|
|
@ -0,0 +1,15 @@
|
|||
module Puppet::Parser::Functions
|
||||
newfunction(:odl_package_name, :arity => 1, :type => :rvalue, :doc => <<-EOS
|
||||
@desc Check if feature which require experimental odl is enabled.
|
||||
@return String with odl deb package name.
|
||||
EOS
|
||||
) do |args|
|
||||
odl_settings = args[0]
|
||||
experimental_odl = odl_settings['metadata']['use_experimental_odl']
|
||||
if experimental_odl.is_a?(Array) and experimental_odl.any? { |feature| odl_settings[feature] }
|
||||
odl_settings['metadata']['experimental_odl_deb']
|
||||
else
|
||||
odl_settings['metadata']['odl_deb']
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -3,7 +3,6 @@ class opendaylight {
|
|||
$network_metadata = hiera_hash('network_metadata')
|
||||
$node_uid = hiera('uid')
|
||||
$rest_api_port = $odl_settings['rest_api_port']
|
||||
$package_name = $odl_settings['package_name']
|
||||
$jetty_port = $odl_settings['metadata']['jetty_port']
|
||||
$odl_nodes_hash = get_nodes_hash_by_roles($network_metadata, ['opendaylight'])
|
||||
$odl_mgmt_ips_hash = get_node_to_ipaddr_map_by_network_role($odl_nodes_hash, 'management')
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ class opendaylight::install (
|
|||
$management_vip = hiera('management_vip')
|
||||
$conf_dir = '/opt/opendaylight/etc'
|
||||
$jetty_port = $opendaylight::jetty_port
|
||||
$odl_package = $opendaylight::package_name
|
||||
$odl_package = odl_package_name($opendaylight::odl_settings)
|
||||
|
||||
$manage_l3_traffic = $opendaylight::odl_settings['enable_l3_odl'] ? {
|
||||
true => 'yes',
|
||||
|
|
|
|||
|
|
@ -29,23 +29,6 @@ attributes:
|
|||
restrictions:
|
||||
- condition: "settings:opendaylight.enable_sfc.value == false"
|
||||
action: "hide"
|
||||
package_name:
|
||||
weight: 22
|
||||
type: "select"
|
||||
value: "opendaylight"
|
||||
label: "Name of opendaylight deb package"
|
||||
values:
|
||||
- data: "opendaylight"
|
||||
label: "opendaylight"
|
||||
- data: "opendaylight-boron"
|
||||
label: "opendaylight-boron"
|
||||
description:
|
||||
>
|
||||
Plugin can be build with dedicated package for SFC.
|
||||
Before choosing opendaylight-boron ensure that plugin include this package.
|
||||
restrictions:
|
||||
- condition: "settings:opendaylight.enable_sfc.value == false"
|
||||
action: "hide"
|
||||
enable_bgpvpn:
|
||||
weight: 40
|
||||
type: "checkbox"
|
||||
|
|
@ -78,6 +61,15 @@ attributes:
|
|||
value: false
|
||||
label: "Use V2 ML2 driver"
|
||||
description: "V2 version is considered as experimental"
|
||||
rest_api_port:
|
||||
value: '8282'
|
||||
label: 'Port number'
|
||||
description: 'Port on which ODL REST API will be available.'
|
||||
weight: 70
|
||||
type: "text"
|
||||
regex:
|
||||
source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
|
||||
error: 'Invalid port number'
|
||||
metadata:
|
||||
restrictions:
|
||||
- "cluster:net_provider != 'neutron'": "Only neutron is supported by OpenDaylight"
|
||||
|
|
@ -105,23 +97,15 @@ attributes:
|
|||
- odl-sfc-model
|
||||
- odl-sfc-provider
|
||||
- odl-sfc-provider-rest
|
||||
- odl-sfc-sb-rest
|
||||
- odl-sfc-ui
|
||||
- odl-sfc-netconf
|
||||
- odl-sfc-ovs
|
||||
- odl-sfcofl2
|
||||
- odl-sfc-openflow-renderer
|
||||
vpn:
|
||||
- odl-vpnservice-openstack
|
||||
odl_deb: opendaylight
|
||||
experimental_odl_deb: opendaylight-boron
|
||||
use_experimental_odl:
|
||||
- enable_sfc
|
||||
default_credentials:
|
||||
user: admin
|
||||
password: admin
|
||||
jetty_port: 8181
|
||||
rest_api_port:
|
||||
value: '8282'
|
||||
label: 'Port number'
|
||||
description: 'Port on which ODL REST API will be available.'
|
||||
weight: 70
|
||||
type: "text"
|
||||
regex:
|
||||
source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
|
||||
error: 'Invalid port number'
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ set -eux
|
|||
|
||||
# Where we can find odl karaf distribution tarball
|
||||
# can be http(s) url or absolute path
|
||||
ODL_TARBALL_LOCATION=${ODL_TARBALL_LOCATION:-https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz}
|
||||
ODL_TARBALL_LOCATION=${ODL_TARBALL_LOCATION:-https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.tar.gz}
|
||||
ODL_BORON_TARBALL_LOCATION=${ODL_BORON_TARBALL_LOCATION:-false}
|
||||
|
||||
#ODL openflowjava NSH subtype patch related
|
||||
|
|
@ -28,7 +28,7 @@ JARBALL=${JARBALL:-'openflowjava-extension-nicira'}
|
|||
bdart=''
|
||||
|
||||
#Verion number used in deb/rpm package
|
||||
ODL_VERSION_NUMBER=${ODL_VERSION_NUMBER:-0.4.2}
|
||||
ODL_VERSION_NUMBER=${ODL_VERSION_NUMBER:-0.4.3}
|
||||
ODL_BORON_VERSION_NUMBER=${ODL_BORON_VERSION_NUMBER:-0.5.0}
|
||||
ODL_DESCRIPTION="OpenDaylight SDN Controller"
|
||||
TMP_NAME="karaf-odl.tar.gz"
|
||||
|
|
|
|||
Loading…
Reference in New Issue