summaryrefslogtreecommitdiffstats
path: root/inventory/byo
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
committerDevan Goodwin <dgoodwin@redhat.com>2016-06-28 08:52:20 -0300
commitdd2506e325d1a2858da353f96251f093e94bbcf3 (patch)
tree132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /inventory/byo
parentf004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff)
parentbf520e46e6916a4c9995ea95fa40cdd25f31209e (diff)
downloadopenshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz
openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip
Merge branch 'master' into upgrade33
Diffstat (limited to 'inventory/byo')
-rw-r--r--inventory/byo/hosts.aep.example9
-rw-r--r--inventory/byo/hosts.origin.example9
-rw-r--r--inventory/byo/hosts.ose.example9
3 files changed, 27 insertions, 0 deletions
diff --git a/inventory/byo/hosts.aep.example b/inventory/byo/hosts.aep.example
index 0f7998008..a4f730bc0 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -434,6 +434,15 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# Configure usage of openshift_clock role.
#openshift_clock_enabled=true
+# OpenShift Per-Service Environment Variables
+# Environment variables are added to /etc/sysconfig files for
+# each OpenShift service: node, master (api and controllers).
+# API and controllers environment variables are merged in single
+# master environments.
+#openshift_master_api_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_node_env_vars={"ENABLE_HTTP2": "true"}
+
# host group for masters
[masters]
aep3-master[1:3]-ansible.test.example.com
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example
index 27dd5a575..5b17bbe71 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -439,6 +439,15 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# Configure usage of openshift_clock role.
#openshift_clock_enabled=true
+# OpenShift Per-Service Environment Variables
+# Environment variables are added to /etc/sysconfig files for
+# each OpenShift service: node, master (api and controllers).
+# API and controllers environment variables are merged in single
+# master environments.
+#openshift_master_api_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_node_env_vars={"ENABLE_HTTP2": "true"}
+
# host group for masters
[masters]
ose3-master[1:3]-ansible.test.example.com
diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example
index 1831b0bae..e74474b58 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -434,6 +434,15 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
# Configure usage of openshift_clock role.
#openshift_clock_enabled=true
+# OpenShift Per-Service Environment Variables
+# Environment variables are added to /etc/sysconfig files for
+# each OpenShift service: node, master (api and controllers).
+# API and controllers environment variables are merged in single
+# master environments.
+#openshift_master_api_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"}
+#openshift_node_env_vars={"ENABLE_HTTP2": "true"}
+
# host group for masters
[masters]
ose3-master[1:3]-ansible.test.example.com