Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore-chaks/test #145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
require 'spec_helper'

describe package(@agent_package_name) do
it { should be_installed }
end

describe service(@agent_service_name) do
it { should be_running }
end

describe command('/opt/datadog-agent/bin/agent/agent status | grep -v "Instance ID"'), :if => os[:family] != 'windows' do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain '[OK]' }
its(:stdout) { should_not contain 'ERROR' }
end

# The new APT keys are imported
describe command('apt-key list'), :if => ['debian', 'ubuntu'].include?(os[:family]) do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain '382E94DE' }
its(:stdout) { should contain 'F14F620E' }
end

# The new RPM keys are imported
describe command('rpm -q gpg-pubkey-e09422b3'), :if => os[:family] == 'redhat' do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain 'gpg-pubkey-e09422b3' }
end

describe command('rpm -q gpg-pubkey-fd4bf915'), :if => os[:family] == 'redhat' do
its(:exit_status) { should eq 0 }
its(:stdout) { should contain 'gpg-pubkey-fd4bf915' }
end

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
require 'spec_helper'

# the be_installed.by('gem') check is not implemented for Windows as of v2.24 of Serverspec
describe package('chef-handler-datadog'), :if => os[:family] != 'windows' do
it { should be_installed.by('gem') }
end

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source 'https://rubygems.org'

gem 'json_spec', '~> 1.1.0'
2 changes: 1 addition & 1 deletion cookbooks/lvm/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
#

default['lvm']['chef-ruby-lvm']['version'] = '0.4.0'
default['lvm']['chef-ruby-lvm-attrib']['version'] = '0.3.9'
default['lvm']['chef-ruby-lvm-attrib']['version'] = '0.3.11'
default['lvm']['rubysource'] = Chef::Config['rubygems_url']
4 changes: 2 additions & 2 deletions cookbooks/mariadb/libraries/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ def mariadbbackup_pkg_name
if platform_family?('rhel', 'fedora', 'amazon')
'MariaDB-backup'
else
new_resource.version == '10.3' ? 'mariadb-backup' : "mariadb-backup-#{new_resource.version}"
new_resource.version == '11.0.2' ? 'mariadb-backup' : "mariadb-backup-#{new_resource.version}"
end
end

# determine the platform specific server package name
def server_pkg_name
platform_family?('debian') ? "mariadb-server-#{new_resource.version}" : 'MariaDB-server'
platform_family?('debian') ? "mariadb-server" : 'MariaDB-server'
end

# given the base URL build the complete URL string for a yum repo
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/mariadb/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
supports 'debian', '>= 9.0'
supports 'centos', '>= 7.0'

depends 'selinux', '>= 6.0'
#depends 'selinux', '>= 6.0'
6 changes: 3 additions & 3 deletions cookbooks/mariadb/resources/client_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
provides :mariadb_client_install
unified_mode true

property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :setup_repo, [true, false], default: true

action :install do
mariadb_repository 'Add mariadb.org repository' do
version new_resource.version
version '11.0.2'
only_if { new_resource.setup_repo }
end

case node['platform_family']
when 'debian'
package "mariadb-client-#{new_resource.version}"
package "mariadb-client"
when 'rhel', 'fedora', 'amazon'
package 'MariaDB-client'
end
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/mariadb/resources/galera_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
property :innodb_flush_log_at_trx_commit, Integer, default: 2
property :options, Hash, default: {}
property :server_id, Integer, default: 100
property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :wsrep_node_address_interface, [String, nil]
property :wsrep_node_incoming_address_interface, String
property :wsrep_node_port, [Integer, nil], default: nil
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/mariadb/resources/replication.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
include MariaDBCookbook::Helpers

property :connection_name, String, name_property: true
property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :host, [String, nil], default: 'localhost', desired_state: false
property :port, [Integer, nil], default: 3306, desired_state: false
property :user, [String, nil], default: 'root', desired_state: false
Expand Down
4 changes: 2 additions & 2 deletions cookbooks/mariadb/resources/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
provides :mariadb_repository
unified_mode true

property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :enable_mariadb_org, [true, false], default: true
property :yum_gpg_key_uri, String, default: 'https://yum.mariadb.org/RPM-GPG-KEY-MariaDB'
property :apt_gpg_keyserver, String, default: 'keyserver.ubuntu.com'
Expand Down Expand Up @@ -65,7 +65,7 @@
package 'dirmngr' if (platform?('ubuntu') && node['platform_version'].to_i >= 9) || (platform?('ubuntu') && node['platform_version'].to_i >= 18)

apt_repository 'mariadb_org_repository' do
uri "#{new_resource.apt_repository_uri}/#{new_resource.version}/#{node['platform']}"
uri "#{new_resource.apt_repository_uri}/11.0.2/#{node['platform']}"
components ['main']
keyserver new_resource.apt_gpg_keyserver
key new_resource.apt_gpg_key
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/mariadb/resources/server_configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

include MariaDBCookbook::Helpers

property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :cookbook, String, default: 'mariadb'
property :mycnf_file, String, default: lazy { "#{conf_dir}/my.cnf" }
property :extra_configuration_directory, String, default: lazy { ext_conf_dir }
Expand Down
6 changes: 3 additions & 3 deletions cookbooks/mariadb/resources/server_install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

include MariaDBCookbook::Helpers

property :version, String, default: '10.3'
property :version, String, default: '11.0.2'
property :setup_repo, [true, false], default: true
property :mycnf_file, String, default: lazy { "#{conf_dir}/my.cnf" }
property :extconf_directory, String, default: lazy { ext_conf_dir }
Expand All @@ -36,13 +36,13 @@
node.run_state['mariadb']['version'] = new_resource.version

mariadb_client_install 'Install MariaDB Client' do
version new_resource.version
version '11.0.2'
setup_repo new_resource.setup_repo
end

package server_pkg_name

selinux_install 'mariadb' if selinux_enabled?
#selinux_install 'mariadb' if selinux_enabled?

%w(mariadb-server mariadb).each do |m|
selinux_module m do
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/memcached/attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
default['memcached']['memory'] = 64
default['memcached']['port'] = 11_211
default['memcached']['udp_port'] = 11_211
default['memcached']['listen'] = '0.0.0.0'
default['memcached']['listen'] = '127.0.0.1'
default['memcached']['maxconn'] = 1024
default['memcached']['max_object_size'] = '1m'
default['memcached']['experimental_options'] = []
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/openstack-common/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
depends 'etcd', '>= 7.0'
depends 'mariadb', '>= 5.0'
depends 'memcached', '>= 7.0'
depends 'selinux'
#depends 'selinux'
#depends 'yum-centos', '>= 3.2.0'
depends 'yum-epel'

Expand Down
2 changes: 1 addition & 1 deletion cookbooks/openstack-ops-database/attributes/mysql.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# MySQL attributes that we select defaults for:

# MariaDB version
default['openstack']['mariadb']['version'] = '10.3'
default['openstack']['mariadb']['version'] = '11.0.2'
# Whether to set up mariadb repo
default['openstack']['mariadb']['setup_repo'] = true
# Storage engine, base OpenStack requires the InnoDB flavor
Expand Down
2 changes: 1 addition & 1 deletion cookbooks/openstack-ops-database/recipes/mariadb-client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.
#
mariadb_client_install 'default' do
version node['openstack']['mariadb']['version']
version '11.0.2'
setup_repo node['openstack']['mariadb']['setup_repo']
end

Expand Down
2 changes: 1 addition & 1 deletion cookbooks/openstack-ops-database/recipes/mariadb-server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class ::Chef::Recipe
include_recipe 'openstack-ops-database::mariadb-client'

mariadb_server_install 'default' do
version node['openstack']['mariadb']['version']
version '11.0.2'
password super_password
setup_repo node['openstack']['mariadb']['setup_repo']
action [:install, :create]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

it do
expect(chef_run).to create_mariadb_galera_configuration('MariaDB Galera Configuration').with(
version: '10.3',
version: '11.0.2',
cluster_name: 'openstack',
gcomm_address: 'gcomm://',
wsrep_provider_options: { 'gcache.size': '512M', 'gmcast.listen_addr': 'tcp://127.0.0.1:4567' },
Expand Down
Loading