From 26da8055eaf30505824a8d237e2eda8ba64ba2cf Mon Sep 17 00:00:00 2001 From: BruceCutler Date: Mon, 31 Jul 2017 15:44:21 -0400 Subject: [PATCH 1/3] amazon-linux-platform-family Updating case statements to include amazon as a platform_family. Keeping platform option in package_repo.rb for backwards compat --- attributes/default.rb | 2 +- recipes/mms_automation_agent.rb | 4 ++-- recipes/mms_monitoring_agent.rb | 4 ++-- recipes/package_repo.rb | 5 ++++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index fdfc912..6df70cc 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -39,7 +39,7 @@ # Default attribute for MongoDB installation case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' mongo_user = 'mongod' mongo_group = 'mongod' mongo_dbpath = '/var/lib/mongo' diff --git a/recipes/mms_automation_agent.rb b/recipes/mms_automation_agent.rb index 03ce479..04414b6 100644 --- a/recipes/mms_automation_agent.rb +++ b/recipes/mms_automation_agent.rb @@ -24,7 +24,7 @@ # Set variables by platform case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' mms_agent_source = 'https://cloud.mongodb.com/download/agent/automation/mongodb-mms-automation-agent-manager-latest.x86_64.rpm' mms_agent_file = '/root/mongodb-mms-automation-agent-manager-latest.x86_64.rpm' when 'debian' @@ -48,7 +48,7 @@ # Install package case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' rpm_package 'mongodb-mms-automation-agent-manager' do source mms_agent_file action :install diff --git a/recipes/mms_monitoring_agent.rb b/recipes/mms_monitoring_agent.rb index 02f595b..812c99a 100644 --- a/recipes/mms_monitoring_agent.rb +++ b/recipes/mms_monitoring_agent.rb @@ -24,7 +24,7 @@ # Set variables by platform case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' mms_agent_source = 'https://cloud.mongodb.com/download/agent/monitoring/mongodb-mms-monitoring-agent-latest.x86_64.rpm' mms_agent_file = '/root/mongodb-mms-monitoring-agent-latest.x86_64.rpm' when 'debian' @@ -45,7 +45,7 @@ # Install package case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' rpm_package 'mongodb-mms-monitoring-agent' do source mms_agent_file action :install diff --git a/recipes/package_repo.rb b/recipes/package_repo.rb index 6d774e0..1c4db8e 100644 --- a/recipes/package_repo.rb +++ b/recipes/package_repo.rb @@ -27,6 +27,9 @@ if node['platform'] == 'amazon' pkg_version = "#{node['mongodb3']['version']}-1.amzn1" # ~FC019 end + when 'amazon' + pkg_version = "#{node['mongodb3']['version']}-1.amzn1" # ~FC019 + end end # Setup default package repo url attribute for each platform family or platform @@ -85,7 +88,7 @@ # Add the MongoDB Package repository case node['platform_family'] - when 'rhel', 'fedora' + when 'rhel', 'fedora', 'amazon' yum_repository "mongodb-org-#{pkg_major_version}" do description 'MongoDB Repository' baseurl node['mongodb3']['package']['repo']['url'] From bce4305875e0e8d63f02be5f7b1982b01dacdf72 Mon Sep 17 00:00:00 2001 From: BruceCutler Date: Mon, 31 Jul 2017 15:53:22 -0400 Subject: [PATCH 2/3] amazon-linux-platform-family Fixing error in case statement --- recipes/package_repo.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/package_repo.rb b/recipes/package_repo.rb index 1c4db8e..5378982 100644 --- a/recipes/package_repo.rb +++ b/recipes/package_repo.rb @@ -29,7 +29,6 @@ end when 'amazon' pkg_version = "#{node['mongodb3']['version']}-1.amzn1" # ~FC019 - end end # Setup default package repo url attribute for each platform family or platform From d8285b73fb273fde36ae853b64a4e0addc5bde03 Mon Sep 17 00:00:00 2001 From: BruceCutler Date: Wed, 2 Aug 2017 15:53:50 -0400 Subject: [PATCH 3/3] amazon-linux-platform-family Updates to remove deprecated node.set operations --- metadata.rb | 4 +++- recipes/mongos.rb | 2 +- recipes/package_repo.rb | 14 +++++++------- test/cookbooks/mongodb3-test/recipes/custom.rb | 4 ++-- .../cookbooks/mongodb3-test/recipes/default-30x.rb | 8 ++++---- .../recipes/mms_automation_agent_with_data_bag.rb | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/metadata.rb b/metadata.rb index 88556e1..0f7f6cd 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,9 @@ license 'Apache 2.0' description 'Installs/Configures mongodb3' long_description 'Installs/Configures mongodb3' -version '5.3.0' + +version '5.3.0' +chef_version '>= 12', '< 14.0' supports 'ubuntu', '>= 12.04' supports 'debian', '= 7.8' diff --git a/recipes/mongos.rb b/recipes/mongos.rb index 175595e..e833789 100644 --- a/recipes/mongos.rb +++ b/recipes/mongos.rb @@ -72,7 +72,7 @@ action :create end # Set `['runit']['prefer_local_yum'] = true` to avoid install yum repository through packagecloud cookbook - node.set['runit']['prefer_local_yum'] = true + node.override['runit']['prefer_local_yum'] = true end # Install runit service package through runit::default recipe diff --git a/recipes/package_repo.rb b/recipes/package_repo.rb index 5378982..b44f623 100644 --- a/recipes/package_repo.rb +++ b/recipes/package_repo.rb @@ -55,34 +55,34 @@ # MongoDB package version to install if node['mongodb3']['package']['version'].nil? - node.set['mongodb3']['package']['version'] = pkg_version + node.override['mongodb3']['package']['version'] = pkg_version end # MongoDB package repo url if node['mongodb3']['package']['repo']['url'].nil? - node.set['mongodb3']['package']['repo']['url'] = pkg_repo + node.override['mongodb3']['package']['repo']['url'] = pkg_repo end # MongoDB repository name if node['mongodb3']['package']['repo']['apt']['name'].nil? - node.set['mongodb3']['package']['repo']['apt']['name'] = pkg_major_version.to_s + node.override['mongodb3']['package']['repo']['apt']['name'] = pkg_major_version.to_s end # MongoDB apt keyserver and key if node['mongodb3']['package']['repo']['apt']['keyserver'].nil? - node.set['mongodb3']['package']['repo']['apt']['keyserver'] = apt_repo_keyserver + node.override['mongodb3']['package']['repo']['apt']['keyserver'] = apt_repo_keyserver end if node['mongodb3']['package']['repo']['apt']['key'].nil? if pkg_major_version >= 3.2 - node.set['mongodb3']['package']['repo']['apt']['key'] = 'EA312927' + node.override['mongodb3']['package']['repo']['apt']['key'] = 'EA312927' else - node.set['mongodb3']['package']['repo']['apt']['key'] = '7F0CEB10' + node.override['mongodb3']['package']['repo']['apt']['key'] = '7F0CEB10' end end if node['mongodb3']['package']['repo']['apt']['components'].nil? - node.set['mongodb3']['package']['repo']['apt']['components'] = apt_repo_component + node.override['mongodb3']['package']['repo']['apt']['components'] = apt_repo_component end # Add the MongoDB Package repository diff --git a/test/cookbooks/mongodb3-test/recipes/custom.rb b/test/cookbooks/mongodb3-test/recipes/custom.rb index 26bcfd3..bcbb180 100644 --- a/test/cookbooks/mongodb3-test/recipes/custom.rb +++ b/test/cookbooks/mongodb3-test/recipes/custom.rb @@ -17,7 +17,7 @@ # limitations under the License. # -node.set['mongodb3']['config']['mongod']['storage']['dbPath'] = '/var/lib/mongodb/custom' -node.set['mongodb3']['config']['mongod']['systemLog']['path'] = '/var/log/mongodb/custom/mongod.log' +node.override['mongodb3']['config']['mongod']['storage']['dbPath'] = '/var/lib/mongodb/custom' +node.override['mongodb3']['config']['mongod']['systemLog']['path'] = '/var/log/mongodb/custom/mongod.log' include_recipe 'mongodb3::default' diff --git a/test/cookbooks/mongodb3-test/recipes/default-30x.rb b/test/cookbooks/mongodb3-test/recipes/default-30x.rb index e2f5b24..36359a1 100644 --- a/test/cookbooks/mongodb3-test/recipes/default-30x.rb +++ b/test/cookbooks/mongodb3-test/recipes/default-30x.rb @@ -17,11 +17,11 @@ # limitations under the License. # -node.set['mongodb3']['version'] = '3.0.11' +node.override['mongodb3']['version'] = '3.0.11' # For package upgrade testing : executing converge twice with different version -# node.set['mongodb3']['version'] = '3.2.4' -# node.set['mongodb3']['package']['version'] = '3.2.4' -# node.set['mongodb3']['package']['repo']['apt']['name'] = '3.2' +# node.override['mongodb3']['version'] = '3.2.4' +# node.override['mongodb3']['package']['version'] = '3.2.4' +# node.override['mongodb3']['package']['repo']['apt']['name'] = '3.2' include_recipe 'mongodb3::default' diff --git a/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb b/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb index 8d2c80b..a43c754 100644 --- a/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb +++ b/test/cookbooks/mongodb3-test/recipes/mms_automation_agent_with_data_bag.rb @@ -34,7 +34,7 @@ mms_data_bag_item = Chef::EncryptedDataBagItem.load('mongodb', 'mms-agent') mms_data_bag = mms_data_bag_item['environments'][node.chef_environment] -node.set['mongodb3']['config']['mms']['mmsGroupId'] = mms_data_bag['mms_group_id'] -node.set['mongodb3']['config']['mms']['mmsApiKey'] = mms_data_bag['mms_api_key'] +node.override['mongodb3']['config']['mms']['mmsGroupId'] = mms_data_bag['mms_group_id'] +node.override['mongodb3']['config']['mms']['mmsApiKey'] = mms_data_bag['mms_api_key'] include_recipe 'mongodb3::mms_automation_agent'