Skip to content

Commit b17017c

Browse files
committed
Revert "Add set -e on top of each bash script in cookbooks"
This reverts commit e6e4e95.
1 parent d13fbce commit b17017c

12 files changed

+3
-26
lines changed

recipes/_ganglia_install.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
group 'root'
4343
cwd Chef::Config[:file_cache_path]
4444
code <<-GANGLIA
45-
set -e
4645
tar xf #{ganglia_tarball}
4746
cd monitor-core-#{node['cfncluster']['ganglia']['version']}
4847
./bootstrap
@@ -98,7 +97,6 @@
9897
group 'root'
9998
cwd Chef::Config[:file_cache_path]
10099
code <<-GANGLIAWEB
101-
set -e
102100
tar xf #{ganglia_web_tarball}
103101
cd ganglia-web-#{node['cfncluster']['ganglia']['web_version']}
104102
make install APACHE_USER=#{node['cfncluster']['ganglia']['apache_user']}
@@ -130,7 +128,6 @@
130128
group 'root'
131129
cwd Chef::Config[:file_cache_path]
132130
code <<-GANGLIALICENSE
133-
set -e
134131
cd monitor-core-#{node['cfncluster']['ganglia']['version']}
135132
cp -v COPYING #{node['cfncluster']['license_dir']}/ganglia/COPYING
136133
GANGLIALICENSE

recipes/_master_base_config.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@
187187
bash "ssh-keygen" do
188188
cwd "/home/#{node['cfncluster']['cfn_cluster_user']}"
189189
code <<-KEYGEN
190-
set -e
191190
su - #{node['cfncluster']['cfn_cluster_user']} -c \"ssh-keygen -q -t rsa -f ~/.ssh/id_rsa -N ''\"
192191
KEYGEN
193192
not_if { ::File.exist?("/home/#{node['cfncluster']['cfn_cluster_user']}/.ssh/id_rsa") }
@@ -196,7 +195,6 @@
196195
bash "copy_and_perms" do
197196
cwd "/home/#{node['cfncluster']['cfn_cluster_user']}"
198197
code <<-PERMS
199-
set -e
200198
su - #{node['cfncluster']['cfn_cluster_user']} -c \"cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys && chmod 0600 ~/.ssh/authorized_keys && touch ~/.ssh/authorized_keys_cluster\"
201199
PERMS
202200
not_if { ::File.exist?("/home/#{node['cfncluster']['cfn_cluster_user']}/.ssh/authorized_keys_cluster") }
@@ -205,7 +203,6 @@
205203
bash "ssh-keyscan" do
206204
cwd "/home/#{node['cfncluster']['cfn_cluster_user']}"
207205
code <<-KEYSCAN
208-
set -e
209206
su - #{node['cfncluster']['cfn_cluster_user']} -c \"ssh-keyscan #{node['hostname']} > ~/.ssh/known_hosts && chmod 0600 ~/.ssh/known_hosts\"
210207
KEYSCAN
211208
not_if { ::File.exist?("/home/#{node['cfncluster']['cfn_cluster_user']}/.ssh/known_hosts") }

recipes/_master_sge_config.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,13 @@
5252

5353
bash "add_host_as_master" do
5454
code <<-ADDHOST
55-
set -e
5655
. /opt/sge/default/common/settings.sh
5756
qconf -as #{node['hostname']}
5857
ADDHOST
5958
end
6059

6160
bash "set_accounting_summary" do
6261
code <<-SETAS
63-
set -e
6462
. /opt/sge/default/common/settings.sh
6563
TMPFILE=/tmp/pe.txt
6664
qconf -sp mpi | grep -v 'accounting_summary' > $TMPFILE
@@ -73,7 +71,6 @@
7371
# Enable non-admin users to force delete a job
7472
bash "enable_forced_qdel" do
7573
code <<-ENABLEFORCEDQDEL
76-
set -e
7774
. /opt/sge/default/common/settings.sh
7875
/opt/sge/util/qconf_add_list_value -mconf qmaster_params ENABLE_FORCED_QDEL global
7976
ENABLEFORCEDQDEL

recipes/_master_torque_config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
# Run torque.setup
1919
bash "run-torque-setup" do
2020
code <<-SETUPTORQUE
21-
set -e
2221
. /etc/profile.d/torque.sh
2322
./torque.setup root
2423
SETUPTORQUE

recipes/awsbatch_config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
bash "install aws-parallelcluster-awsbatch-cli" do
4242
cwd Chef::Config[:file_cache_path]
4343
code <<-CLI
44-
set -e
4544
source /tmp/proxy.sh
4645
curl --retry 3 -v -L -o aws-parallelcluster.tgz #{node['cfncluster']['custom_awsbatchcli_package']}
4746
tar -xzf aws-parallelcluster.tgz

recipes/base_install.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
bash "install awscli" do
5757
cwd Chef::Config[:file_cache_path]
5858
code <<-CLI
59-
set -e
6059
curl --retry 5 --retry-delay 5 "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip"
6160
unzip awscli-bundle.zip
6261
./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws
@@ -121,13 +120,9 @@
121120
bash "install aws-parallelcluster-node" do
122121
cwd Chef::Config[:file_cache_path]
123122
code <<-NODE
124-
set -e
125123
[[ ":$PATH:" != *":/usr/local/bin:"* ]] && PATH="/usr/local/bin:${PATH}"
126124
echo "PATH is $PATH"
127-
PROXY_FILE=/tmp/proxy.sh
128-
if [ -f "$PROXY_FILE" ]; then
129-
source $PROXY_FILE
130-
fi
125+
source /tmp/proxy.sh
131126
source #{node['cfncluster']['node_virtualenv_path']}/bin/activate
132127
pip uninstall --yes aws-parallelcluster-node
133128
curl --retry 3 -v -L -o aws-parallelcluster-node.tgz #{node['cfncluster']['custom_node_package']}

recipes/dcv_config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ def allow_gpu_acceleration
4444
bash 'Launch X' do
4545
user 'root'
4646
code <<-SETUPX
47-
set -e
4847
systemctl set-default graphical.target
4948
systemctl isolate graphical.target &
5049
SETUPX

recipes/munge_install.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
group 'root'
4040
cwd Chef::Config[:file_cache_path]
4141
code <<-MUNGE
42-
set -e
4342
tar xf #{munge_tarball}
4443
cd munge-munge-#{node['cfncluster']['munge']['munge_version']}
4544
./bootstrap

recipes/sge_install.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
group 'root'
121121
cwd Chef::Config[:file_cache_path]
122122
code <<-SGELICENSE
123-
set -e
124123
cd sge-#{node['cfncluster']['sge']['version']}/LICENCES
125124
cp -v SISSL #{node['cfncluster']['license_dir']}/sge/SISSL
126125
SGELICENSE

recipes/slurm_install.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
group 'root'
6969
cwd Chef::Config[:file_cache_path]
7070
code <<-SLURMLICENSE
71-
set -e
7271
cd slurm-slurm-#{node['cfncluster']['slurm']['version']}
7372
cp -v COPYING #{node['cfncluster']['license_dir']}/slurm/COPYING
7473
cp -v DISCLAIMER #{node['cfncluster']['license_dir']}/slurm/DISCLAIMER

0 commit comments

Comments
 (0)