Merge branch 'master' into openstack-os-build

crowbar · Mar 19, 2012 · 23b629b · 23b629b
2 parents 257d45d + df3fc49
commit 23b629b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/redhat-common/chef_install_lib.sh b/redhat-common/chef_install_lib.sh
@@ -44,7 +44,7 @@ bring_up_chef() {
     killall chef-client
     log_to yum yum -q -y install rubygem-chef-server \
         curl-devel ruby-shadow patch
-    (cd "$DVD_PATH/extra/patches"; ./patch.sh) || exit 1
+    (cd "$DVD_PATH/extra/patches"; chmod +x ./patch.sh; ./patch.sh) || exit 1
     # Default password in chef webui to password
     sed -i 's/web_ui_admin_default_password ".*"/web_ui_admin_default_password "password"/' /etc/chef/webui.rb
     ./start-chef-server.sh

diff --git a/ubuntu-common/chef_install_lib.sh b/ubuntu-common/chef_install_lib.sh
@@ -38,7 +38,7 @@ bring_up_chef() {
     service chef-client stop
     killall chef-client
     log_to apt apt-get -y install chef-server chef-server-webui
-    (cd "$DVD_PATH/extra/patches"; ./patch.sh) || exit 1
+    (cd "$DVD_PATH/extra/patches"; chmod +x ./patch.sh ; ./patch.sh) || exit 1
     # increase chef-solr index field size
     perl -i -ne 'if ($_ =~ /<maxFieldLength>(.*)<\/maxFieldLength>/){ print "<maxFieldLength>200000</maxFieldLength> \n" } else { print } '  /var/lib/chef/solr/conf/solrconfig.xml