diff --git a/attributes/default.rb b/attributes/default.rb index 87314277..d958a760 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -141,8 +141,8 @@ default['openstack']['endpoints']['family'] = 'inet' default['openstack']['region'] = 'RegionOne' # Set a default auth api version that other components use to interact with identity service. -# Allowed auth API versions: v2.0 or v3.0. By default, it is set to v2.0. -default['openstack']['api']['auth']['version'] = 'v2.0' +# Allowed auth API versions: v2.0 or v3.0. By default, it is set to v3.0. +default['openstack']['api']['auth']['version'] = 'v3.0' # Allow configured loggers in logging.conf default['openstack']['logging']['loggers'] = { diff --git a/bootstrap.sh b/bootstrap.sh index d2aa778f..4b89f0d2 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -11,7 +11,7 @@ if [ -f /usr/bin/yum ] ; then sudo pip uninstall requests -y || true # install chefdk - chefdk=chefdk-0.17.17-1.el7.x86_64.rpm + chefdk=chefdk-1.0.3-1.el7.x86_64.rpm wget -nv -t 3 https://packages.chef.io/stable/el/7/$chefdk sudo yum -y install $chefdk rm $chefdk @@ -26,7 +26,7 @@ elif [ -f /usr/bin/apt-get ]; then sudo apt-get -y install build-essential liblzma-dev zlib1g-dev # install chefdk - chefdk=chefdk_0.17.17-1_amd64.deb + chefdk=chefdk_1.0.3-1_amd64.deb wget -nv -t 3 https://packages.chef.io/stable/ubuntu/12.04/$chefdk sudo dpkg -i $chefdk rm $chefdk diff --git a/metadata.rb b/metadata.rb index 0fb3b5e7..a6b75435 100644 --- a/metadata.rb +++ b/metadata.rb @@ -16,11 +16,12 @@ recipe 'openstack-common::sysctl', 'Configures sysctl settings' supports os end -depends 'apt', '~> 4.0' -depends 'database', '~> 4.0.2' +depends 'apt', '~> 5.0' +depends 'database', '~> 6.1' depends 'mariadb', '~> 0.3.1' -depends 'mysql', '~> 7.2.0' -depends 'yum', '~> 3.5.4' -depends 'yum-epel', '~> 0.6.0' +depends 'mysql', '~> 8.1' +depends 'yum', '~> 3.13' +depends 'yum-epel', '~> 1.0' depends 'galera', '~> 0.4.1' -depends 'poise-python', '~> 1.4.0' +depends 'poise-python', '~> 1.5' +depends 'build-essential'