diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | README_AWS.md | 5 | ||||
| -rw-r--r-- | lib/aws_command.rb | 2 | ||||
| -rw-r--r-- | lib/gce_command.rb | 4 |
4 files changed, 15 insertions, 4 deletions
@@ -10,7 +10,13 @@ Setup ``` yum install -y ansible rubygem-thor rubygem-parseconfig util-linux ``` - + - OSX: + ``` + # Install ansible and python 2 + brew install ansible python + # Required ruby gems + gem install thor parseconfig + ``` - Setup for a specific cloud: - [AWS](README_AWS.md) - [GCE](README_GCE.md) diff --git a/README_AWS.md b/README_AWS.md index c0f2bce75..fa1ec61ce 100644 --- a/README_AWS.md +++ b/README_AWS.md @@ -38,9 +38,14 @@ Alternatively, you can configure your ssh-agent to hold the credentials to conne Install Dependencies -------------------- 1. Ansible requires python-boto for aws operations: +RHEL/CentOS/Fedora ``` yum install -y ansible python-boto ``` +OSX: +``` + pip install -U boto +``` Test The Setup diff --git a/lib/aws_command.rb b/lib/aws_command.rb index 1205fd5f7..17f33fbed 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/gce_command.rb b/lib/gce_command.rb index b0a84d27b..ac01a7f00 100644 --- a/lib/gce_command.rb +++ b/lib/gce_command.rb @@ -137,7 +137,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 @@ -169,7 +169,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 |