Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-10-11 04:56:32 +00:00
commit 3105212a76
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/groups/os-cluster.yml
View file

@ -145,6 +145,7 @@
openshift_api_port: 443, openshift_api_port: 443,
openshift_console_port: 443, openshift_console_port: 443,
openshift_shared_infra: true, openshift_shared_infra: true,
when: env != 'staging',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
} }

4
roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2
View file

@ -761,11 +761,13 @@ openshift_master_console_port={{openshift_console_port}}
# each OpenShift service: node, master (api and controllers). # each OpenShift service: node, master (api and controllers).
# API and controllers environment variables are merged in single # API and controllers environment variables are merged in single
# master environments. # master environments.
{% if defined no_http2 and no_http2 %} {% if no_http2 is defined %}
{% if no_http2 %}
openshift_master_api_env_vars={"ENABLE_HTTP2": "true"} openshift_master_api_env_vars={"ENABLE_HTTP2": "true"}
openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"} openshift_master_controllers_env_vars={"ENABLE_HTTP2": "true"}
openshift_node_env_vars={"ENABLE_HTTP2": "true"} openshift_node_env_vars={"ENABLE_HTTP2": "true"}
{% endif %} {% endif %}
{% endif %}
# Enable API service auditing, available as of 3.2 # Enable API service auditing, available as of 3.2
#openshift_master_audit_config={"enabled": true} #openshift_master_audit_config={"enabled": true}