summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wiest <twiest@gmail.com>2014-10-31 17:28:10 -0400
committerThomas Wiest <twiest@gmail.com>2014-10-31 17:28:10 -0400
commit72a3a263733cc41534f6b3d6fd671680dcaebbcb (patch)
tree400ff81603320fb5911c31d938b7846f27fe781e
parentcb316a8e6527a5a33e6c7ea686b21c7992839bab (diff)
parent67ec7a9e5d72fb121de26488b370491b95b6c919 (diff)
downloadopenshift-72a3a263733cc41534f6b3d6fd671680dcaebbcb.tar.gz
openshift-72a3a263733cc41534f6b3d6fd671680dcaebbcb.tar.bz2
openshift-72a3a263733cc41534f6b3d6fd671680dcaebbcb.tar.xz
openshift-72a3a263733cc41534f6b3d6fd671680dcaebbcb.zip
Merge pull request #24 from twiest/pr
updated docs to have better setup instructions, fixed minor bugs, added envs for admiller (amint) and tdawson (tdint).
-rw-r--r--README.md2
-rw-r--r--lib/aws_command.rb2
-rw-r--r--lib/aws_helper.rb2
-rw-r--r--lib/gce_command.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/README.md b/README.md
index e872aae63..a57aa9702 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Setup
- Install base dependencies:
- Fedora:
```
- yum install ansible rubygem-parseconfig
+ yum install -y ansible rubygem-thor rubygem-parseconfig
```
- Setup for a specific cloud:
diff --git a/lib/aws_command.rb b/lib/aws_command.rb
index 865901585..1067547e0 100644
--- a/lib/aws_command.rb
+++ b/lib/aws_command.rb
@@ -7,7 +7,7 @@ module OpenShift
module Ops
class AwsCommand < Thor
# WARNING: we do not currently support environments with hyphens in the name
- SUPPORTED_ENVS = %w(prod stg int tint kint test jint)
+ SUPPORTED_ENVS = %w(prod stg int tint kint test jint amint tdint)
option :type, :required => true, :enum => LaunchHelper.get_aws_host_types,
:desc => 'The host type of the new instances.'
diff --git a/lib/aws_helper.rb b/lib/aws_helper.rb
index 8af39c834..2e90ba148 100644
--- a/lib/aws_helper.rb
+++ b/lib/aws_helper.rb
@@ -51,7 +51,7 @@ module OpenShift
def self.clear_inventory_cache()
path = "#{ENV['HOME']}/.ansible/tmp"
cache_files = ["#{path}/ansible-ec2.cache", "#{path}/ansible-ec2.index"]
- FileUtils.rm(cache_files)
+ FileUtils.rm_f(cache_files)
end
def self.generate_env_tag(env)
diff --git a/lib/gce_command.rb b/lib/gce_command.rb
index e8e00b746..384a90c0e 100644
--- a/lib/gce_command.rb
+++ b/lib/gce_command.rb
@@ -10,7 +10,7 @@ module OpenShift
module Ops
class GceCommand < Thor
# WARNING: we do not currently support environments with hyphens in the name
- SUPPORTED_ENVS = %w(prod stg int tint kint test jint)
+ SUPPORTED_ENVS = %w(prod stg int tint kint test jint amint tdint)
option :type, :required => true, :enum => LaunchHelper.get_gce_host_types,
:desc => 'The host type of the new instances.'