infrastructure/ansible
1
0
Fork 0
Code Pull requests 7 Activity Actions

try and change this

Browse source
This commit is contained in:
Kevin Fenzi 2017-05-11 14:58:11 +00:00
parent e9f3869973
commit 7176b47209
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@
openshift_cluster_url: "{{os_url}}", openshift_cluster_url: "{{os_url}}",
openshift_master_ha: false, openshift_master_ha: false,
openshift_debug_level: 2, openshift_debug_level: 2,
openshift_deployment_type: "origin", openshift_deployment_type: "openshift-enterprise",
openshift_cluster_url: "{{ os_url}}", openshift_cluster_url: "{{ os_url}}",
openshift_app_subdomain: "{{ os_app_url }}", openshift_app_subdomain: "{{ os_app_url }}",
when: env == 'staging', when: env == 'staging',

2
roles/ansible-ansible-openshift-ansible/defaults/main.yml
View file

@ -43,7 +43,7 @@ openshift_release: "v1.5.0"
# Possible options: # Possible options:
# origin # origin
# openshift-enterprise # openshift-enterprise
openshift_deployment_type: origin deployment_type: origin
# Install the OpenShift App Examples (value should be "true" or "false") # Install the OpenShift App Examples (value should be "true" or "false")
openshift_ansible_install_examples: false openshift_ansible_install_examples: false

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

@ -33,7 +33,7 @@ ansible_become=yes
debug_level={{openshift_debug_level}} debug_level={{openshift_debug_level}}
# Specify the deployment type. Valid values are origin and openshift-enterprise. # Specify the deployment type. Valid values are origin and openshift-enterprise.
openshift_deployment_type={{openshift_deployment_type}} deployment_type={{openshift_deployment_type}}
# Specify the generic release of OpenShift to install. This is used mainly just during installation, after which we # Specify the generic release of OpenShift to install. This is used mainly just during installation, after which we
# rely on the version running on the first master. Works best for containerized installs where we can usually # rely on the version running on the first master. Works best for containerized installs where we can usually
@ -235,7 +235,11 @@ openshift_master_cluster_public_hostname={{openshift_cluster_url}}
#osm_api_server_args={'max-requests-inflight': ['400']} #osm_api_server_args={'max-requests-inflight': ['400']}
# default subdomain to use for exposed routes # default subdomain to use for exposed routes
{% if openshift_app_subdomain is defined %}
{% if openshift_app_subdomain %}
openshift_master_default_subdomain={{openshift_app_subdomain}} openshift_master_default_subdomain={{openshift_app_subdomain}}
{% endif %}
{% endif %}
# additional cors origins # additional cors origins
#osm_custom_cors_origins=['foo.example.com', 'bar.example.com'] #osm_custom_cors_origins=['foo.example.com', 'bar.example.com']