diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-17 21:46:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-17 21:46:57 +0000 |
| commit | 02f5102eeb2600068c7561b156bf00a8eeed5bd0 (patch) | |
| tree | d7d11a4152b88e92ad851d02dbcd7a2e8cffe083 /manifests/profile/base/neutron/plugins/ml2 | |
| parent | e44f838deeeb9468edf93a3781e754272e1897e2 (diff) | |
| parent | 0cec9b6f4936a056573a69257095fd56b69a816f (diff) | |
Merge "Enables OpenDaylight Clustering in HA deployments"
Diffstat (limited to 'manifests/profile/base/neutron/plugins/ml2')
| -rw-r--r-- | manifests/profile/base/neutron/plugins/ml2/opendaylight.pp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp index c120931..2618d4f 100644 --- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp +++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp @@ -30,6 +30,10 @@ # (Optional) Password to configure for OpenDaylight # Defaults to 'admin' # +# [*odl_url_ip*] +# (Optional) Virtual IP address for ODL Api Service +# Defaults to hiera('opendaylight_api_vip') +# # [*conn_proto*] # (Optional) Protocol to use to for ODL REST access # Defaults to hiera('opendaylight::nb_connection_protocol') @@ -43,14 +47,13 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight ( $odl_port = hiera('opendaylight::odl_rest_port'), $odl_username = hiera('opendaylight::username'), $odl_password = hiera('opendaylight::password'), + $odl_url_ip = hiera('opendaylight_api_vip'), $conn_proto = hiera('opendaylight::nb_connection_protocol'), $step = hiera('step'), ) { if $step >= 4 { - $odl_url_ip = hiera('opendaylight_api_vip') - - if ! $odl_url_ip { fail('OpenDaylight Controller IP/VIP is Empty') } + if ! $odl_url_ip { fail('OpenDaylight API VIP is Empty') } class { '::neutron::plugins::ml2::opendaylight': odl_username => $odl_username, |