diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-03 14:26:35 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-03 14:26:35 -0500 |
| commit | fed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb (patch) | |
| tree | 15be332f118b29219e7f87287667d764e6ffe8fd | |
| parent | 5a3b4171f364ed05d8f9c630467938b6fdd60f64 (diff) | |
| parent | 5090e93a9af43996407dc36f6c2a549d7e83d787 (diff) | |
| download | openshift-fed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb.tar.gz openshift-fed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb.tar.bz2 openshift-fed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb.tar.xz openshift-fed63a0aeb5a90cf1894a3cd6a1db7d3321ad8eb.zip | |
Merge pull request #65 from lhuard1A/osx
Allows it to run on OSX
| -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 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/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 |