diff --git a/deployment_scripts/puppet/modules/contrail/manifests/init.pp b/deployment_scripts/puppet/modules/contrail/manifests/init.pp index b3df3d96d..3ef91a9fa 100644 --- a/deployment_scripts/puppet/modules/contrail/manifests/init.pp +++ b/deployment_scripts/puppet/modules/contrail/manifests/init.pp @@ -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', {}) diff --git a/environment_config.yaml b/environment_config.yaml index 19376e521..ca7a4f064 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -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'