diff --git a/.rubocop.yml b/.rubocop.yml
index 0773115..2f2a2f5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -1,3 +1,5 @@
+inherit_from: .rubocop_todo.yml
+
 AllCops:
   Include:
     - metadata.rb
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
new file mode 100644
index 0000000..01f635a
--- /dev/null
+++ b/.rubocop_todo.yml
@@ -0,0 +1,13 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-08-03 05:26:07 -0700 using RuboCop version 0.55.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 28
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 113
diff --git a/metadata.rb b/metadata.rb
index 6b62bd1..2cb1ca9 100755
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
 maintainer_email 'openstack-dev@lists.openstack.org'
 license          'Apache-2.0'
 description      'Provides the shared database configuration for OpenStack'
-version          '17.0.0'
+version          '18.0.0'
 
 recipe 'client', 'Installs client packages for the database used by the deployment.'
 recipe 'server', 'Installs and configures server packages for the database used by the deployment.'
@@ -19,7 +19,7 @@ recipe 'openstack-db', 'Creates necessary tables, users, and grants for OpenStac
   supports os
 end
 
-depends 'openstack-common', '>= 17.0.0'
+depends 'openstack-common', '>= 18.0.0'
 
 depends 'mariadb', '~> 1.5'
 depends 'mysql', '~> 8.2'
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index 7ad565b..8a2e0bf 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -10,7 +10,7 @@ describe 'openstack-ops-database::client' do
     let(:chef_run) { runner.converge(described_recipe) }
 
     it 'uses mariadb client recipe by default' do
-      node.set['openstack']['db']['service_type'] = 'mariadb'
+      node.override['openstack']['db']['service_type'] = 'mariadb'
       expect(chef_run).to include_recipe 'openstack-ops-database::mariadb-client'
     end
   end
diff --git a/spec/mysql-server_spec.rb b/spec/mysql-server_spec.rb
index f5689d9..27aa74f 100644
--- a/spec/mysql-server_spec.rb
+++ b/spec/mysql-server_spec.rb
@@ -26,8 +26,8 @@ describe 'openstack-ops-database::mysql-server' do
 
     describe 'creates mysql service with different values' do
       before do
-        node.set['openstack']['mysql']['data_dir'] = '/other-dir'
-        node.set['openstack']['mysql']['version'] = '5.7'
+        node.override['openstack']['mysql']['data_dir'] = '/other-dir'
+        node.override['openstack']['mysql']['version'] = '5.7'
       end
       it do
         expect(chef_run).to create_mysql_service('default').with(
diff --git a/spec/server_spec.rb b/spec/server_spec.rb
index 3debdfb..8330876 100644
--- a/spec/server_spec.rb
+++ b/spec/server_spec.rb
@@ -10,7 +10,7 @@ describe 'openstack-ops-database::server' do
     let(:chef_run) { runner.converge(described_recipe) }
 
     it 'uses mariadb server recipe by default' do
-      node.set['openstack']['db']['service_type'] = 'mariadb'
+      node.override['openstack']['db']['service_type'] = 'mariadb'
       expect(chef_run).to include_recipe('openstack-ops-database::mariadb-server')
     end
   end