Fix DB2 and nosql ceilometer dbsync

* Remove very old and now incorrect check for running
ceilometer-dbsync with nosql.  This is fine to do now, and is
needed when nosql is used for DB2 with ceilometer.

Change-Id: Id31d7dffb3e01513bb0470a7a6f5f07118dc28ef
Closes-Bug: #1373600

CHANGELOG.md

@@ -9,6 +9,7 @@ This file is used to list changes made in each version of the openstack-metering
 * Upgrading berkshelf from 2.0.18 to 3.1.5
 * Allow cafile, os_cacert, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and has
 h_algorithms to be configurable
+* Remove old nosql check for running dbsync
 
 ## 10.0.0
 * Upgrading to Juno

recipes/collector.rb

@@ -24,10 +24,8 @@ include_recipe 'openstack-telemetry::common'
 
 conf_switch = "--config-file #{node["openstack"]["telemetry"]["conf"]}"
 
-unless node['openstack']['db']['telemetry']['nosql']['used']
-  execute 'database migration' do
-    command "ceilometer-dbsync #{conf_switch}"
-  end
+execute 'database migration' do
+  command "ceilometer-dbsync #{conf_switch}"
 end
 
 platform = node['openstack']['telemetry']['platform']

spec/collector_spec.rb

@@ -20,12 +20,6 @@ describe 'openstack-telemetry::collector' do
       expect(chef_run).to run_execute command
     end
 
-    it 'does not execute ceilometer dbsync when nosql database is used' do
-      node.set['openstack']['db']['telemetry']['nosql']['used'] = true
-
-      expect(chef_run).not_to run_execute('execute[database migration]')
-    end
-
     it 'installs python-mysqldb' do
       expect(chef_run).to upgrade_package('python-mysqldb')
     end