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

properly handle shared infra nodes for openshift in a-a-o-a role template

Browse source 
Signed-off-by: Adam Miller <admiller@redhat.com>
This commit is contained in:
Adam Miller 2017-05-12 03:19:04 +00:00
parent 2b365b3c32
commit 1412c9c987
4 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,6 +110,7 @@
openshift_internal_cluster_url: "os-masters{{ env_suffix }}.phx2.fedoraproject.org", openshift_internal_cluster_url: "os-masters{{ env_suffix }}.phx2.fedoraproject.org",
openshift_api_port: 443, openshift_api_port: 443,
openshift_console_port: 443, openshift_console_port: 443,
openshift_shared_infra: true,
when: env == 'staging', when: env == 'staging',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
} }

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

@ -215,6 +215,7 @@
openshift_cluster_url: "{{osbs_url}}", openshift_cluster_url: "{{osbs_url}}",
openshift_master_ha: false, openshift_master_ha: false,
openshift_debug_level: 2, openshift_debug_level: 2,
openshift_shared_infra: true,
openshift_deployment_type: "origin", openshift_deployment_type: "origin",
when: env == 'staging', when: env == 'staging',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] tags: ['openshift-cluster','ansible-ansible-openshift-ansible']
@ -238,6 +239,7 @@
openshift_cluster_url: "{{osbs_url}}", openshift_cluster_url: "{{osbs_url}}",
openshift_master_ha: false, openshift_master_ha: false,
openshift_debug_level: 2, openshift_debug_level: 2,
openshift_shared_infra: true,
openshift_deployment_type: "origin", openshift_deployment_type: "origin",
when: env == 'production', when: env == 'production',
tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] tags: ['openshift-cluster','ansible-ansible-openshift-ansible']

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

@ -23,6 +23,9 @@ openshift_auth_profile: osbs
# and won't be bound to the docker daemon. # and won't be bound to the docker daemon.
openshift_ansible_containerized_deploy: false openshift_ansible_containerized_deploy: false
# This will co-host the infra nodes with the primary nodes
openshift_shared_infra: false
# OpenShift Cluster URL # OpenShift Cluster URL
# Example: openshift.fedoraproject.org # Example: openshift.fedoraproject.org
openshift_cluster_url: None openshift_cluster_url: None

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

@ -784,6 +784,24 @@ openshift_master_console_port={{openshift_console_port}}
{{ host }} {{ host }}
{% endfor %} {% endfor %}
{% if openshift_shared_infra is defined %}
{% if openshift_shared_infra %}
[lb]
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} containerized=false
{% endfor %}
[nodes]
{% for host in groups[openshift_cluster_masters_group] %}
{{ host }} openshift_schedulable=False
{% endfor %}
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'infra', 'zone': 'default'}"
{% endfor %}
{% else %}
[lb] [lb]
{% for host in groups[openshift_cluster_infra_group] %} {% for host in groups[openshift_cluster_infra_group] %}
{{ host }} containerized=false {{ host }} containerized=false
@ -799,3 +817,25 @@ openshift_master_console_port={{openshift_console_port}}
{% for host in groups[openshift_cluster_nodes_group] %} {% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default'}" {{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default'}"
{% endfor %} {% endfor %}
{% endif %}
{% else %}
[lb]
{% for host in groups[openshift_cluster_infra_group] %}
{{ host }} containerized=false
{% endfor %}
[nodes]
{% for host in groups[openshift_cluster_infra_group] %}
{{ host }} openshift_node_labels="{'region':'infra'}"
{% endfor %}
{% for host in groups[openshift_cluster_masters_group] %}
{{ host }} openshift_schedulable=False
{% endfor %}
{% for host in groups[openshift_cluster_nodes_group] %}
{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default'}"
{% endfor %}
{% endif %}