Increment etcd to 5.5
- etcd does not take any arguments. the default is create. - remove use_inline_resources in preparation for custom resources Change-Id: Ic9c98978587cf81bfd430bd5b712cf537c3fb9a0 Depends-On: I161af1074cd17f2e3d2d2cf0b37a0c5fa1015fd3
This commit is contained in:
parent
7740328325
commit
34c61367ae
@ -25,8 +25,6 @@ class Chef
|
||||
class Provider
|
||||
class Database
|
||||
class Mysql < Chef::Provider::LWRPBase
|
||||
use_inline_resources
|
||||
|
||||
def whyrun_supported?
|
||||
true
|
||||
end
|
||||
|
@ -27,8 +27,6 @@ class Chef
|
||||
class Provider
|
||||
class Database
|
||||
class MysqlUser < Chef::Provider::Database::Mysql
|
||||
use_inline_resources
|
||||
|
||||
def whyrun_supported?
|
||||
true
|
||||
end
|
||||
|
@ -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'
|
||||
|
@ -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
|
||||
|
@ -19,6 +19,4 @@
|
||||
#
|
||||
|
||||
# create a new etcd installation named 'openstack'
|
||||
etcd_service 'openstack' do
|
||||
action [:create, :start]
|
||||
end
|
||||
etcd_service 'openstack'
|
||||
|
Loading…
Reference in New Issue
Block a user