diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-28 08:52:20 -0300 |
| commit | dd2506e325d1a2858da353f96251f093e94bbcf3 (patch) | |
| tree | 132ea0fd3eb8eb707ae396a7e1cbe7abea21e418 /roles/openshift_master_facts | |
| parent | f004b526078b78b0ba9435b82af4d4f4d42de5e2 (diff) | |
| parent | bf520e46e6916a4c9995ea95fa40cdd25f31209e (diff) | |
| download | openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.gz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.bz2 openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.tar.xz openshift-dd2506e325d1a2858da353f96251f093e94bbcf3.zip | |
Merge branch 'master' into upgrade33
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index d51c5a0a3..3377e29e6 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -78,3 +78,5 @@ image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}" dynamic_provisioning_enabled: "{{ openshift_master_dynamic_provisioning_enabled | default(None) }}" max_requests_inflight: "{{ openshift_master_max_requests_inflight | default(None) }}" + api_env_vars: "{{ openshift_master_api_env_vars | default(None) }}" + controllers_env_vars: "{{ openshift_master_controllers_env_vars | default(None) }}" |