Skip to content

Fixed Omnibus Installation for RHEL #60

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

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

Fixed Omnibus Installation for RHEL #60

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6fd84c
Updated a string/name used to check for the location of an installed …
Azrael808 Jan 14, 2015
a88187e
Using a variable in conjunction with the to correctly reconfigure o…
Azrael808 Jan 14, 2015
e5fe2b9
Ensuring that patch is installed on EL before attempting to patch knife.
Azrael808 Jan 14, 2015
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
13 changes: 9 additions & 4 deletions lib/chef/knife/bootstrap/_omnibus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ failed_download() {
is_server_installed() {
if [ -f "/opt/chef-server/bin/chef-server-ctl" ] ; then
return 0
elif [ -f "/opt/opscode/bin/chef-server-ctl" ] ; then
elif [ -f "/opt/opscode/bin/private-chef-ctl" ] ; then
return 0
else
return 1
Expand Down Expand Up @@ -107,8 +107,10 @@ install_package() {
detect_info() {
if [ -f "/opt/chef-server/bin/chef-server-ctl" ] ; then
server_root="/opt/chef-server"
elif [ -f "/opt/opscode/bin/chef-server-ctl" ] ; then
server_ctl="chef-server-ctl"
elif [ -f "/opt/opscode/bin/private-chef-ctl" ] ; then
server_root="/opt/opscode"
server_ctl="private-chef-ctl"
fi

info "Chef Server detected in $server_root"
Expand All @@ -122,6 +124,9 @@ patch_knife_code() {
if [ -f "$patched" ]; then
info "Patched knife configure detected, skipping"
elif echo "$script" | $server_root/embedded/bin/ruby -r chef/version; then
if [[ "$platform" == "el" ]]; then
yum install -y patch
fi
info "Patching knife configure bug (CHEF-5211)"
(cd $gems/chef-11.* && cat <<PATCH | tr "#" "\047" | patch -p1)
diff --git a/lib/chef/knife/configure.rb b/lib/chef/knife/configure.rb
Expand Down Expand Up @@ -169,13 +174,13 @@ symlink_binaries() {

reconfigure_chef_server() {
banner "Reconfiguring Chef Server"
chef-server-ctl reconfigure
${server_root}/bin/${server_ctl} reconfigure
info "Server reconfigured"
}

test_chef_server() {
banner "Testing Chef Server"
chef-server-ctl test
${server_root}/bin/${server_ctl} test
info "Pedant suite finished"
}

Expand Down