Skip to content

Commit 3772c5b

Browse files
khaefeliflorindragos
authored andcommitted
Fix frozen string errors for tasks (#499)
1 parent 28265e6 commit 3772c5b

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

tasks/swarm_init.rb

+9-9
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
def swarm_init(advertise_addr, autolock, cert_expiry, dispatcher_heartbeat, external_ca, force_new_cluster, listen_addr, max_snapshots, snapshot_interval)
99
cmd_string = 'docker swarm init'
10-
cmd_string << " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
11-
cmd_string << ' --autolock' unless autolock.nil?
12-
cmd_string << ' --cert-expiry' unless cert_expiry.nil?
13-
cmd_string << " --dispatcher-heartbeat=#{dispatcher_heartbeat}" unless dispatcher_heartbeat.nil?
14-
cmd_string << " --external-ca=#{external_ca}" unless external_ca.nil?
15-
cmd_string << ' --force-new-cluster' unless force_new_cluster.nil?
16-
cmd_string << " --listen-addr=#{listen_addr}" unless listen_addr.nil?
17-
cmd_string << " --max-snapshots=#{max_snapshots}" unless max_snapshots.nil?
18-
cmd_string << " --snapshot-interval=#{snapshot_interval}" unless snapshot_interval.nil?
10+
cmd_string += " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
11+
cmd_string += ' --autolock' unless autolock.nil?
12+
cmd_string += ' --cert-expiry' unless cert_expiry.nil?
13+
cmd_string += " --dispatcher-heartbeat=#{dispatcher_heartbeat}" unless dispatcher_heartbeat.nil?
14+
cmd_string += " --external-ca=#{external_ca}" unless external_ca.nil?
15+
cmd_string += ' --force-new-cluster' unless force_new_cluster.nil?
16+
cmd_string += " --listen-addr=#{listen_addr}" unless listen_addr.nil?
17+
cmd_string += " --max-snapshots=#{max_snapshots}" unless max_snapshots.nil?
18+
cmd_string += " --snapshot-interval=#{snapshot_interval}" unless snapshot_interval.nil?
1919

2020
stdout, stderr, status = Open3.capture3(cmd_string)
2121
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0

tasks/swarm_join.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
def swarm_join(advertise_addr, listen_addr, token, manager_ip)
99
cmd_string = 'docker swarm join'
10-
cmd_string << " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
11-
cmd_string << " --listen-addr=#{listen_addr}" unless listen_addr.nil?
12-
cmd_string << " --token=#{token}" unless token.nil?
13-
cmd_string << " #{manager_ip}" unless manager_ip.nil?
10+
cmd_string += " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
11+
cmd_string += " --listen-addr=#{listen_addr}" unless listen_addr.nil?
12+
cmd_string += " --token=#{token}" unless token.nil?
13+
cmd_string += " #{manager_ip}" unless manager_ip.nil?
1414

1515
stdout, stderr, status = Open3.capture3(cmd_string)
1616
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0

tasks/swarm_leave.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
def swarm_leave(force)
99
cmd_string = 'docker swarm leave '
10-
cmd_string << ' -f' if force == 'true'
10+
cmd_string += ' -f' if force == 'true'
1111
stdout, stderr, status = Open3.capture3(cmd_string)
1212
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0
1313
stdout.strip

tasks/swarm_update.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
def swarm_update(image, service)
99
cmd_string = 'docker service update'
10-
cmd_string << " --image #{image}" unless image.nil?
11-
cmd_string << " #{service}" unless service.nil?
10+
cmd_string += " --image #{image}" unless image.nil?
11+
cmd_string += " #{service}" unless service.nil?
1212

1313
stdout, stderr, status = Open3.capture3(cmd_string)
1414
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0

0 commit comments

Comments
 (0)