diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aws_command.rb | 2 | ||||
| -rw-r--r-- | lib/aws_helper.rb | 2 | ||||
| -rw-r--r-- | lib/gce_command.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/aws_command.rb b/lib/aws_command.rb index 0942c6e04..267513f37 100644 --- a/lib/aws_command.rb +++ b/lib/aws_command.rb @@ -114,7 +114,7 @@ module OpenShift desc "ssh", "Ssh to an instance" def ssh(*ssh_ops, host) - if host =~ /^([\w\d_.-]+)@([\w\d-_.]+)/ + if host =~ /^([\w\d_.\-]+)@([\w\d\-_.]+)/ user = $1 host = $2 end diff --git a/lib/aws_helper.rb b/lib/aws_helper.rb index 2e90ba148..4da5d0925 100644 --- a/lib/aws_helper.rb +++ b/lib/aws_helper.rb @@ -19,7 +19,7 @@ module OpenShift retval = [] hosts['_meta']['hostvars'].each do |host, info| retval << OpenStruct.new({ - :name => info['ec2_tag_Name'], + :name => info['ec2_tag_Name'] || 'UNSET', :env => info['ec2_tag_environment'] || 'UNSET', :public_ip => info['ec2_ip_address'], :public_dns => info['ec2_public_dns_name'], diff --git a/lib/gce_command.rb b/lib/gce_command.rb index cec1b9c2b..214cc1c05 100644 --- a/lib/gce_command.rb +++ b/lib/gce_command.rb @@ -143,7 +143,7 @@ module OpenShift :desc => 'A relative path where files are written to.' desc "scp_from", "scp files from an instance" def scp_from(*ssh_ops, host) - if host =~ /^([\w\d_.-]+)@([\w\d-_.]+)$/ + if host =~ /^([\w\d_.\-]+)@([\w\d\-_.]+)$/ user = $1 host = $2 end @@ -175,7 +175,7 @@ module OpenShift desc "ssh", "Ssh to an instance" def ssh(*ssh_ops, host) - if host =~ /^([\w\d_.-]+)@([\w\d-_.]+)/ + if host =~ /^([\w\d_.\-]+)@([\w\d\-_.]+)/ user = $1 host = $2 end |