diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-31 12:26:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-31 12:26:15 +0000 |
| commit | f9a557f90dcb101e5709cbb09e7205dd594f9580 (patch) | |
| tree | b38e66cf13c562492122c85cdc9fe17590ba8c6e /manifests/profile/base/neutron | |
| parent | 325dc2a17715c927327f2f4de13d8c10ab70fd72 (diff) | |
| parent | b0ec457332912476618c55752041f4440dd2cf68 (diff) | |
Merge "Update profiles for loadbalancer split"
Diffstat (limited to 'manifests/profile/base/neutron')
| -rw-r--r-- | manifests/profile/base/neutron/midonet.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/base/neutron/midonet.pp b/manifests/profile/base/neutron/midonet.pp index 7374c57..60aa006 100644 --- a/manifests/profile/base/neutron/midonet.pp +++ b/manifests/profile/base/neutron/midonet.pp @@ -20,7 +20,7 @@ # # [*vip*] # (Optional) Public Virtual IP Address for this cloud -# Defaults to hiera('tripleo::loadbalancer::public_virtual_ip') +# Defaults to hiera('public_virtual_ip') # # [*keystone_admin_token*] # (Optional) The Keystone Admin Token @@ -68,7 +68,7 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::midonet ( - $vip = hiera('tripleo::loadbalancer::public_virtual_ip', ''), + $vip = hiera('public_virtual_ip', 'tripleo::loadbalancer::public_virtual_ip'), $keystone_admin_token = hiera('keystone::admin_token', ''), $zookeeper_client_ip = hiera('neutron::bind_host', ''), $zookeeper_hostnames = hiera('controller_node_names', ''), |