summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorMatt Woodson <mwoodson@gmail.com>2016-01-18 15:08:03 -0500
committerMatt Woodson <mwoodson@gmail.com>2016-01-18 15:08:03 -0500
commit3bed4d0c4bda1b6332ec547502663d09e98b89d1 (patch)
treef64e0d0c7e9bc06a76d727050047053cf1a30a6a /inventory
parent0bbfef4e1951db1f19135e532f78fe12cab6d4fc (diff)
parentee3aec770b6b1a2b0212b432a920e3d846e56044 (diff)
downloadopenshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.gz
openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.bz2
openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.tar.xz
openshift-3bed4d0c4bda1b6332ec547502663d09e98b89d1.zip
Merge pull request #1214 from openshift/master
Merge master into prod
Diffstat (limited to 'inventory')
-rw-r--r--inventory/aws/hosts/ec2.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/inventory/aws/hosts/ec2.ini b/inventory/aws/hosts/ec2.ini
index 1f503b8cf..aa0f9090f 100644
--- a/inventory/aws/hosts/ec2.ini
+++ b/inventory/aws/hosts/ec2.ini
@@ -45,10 +45,10 @@ vpc_destination_variable = ip_address
route53 = False
# To exclude RDS instances from the inventory, uncomment and set to False.
-#rds = False
+rds = False
# To exclude ElastiCache instances from the inventory, uncomment and set to False.
-#elasticache = False
+elasticache = False
# Additionally, you can specify the list of zones to exclude looking up in
# 'route53_excluded_zones' as a comma-separated list.