Merge "Cleanup CHEF-3694 cloning warnings"

CHANGELOG.md

@@ -15,6 +15,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
 * Add global rabbit ha flag
 * Removed all ceph logic
 * Allow different URLs for internal, public, admin endpoints (bug 1412919)
+* Cleanup CHEF-3694 warnings
 
 ## 10.1.0
 * Adding identity admin bind host endpoint to allow flexibility and consistency

libraries/database.rb

@@ -87,7 +87,7 @@ module ::Openstack # rubocop:disable Documentation
       }
 
       # create database
-      database "create #{db_name} database" do
+      database "create database #{db_name}" do
         provider db_prov
         connection connection_info
         database_name db_name
@@ -96,7 +96,7 @@ module ::Openstack # rubocop:disable Documentation
       end
 
       # create user
-      database_user user do
+      database_user "create database user #{user}"  do
         provider user_prov
         connection connection_info
         password pass
@@ -104,7 +104,7 @@ module ::Openstack # rubocop:disable Documentation
       end
 
       # grant privs to user
-      database_user user do
+      database_user "grant database user #{user}" do
         provider user_prov
         connection connection_info
         password pass

spec/database_spec.rb

@@ -38,18 +38,6 @@ describe 'openstack-common::default' do
         expect(result['host']).to eq('127.0.0.1')
         expect(result['port']).to eq('3306')
       end
-
-      it 'creates database' do
-        skip 'TODO: test this LWRP'
-      end
-
-      it 'creates database user' do
-        skip 'TODO: test this LWRP'
-      end
-
-      it 'grants privs to database user' do
-        skip 'TODO: test this LWRP'
-      end
     end
   end
 end