summaryrefslogtreecommitdiffstats
path: root/inventory
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@afrolegs.com>2016-06-23 10:42:08 -0400
committerGitHub <noreply@github.com>2016-06-23 10:42:08 -0400
commitf049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d (patch)
tree6064ca09aacd92cc8bf96fd34b7b7702cc23d2e3 /inventory
parent3daab87371094b941f6511cd889e179357463e87 (diff)
parent9193a58d129716601091b2f3ceb7ca3960a694cb (diff)
downloadopenshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.gz
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.bz2
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.tar.xz
openshift-f049b5f36fbc7f8c0f2a33cdcd0af666b28c0d9d.zip
Merge pull request #2025 from abutcher/global-env
Per-service environment variables
Diffstat (limited to 'inventory')
-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 1e050f0f6..cddd5175c 100644
--- a/inventory/byo/hosts.aep.example
+++ b/inventory/byo/hosts.aep.example
@@ -410,6 +410,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 104c64c23..7c9c7152b 100644
--- a/inventory/byo/hosts.origin.example
+++ b/inventory/byo/hosts.origin.example
@@ -415,6 +415,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 ebac28fc6..55f9fa66c 100644
--- a/inventory/byo/hosts.ose.example
+++ b/inventory/byo/hosts.ose.example
@@ -410,6 +410,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