Merge branch 'master' of /git/ansible

This commit is contained in:
Rick Elrod 2017-07-19 19:41:40 +00:00
commit 3b6839868e
2 changed files with 6 additions and 0 deletions

View file

@ -227,6 +227,7 @@
openshift_shared_infra: true
openshift_deployment_type: "origin"
openshift_metrics_deploy: true
openshift_ansible_python_interpreter: "/usr/bin/python3"
when: env == 'staging'
tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
@ -251,6 +252,7 @@
openshift_shared_infra: true
openshift_deployment_type: "origin"
openshift_metrics_deploy: true
openshift_ansible_python_interpreter: "/usr/bin/python3"
when: env == 'staging'
tags: ['openshift-cluster','ansible-ansible-openshift-ansible']

View file

@ -28,6 +28,10 @@ containerized={{openshift_ansible_containerized_deploy}}
ansible_become=yes
{% endif %}
{% if openshift_ansible_python_interpreter is defined %}
ansible_python_interpreter={{openshift_ansible_python_interpreter}}
{% endif %}
# Debug level for all OpenShift components (Defaults to 2)
debug_level={{openshift_debug_level}}