Merge "Cleanup hieradata to reduce Puppet warnings"

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/hieradata/controller.yaml
Simple merge

diff --cc puppet/manifests/overcloud_controller.pp
index 74f6c3a,2a18ea3..53bf62c
--- 1/puppet/manifests/overcloud_controller.pp
--- 2/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@@ -268,9 -268,9 +268,9 @@@ if hiera('step') >= 4 
      if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
  
        class {'::neutron::plugins::midonet':
 -        midonet_api_ip    => hiera('tripleo::loadbalancer::public_virtual_ip'),
 +        midonet_api_ip    => hiera('public_virtual_ip'),
          keystone_tenant   => hiera('neutron::server::auth_tenant'),
-         keystone_password => hiera('neutron::server::auth_password')
+         keystone_password => hiera('neutron::server::password')
        }
      } else {
  

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 77b190a,63eadfb..d6d14a8
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -492,9 -492,9 +492,9 @@@ MYSQL_HOST=localhost\n"
    }
    if hiera('neutron::core_plugin') == 'midonet.neutron.plugin_v1.MidonetPluginV2' {
      class {'::neutron::plugins::midonet':
 -      midonet_api_ip    => hiera('tripleo::loadbalancer::public_virtual_ip'),
 +      midonet_api_ip    => hiera('public_virtual_ip'),
        keystone_tenant   => hiera('neutron::server::auth_tenant'),
-       keystone_password => hiera('neutron::server::auth_password')
+       keystone_password => hiera('neutron::server::password')
      }
    }
    if hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {