diff --git a/libraries/provider_database_mysql.rb b/libraries/provider_database_mysql.rb index e90739c7..2d8f513f 100644 --- a/libraries/provider_database_mysql.rb +++ b/libraries/provider_database_mysql.rb @@ -25,8 +25,6 @@ class Chef class Provider class Database class Mysql < Chef::Provider::LWRPBase - use_inline_resources - def whyrun_supported? true end diff --git a/libraries/provider_database_mysql_user.rb b/libraries/provider_database_mysql_user.rb index 1b66258c..2673f555 100644 --- a/libraries/provider_database_mysql_user.rb +++ b/libraries/provider_database_mysql_user.rb @@ -27,8 +27,6 @@ class Chef class Provider class Database class MysqlUser < Chef::Provider::Database::Mysql - use_inline_resources - def whyrun_supported? true end diff --git a/metadata.rb b/metadata.rb index 8520b33e..60b24045 100644 --- a/metadata.rb +++ b/metadata.rb @@ -14,7 +14,7 @@ recipe 'openstack-common::sysctl', 'Configures sysctl settings' supports os end -depends 'etcd', '~> 3.0' +depends 'etcd', '~> 5.5' depends 'mariadb', '~> 1.5' depends 'memcached', '~> 4.1' depends 'mysql', '~> 8.2' diff --git a/providers/database.rb b/providers/database.rb index f27730de..c92a4eb8 100644 --- a/providers/database.rb +++ b/providers/database.rb @@ -9,8 +9,6 @@ include ::Openstack -use_inline_resources if defined?(use_inline_resources) - action :create do info create_db(@db_name, @db_prov, @connection_info, @db_type) # create database diff --git a/recipes/etcd.rb b/recipes/etcd.rb index e12cce5d..2ae6c59a 100644 --- a/recipes/etcd.rb +++ b/recipes/etcd.rb @@ -19,6 +19,4 @@ # # create a new etcd installation named 'openstack' -etcd_service 'openstack' do - action [:create, :start] -end +etcd_service 'openstack'