summaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-10-13 20:17:30 +0000
committerGerrit Code Review <review@openstack.org>2017-10-13 20:17:30 +0000
commit551f739004444d9549f35a58ec3ceb86ba7702f1 (patch)
treeb05e9033196fed1263aa566b7a5cc39c4df55d3e /manifests/profile
parentbd5f80ef0bd4733d6da85279aae244737b07dde8 (diff)
parent22ff1cf840107663f3aeae5b870a2d4615094d14 (diff)
Merge "Disables port status for all ODL deployments" into stable/pike
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/neutron/plugins/ml2/opendaylight.pp21
1 files changed, 2 insertions, 19 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index c98f555..cb3e817 100644
--- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
@@ -34,10 +34,6 @@
# (Optional) Virtual IP address for ODL Api Service
# Defaults to hiera('opendaylight_api_vip')
#
-# [*odl_api_ips*]
-# (Optional) List of OpenStack Controller IPs for ODL API
-# Defaults to hiera('opendaylight_api_node_ips')
-#
# [*conn_proto*]
# (Optional) Protocol to use to for ODL REST access
# Defaults to hiera('opendaylight::nb_connection_protocol')
@@ -52,7 +48,6 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
$odl_username = hiera('opendaylight::username'),
$odl_password = hiera('opendaylight::password'),
$odl_url_ip = hiera('opendaylight_api_vip'),
- $odl_api_ips = hiera('opendaylight_api_node_ips'),
$conn_proto = hiera('opendaylight::nb_connection_protocol'),
$step = Integer(hiera('step')),
) {
@@ -60,24 +55,12 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight (
if $step >= 4 {
if ! $odl_url_ip { fail('OpenDaylight API VIP is Empty') }
- $ml2_odl_params = {
- 'odl_username' => $odl_username,
- 'odl_password' => $odl_password,
- 'odl_url' => "${conn_proto}://${odl_url_ip}:${odl_port}/controller/nb/v2/neutron",
- }
-
- validate_array($odl_api_ips)
- if size($odl_api_ips) > 2 {
- $odl_features = 'False'
- } else {
- $odl_features = $::os_service_default
- }
-
+ # TODO(trozet) remove odl_features once ODL BZ: 9256, 9147 are fixed
class { '::neutron::plugins::ml2::opendaylight':
odl_username => $odl_username,
odl_password => $odl_password,
odl_url => "${conn_proto}://${odl_url_ip}:${odl_port}/controller/nb/v2/neutron",
- odl_features => $odl_features;
+ odl_features => 'False';
}
}
}