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.

Sign up for GitHub

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

Jump to bottom

2.1.1 #10

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

2.1.1 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13aa3f
2.1.1
kplimack Oct 10, 2017
8581a46
changelog
kplimack Oct 10, 2017
9b93aec
cops
kplimack Oct 10, 2017
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
1 change: 1 addition & 0 deletions .kitchen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ platforms:
- name: centos-6.6
attributes:
orchestrator:
configure_database: true
package:
version: 2.1.5-1
url: 'https://github.com/kplimack/orchestrator-rpm/raw/master/orchestrator-2.1.5-1.x86_64.rpm'
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# orchestrator

## 2.1.1
* `rubygems`, `ruby-devel` and `binutils` are only needed on cent/ruby1.x
* dont configure the database unless told to.

## 2.1.0
* use build-essential to install gcc,make, etc
* rubocop (.rubocop.yml added and files corrected)
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
default['orchestrator']['config']['SlaveStartPostWaitMilliseconds'] = 1000
default['orchestrator']['config']['UnseenInstanceForgetHours'] = 240
default['orchestrator']['root_db_pass'] = 'snakeoil'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd add something in the README about this new attribute as well and explain that 'if you set this to false, you better be setting the MySQLOrchestratorHost config to something. Or else that defaults to localhost and you now have a broken orchestrator

default['orchestrator']['configure_database'] = true

# leaving this set to 'nil' will set the package install to always "upgrade" to the latest version available.
# set this to a specific version in your wrapper-cookbook if you need a specific one.
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
source_url 'https://github.com/silviabotros/chef-orchestrator'
issues_url 'https://github.com/silviabotros/chef-orchestrator/issues'
chef_version '>= 12.5.0'
version '2.1.0'
version '2.1.1'

depends 'apt'
depends 'build-essential'
Expand Down
11 changes: 9 additions & 2 deletions recipes/_database_setup.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,18 @@
include_recipe 'percona::server'
include_recipe 'percona::client'

package 'ruby'

package case node['platform_family']
when 'rhel'
%w(ruby ruby-devel rubygems binutils)
if node['languages']['ruby']['ruby_bin'] == '/usr/bin/ruby' &&
node['languages']['ruby']['version'].to_i >= 2
[]
else
%w(ruby-devel rubygems binutils)
end
when 'debian'
%w(ruby ruby-dev libperconaserverclient18.1-dev)
%w(ruby-dev libperconaserverclient18.1-dev)
end

execute 'set root pass' do # ~FC037
Expand Down
2 changes: 1 addition & 1 deletion recipes/_package.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# limitations under the License.
#

include_recipe 'orchestrator::_database_setup'
include_recipe 'orchestrator::_database_setup' if node['orchestrator']['configure_database']

local_rpm = nil

Expand Down