Resolve deprecation warnings

Currently, there are several deprecation warnings emitted by
catalog runs that are due to changes in parameters for various
modules.  These include:

Warning: Scope(Class[Neutron::Server]): sql_connection deprecated
  for database_connection
Warning: Scope(Class[Nova]): sql_connection deprecated for
  database_connection
Warning: Scope(Class[Neutron::Server]): sql_idle_timeout deprecated
  for database_idle_timeout
Warning: Scope(Class[Nova::Keystone::Auth]): cinder parameter is
  deprecated and has no effect.

This patch resolves those warnings by updating data mappings
to use more modern parameter names.  The last warning above is
caused by the presence of the old "grizzly_hack.yaml" file that
was necessary before a stable/grizzly branch was created, so
that file is removed since it's no longer needed.

Change-Id: I706ea95ea25a94388fdfb4ded34c8ea9d52cd7b2
Partial-Bug: #1281896

data/data_mappings/common.yaml

@@ -148,11 +148,11 @@ swift_local_net_ip:
 "%{db_type}://keystone:%{keystone_db_password}@%{controller_internal_address}/keystone":
   - keystone::sql_connection
 "%{db_type}://nova:%{nova_db_password}@%{controller_internal_address}/nova":
-  - nova::sql_connection
+  - nova::database_connection
 "%{db_type}://%{network_service}:%{network_db_password}@%{controller_internal_address}/%{network_service}":
   - quantum::plugins::ovs::sql_connection
   - quantum::plugins::linuxbridge::sql_connection
-  - neutron::server::sql_connection
+  - neutron::server::database_connection
 #"%{ceilometer_db_type}://ceilometer:%{ceilometer_db_password}@%{controller_internal_address}/ceilometer":
 # NOTE: Workaround for connection issues with mongo
 "%{ceilometer_db_type}://localhost:27017/ceilometer":

data/data_mappings/enable_ha/true.yaml

@@ -4,10 +4,10 @@ sql_idle_timeout:
   - keystone::idle_timeout
   - glance::registry::sql_idle_timeout
   - glance::api::sql_idle_timeout
-  - nova::sql_idle_timeout
+  - nova::database_idle_timeout
   - cinder::sql_idle_timeout
   - quantum::plugins::ovs::sql_idle_timeout
-  - neutron::server::sql_idle_timeout
+  - neutron::server::database_idle_timeout
 rabbit_hosts:
   - quantum::rabbit_hosts
   - neutron::rabbit_hosts
@@ -51,11 +51,11 @@ bind_address:
 "mysql://keystone:%{keystone_db_password}@%{controller_internal_address}/keystone":
   - keystone::sql_connection
 "mysql://nova:%{nova_db_password}@%{controller_internal_address}/nova":
-  - nova::sql_connection
+  - nova::database_connection
 "mysql://%{network_service}:%{network_db_password}@%{controller_internal_address}/%{network_service}?charset=utf8":
   - quantum::plugins::ovs::sql_connection
   - quantum::plugins::linuxbridge::sql_connection
-  - neutron::server::sql_connection
+  - neutron::server::database_connection
 "mysql://heat:%{heat_db_password}@%{controller_internal_address}/heat":
   - heat::sql_connection
 "http://%{controller_public_address}:5000/v2.0/":

data/hiera_data/grizzly_hack.yaml

@@ -1,36 +0,0 @@
-# It is too late for changes to grizzly.
-# The following config is specific to grizzly
-# and should not be required for havana
-#
-
-# TODO I need to submit a patch to update these
-nova::cert::enabled: true
-nova::api::enabled: true
-nova::compute::enabled: true
-nova::conductor::enabled: true
-nova::consoleauth::enabled: true
-nova::network::enabled: true
-nova::objectstore::enabled: true
-nova::qpid::enabled: true
-nova::scheduler::enabled: true
-nova::vncproxy::enabled: true
-nova::volume::enabled: true
-
-# the cinder default package states are not consistent,
-# they need to be updated
-cinder::scheduler::package_ensure: present
-cinder::api::package_ensure: present
-cinder::volume::package_ensure: present
-
-openstack::auth_file::admin_tenant: openstack
-
-# the keystone tenant and user for glance are not consistent,
-# they need to be fixed
-glance::api::keystone_tenant: services
-glance::api::keystone_user: glance
-glance::registry::keystone_tenant: services
-glance::registry::keystone_user: glance
-
-keystone::db::mysql::user: keystone
-
-nova::keystone::auth::cinder: true

templates/hiera.erb

@@ -24,7 +24,6 @@
   - "network_plugin/%{network_plugin}"
   - "password_management/%{password_management}"
   - "scenario/%{scenario}"
-  - grizzly_hack
 <%- if @vendor %>  - vendor/<%= @vendor %>_<%= @vendorrepo %>_common<% end %>
   - common
 :yaml: