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

Tasks frozen string #499

Merged
merged 2 commits into from
Jun 24, 2019
Merged

Tasks frozen string #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82ce87b
Merge pull request #1 from puppetlabs/master
khaefeli Jun 21, 2019
a1d7442
:bug: Fix frozen string errors for tasks
khaefeli Jun 21, 2019
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
18 changes: 9 additions & 9 deletions tasks/swarm_init.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

def swarm_init(advertise_addr, autolock, cert_expiry, dispatcher_heartbeat, external_ca, force_new_cluster, listen_addr, max_snapshots, snapshot_interval)
cmd_string = 'docker swarm init'
cmd_string << " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
cmd_string << ' --autolock' unless autolock.nil?
cmd_string << ' --cert-expiry' unless cert_expiry.nil?
cmd_string << " --dispatcher-heartbeat=#{dispatcher_heartbeat}" unless dispatcher_heartbeat.nil?
cmd_string << " --external-ca=#{external_ca}" unless external_ca.nil?
cmd_string << ' --force-new-cluster' unless force_new_cluster.nil?
cmd_string << " --listen-addr=#{listen_addr}" unless listen_addr.nil?
cmd_string << " --max-snapshots=#{max_snapshots}" unless max_snapshots.nil?
cmd_string << " --snapshot-interval=#{snapshot_interval}" unless snapshot_interval.nil?
cmd_string += " --advertise-addr=#{advertise_addr}" unless advertise_addr.nil?
cmd_string += ' --autolock' unless autolock.nil?
cmd_string += ' --cert-expiry' unless cert_expiry.nil?
cmd_string += " --dispatcher-heartbeat=#{dispatcher_heartbeat}" unless dispatcher_heartbeat.nil?
cmd_string += " --external-ca=#{external_ca}" unless external_ca.nil?
cmd_string += ' --force-new-cluster' unless force_new_cluster.nil?
cmd_string += " --listen-addr=#{listen_addr}" unless listen_addr.nil?
cmd_string += " --max-snapshots=#{max_snapshots}" unless max_snapshots.nil?
cmd_string += " --snapshot-interval=#{snapshot_interval}" unless snapshot_interval.nil?

stdout, stderr, status = Open3.capture3(cmd_string)
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0
Expand Down
8 changes: 4 additions & 4 deletions tasks/swarm_join.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

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

stdout, stderr, status = Open3.capture3(cmd_string)
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0
Expand Down
2 changes: 1 addition & 1 deletion tasks/swarm_leave.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

def swarm_leave(force)
cmd_string = 'docker swarm leave '
cmd_string << ' -f' if force == 'true'
cmd_string += ' -f' if force == 'true'
stdout, stderr, status = Open3.capture3(cmd_string)
raise Puppet::Error, "stderr: '#{stderr}'" if status != 0
stdout.strip
Expand Down
4 changes: 2 additions & 2 deletions tasks/swarm_update.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

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

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