Cleanup hieradata to reduce Puppet warnings

Some puppet parameters were deprecated, some of them removed.
This patch reduce the number of warnings to a few, and the rest of
warnings are bugs that are in progress by Puppet OpenStack team.

This patch is mostly some cleanup so we don't have useless warnings in
Puppet catalog.

Changes:
* Update Ceilometer auth params
* Update Neutron auth params
* Update Heat auth params
* Update Swift hash suffix param
* Remove neutron::server::notifications::nova_url, useless.

Change-Id: Ie32681a1fe32735f70ba372630da09f91227298c

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index ee00a89..a77a05e 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -545,7 +545,7 @@ resources:
                 ceilometer::rabbit_password: {get_input: rabbit_password}
                 ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
                 ceilometer::rabbit_port: {get_input: rabbit_client_port}
-                ceilometer::metering_secret: {get_input: ceilometer_metering_secret}
+                ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
                 ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                 ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url}
                 ceilometer_compute_agent: {get_input: ceilometer_compute_agent}

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 42687c5..cc4b216 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1189,7 +1189,7 @@ resources:
                 # FIXME: need to move proxy_local_net_ip into swift-proxy.yaml
                 swift::proxy::proxy_local_net_ip: {get_input: swift_proxy_network}
                 swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
-                swift::swift_hash_suffix: {get_input: swift_hash_suffix}
+                swift::swift_hash_path_suffix: {get_input: swift_hash_suffix}
                 tripleo::ringbuilder::build_ring: { get_input: swift_ring_build }
                 tripleo::ringbuilder::part_power: {get_input: swift_part_power}
                 tripleo::ringbuilder::replicas: {get_input: swift_replicas}
@@ -1264,7 +1264,7 @@ resources:
                 # Neutron
                 neutron::bind_host: {get_input: neutron_api_network}
                 neutron::server::auth_uri: {get_input: keystone_auth_uri}
-                neutron::server::identity_uri: {get_input: keystone_identity_uri}
+                neutron::server::auth_url: {get_input: keystone_identity_uri}
                 neutron::server::database_connection: {get_input: neutron_dsn}
                 neutron::server::api_workers: {get_input: neutron_workers}
                 neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
@@ -1294,7 +1294,7 @@ resources:
                 neutron::plugins::ml2::tenant_network_types: {get_input: neutron_tenant_network_types}
                 neutron::agents::ml2::ovs::tunnel_types: {get_input: neutron_tunnel_types}
                 neutron::agents::ml2::ovs::extensions: {get_input: neutron_agent_extensions}
-                neutron::server::auth_password: {get_input: neutron_password}
+                neutron::server::password: {get_input: neutron_password}
                 neutron_dsn: {get_input: neutron_dsn}
                 neutron::db::mysql::password: {get_input: neutron_password}
                 neutron::keystone::auth::public_url: {get_input: neutron_public_url }
@@ -1302,7 +1302,6 @@ resources:
                 neutron::keystone::auth::admin_url: {get_input: neutron_admin_url }
                 neutron::keystone::auth::password: {get_input: neutron_password }
                 neutron::keystone::auth::region: {get_input: keystone_region}
-                neutron::server::notifications::nova_url: {get_input: nova_internal_url}
                 neutron::server::notifications::auth_url: {get_input: neutron_auth_url}
                 neutron::server::notifications::tenant_name: 'service'
                 neutron::server::notifications::project_name: 'service'
@@ -1311,7 +1310,7 @@ resources:
                 # Ceilometer
                 ceilometer_backend: {get_input: ceilometer_backend}
                 ceilometer_mysql_conn_string: {get_input: ceilometer_dsn}
-                ceilometer::metering_secret: {get_input: ceilometer_metering_secret}
+                ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
                 ceilometer::rabbit_userid: {get_input: rabbit_username}
                 ceilometer::rabbit_password: {get_input: rabbit_password}
                 ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
@@ -1319,8 +1318,8 @@ resources:
                 ceilometer::debug: {get_input: debug}
                 ceilometer::api::host: {get_input: ceilometer_api_network}
                 ceilometer::api::keystone_password: {get_input: ceilometer_password}
-                ceilometer::api::keystone_auth_uri: {get_input: keystone_auth_uri}
-                ceilometer::api::keystone_identity_uri: {get_input: keystone_identity_uri}
+                ceilometer::api::auth_uri: {get_input: keystone_auth_uri}
+                ceilometer::api::identity_uri: {get_input: keystone_identity_uri}
                 ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
                 ceilometer::agent::auth::auth_url: {get_input: keystone_auth_uri}
                 ceilometer::agent::central::coordination_url: {get_input: ceilometer_coordination_url}

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 3496595..65cf957 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -17,6 +17,7 @@ nova::network::neutron::neutron_username: 'neutron'
 nova::network::neutron::dhcp_domain: ''
 
 neutron::allow_overlapping_ips: true
+neutron::server::project_name: 'service'
 
 kernel_modules:
   nf_conntrack: {}

diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 321ae80..c87b521 100644 (file)
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -143,6 +143,7 @@ heat::cron::purge_deleted::destination: '/dev/null'
 heat::keystone::domain::domain_name: 'heat_stack'
 heat::keystone::domain::domain_admin: 'heat_stack_domain_admin'
 heat::keystone::domain::domain_admin_email: 'heat_stack_domain_admin@localhost'
+heat::auth_plugin: 'password'
 
 # pacemaker
 pacemaker::corosync::cluster_name: 'tripleo_cluster'

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 8263ec5..2a18ea3 100644 (file)
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -270,7 +270,7 @@ if hiera('step') >= 4 {
       class {'::neutron::plugins::midonet':
         midonet_api_ip    => hiera('tripleo::loadbalancer::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 --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index b9bd6b1..63eadfb 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -494,7 +494,7 @@ MYSQL_HOST=localhost\n",
     class {'::neutron::plugins::midonet':
       midonet_api_ip    => hiera('tripleo::loadbalancer::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' {

diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 51807f9..4a5ec2c 100644 (file)
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -49,7 +49,6 @@ outputs:
                   - '@'
                   - {get_param: [EndpointMap, MysqlInternal, host]}
                   - '/heat'
-            heat::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
             heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
             heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
             heat::keystone_password: {get_param: HeatPassword}

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 3f6f473..9a1f2fc 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -279,7 +279,7 @@ resources:
             object:
               raw_data: {get_file: hieradata/object.yaml}
               mapped_data: # data supplied directly to this deployment configuration, etc
-                swift::swift_hash_suffix: { get_input: swift_hash_suffix }
+                swift::swift_hash_path_suffix: { get_input: swift_hash_suffix }
                 tripleo::ringbuilder::build_ring: { get_input: swift_ring_build }
                 tripleo::ringbuilder::part_power: { get_input: swift_part_power }
                 tripleo::ringbuilder::replicas: {get_input: swift_replicas }