Contrail distribution removed from plugin settings

- environment_config updated

Change-Id: I9b28da1061224f5150b3aa6faeedcb88f0946e10
This commit is contained in:
Oleksandr Martsyniuk 2016-01-04 22:26:25 +02:00 committed by Illia Polliul
parent 041ce23e59
commit b30c1199c6
2 changed files with 2 additions and 13 deletions

View File

@ -20,7 +20,7 @@ $settings = hiera('contrail', {})
# TODO
#$plugin_version = $settings['metadata']['plugin_version']
$plugin_version = '3.0'
$distribution=$settings['contrail_distribution']
$distribution= 'juniper'
$network_scheme = hiera_hash('network_scheme', {})
$network_metadata = hiera_hash('network_metadata', {})

View File

@ -3,18 +3,7 @@ attributes:
metadata:
restrictions:
- 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."
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"
message: "Please use Neutron with tunneling segmentation."
contrail_asnum:
value: '64512'
label: 'AS Number'