summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
Diffstat (limited to 'inventory')
-rw-r--r--inventory/byo/hosts.example3
-rwxr-xr-xinventory/multi_ec2.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example
index 4c652d06e..629956d0e 100644
--- a/inventory/byo/hosts.example
+++ b/inventory/byo/hosts.example
@@ -57,6 +57,9 @@ deployment_type=enterprise
# default subdomain to use for exposed routes
#osm_default_subdomain=apps.test.example.com
+# additional cors origins
+#osm_custom_cors_origins=['foo.example.com', 'bar.example.com']
+
# host group for masters
[masters]
ose3-master[1:3]-ansible.test.example.com
diff --git a/inventory/multi_ec2.py b/inventory/multi_ec2.py
index b7ce9e5dc..2cbf33473 100755
--- a/inventory/multi_ec2.py
+++ b/inventory/multi_ec2.py
@@ -78,7 +78,7 @@ class MultiEc2(object):
},
]
- self.config['cache_max_age'] = 0
+ self.config['cache_max_age'] = 300
else:
raise RuntimeError("Could not find valid ec2 credentials in the environment.")