Contrail distribution removed from plugin settings
- environment_config updated Change-Id: I9b28da1061224f5150b3aa6faeedcb88f0946e10
This commit is contained in:
parent
041ce23e59
commit
b30c1199c6
|
@ -20,7 +20,7 @@ $settings = hiera('contrail', {})
|
||||||
# TODO
|
# TODO
|
||||||
#$plugin_version = $settings['metadata']['plugin_version']
|
#$plugin_version = $settings['metadata']['plugin_version']
|
||||||
$plugin_version = '3.0'
|
$plugin_version = '3.0'
|
||||||
$distribution=$settings['contrail_distribution']
|
$distribution= 'juniper'
|
||||||
|
|
||||||
$network_scheme = hiera_hash('network_scheme', {})
|
$network_scheme = hiera_hash('network_scheme', {})
|
||||||
$network_metadata = hiera_hash('network_metadata', {})
|
$network_metadata = hiera_hash('network_metadata', {})
|
||||||
|
|
|
@ -3,18 +3,7 @@ attributes:
|
||||||
metadata:
|
metadata:
|
||||||
restrictions:
|
restrictions:
|
||||||
- condition: "not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type != 'vlan')"
|
- condition: "not (cluster:net_provider == 'neutron' and networking_parameters:segmentation_type != 'vlan')"
|
||||||
message: "Please use Neutron with GRE segmentation, the only network type supported with Contrail plugin."
|
message: "Please use Neutron with tunneling segmentation."
|
||||||
contrail_distribution:
|
|
||||||
type: "radio"
|
|
||||||
weight: 10
|
|
||||||
value: "open"
|
|
||||||
label: "Contrail distribution"
|
|
||||||
description: "Select Contrail distribution"
|
|
||||||
values:
|
|
||||||
- data: "open"
|
|
||||||
label: "OpenContrail"
|
|
||||||
- data: "juniper"
|
|
||||||
label: "Juniper Contrail"
|
|
||||||
contrail_asnum:
|
contrail_asnum:
|
||||||
value: '64512'
|
value: '64512'
|
||||||
label: 'AS Number'
|
label: 'AS Number'
|
||||||
|
|
Loading…
Reference in New Issue