Skip to content
This repository has been archived by the owner on May 20, 2020. It is now read-only.

Updating case statements to include amazon as a platform family (as used in Chef 13) #62

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
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
Prev Previous commit
amazon-linux-platform-family Updates to remove deprecated node.set op…
…erations
BruceCutler committed Aug 2, 2017
commit d8285b73fb273fde36ae853b64a4e0addc5bde03
4 changes: 3 additions & 1 deletion metadata.rb
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion recipes/mongos.rb
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions recipes/package_repo.rb
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions test/cookbooks/mongodb3-test/recipes/custom.rb
Original file line number Diff line number Diff line change
@@ -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'
8 changes: 4 additions & 4 deletions test/cookbooks/mongodb3-test/recipes/default-30x.rb
Original file line number Diff line number Diff line change
@@ -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'
Original file line number Diff line number Diff line change
@@ -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'