diff options
| author | Adam Miller <admiller@redhat.com> | 2017-08-15 14:35:35 +0000 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2017-08-15 14:35:39 +0000 |
| commit | 3a0edf7c698015fd48f86c7e89ef3245ad13375f (patch) | |
| tree | 78a344b111f964e4a4d331312626b9751248d1ae | |
| parent | 96ff304e52397d2d7dc3ac03840e6f604af42723 (diff) | |
| download | ansible-3a0edf7c698015fd48f86c7e89ef3245ad13375f.tar.gz ansible-3a0edf7c698015fd48f86c7e89ef3245ad13375f.tar.xz ansible-3a0edf7c698015fd48f86c7e89ef3245ad13375f.zip | |
add nodeselectors for osbs orchrestrator/worker cluster
Signed-off-by: Adam Miller <admiller@redhat.com>
| -rw-r--r-- | inventory/group_vars/osbs-stg | 2 | ||||
| -rw-r--r-- | playbooks/groups/osbs-orchestrator-cluster.yml | 2 | ||||
| -rw-r--r-- | roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 | 10 |
3 files changed, 14 insertions, 0 deletions
diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg index f9560636f..41d5be55d 100644 --- a/inventory/group_vars/osbs-stg +++ b/inventory/group_vars/osbs-stg @@ -124,7 +124,9 @@ osbs_nodes: "{{ groups['osbs-orchestrator-' + env + '-nodes'] }}" #nodeselectors osbs_orchestrator_default_nodeselector: "orchestrator=true" +osbs_orchestrator_nodeselector_labels: "'orchestrator': 'true'" osbs_worker_default_nodeselector: "worker=true" +osbs_worker_nodeselector_labels: "'worker': 'true'" # fedora container images required by buildroot fedora_required_images: diff --git a/playbooks/groups/osbs-orchestrator-cluster.yml b/playbooks/groups/osbs-orchestrator-cluster.yml index 623fe4bff..7bb3cf044 100644 --- a/playbooks/groups/osbs-orchestrator-cluster.yml +++ b/playbooks/groups/osbs-orchestrator-cluster.yml @@ -237,6 +237,7 @@ openshift_deployment_type: "origin" openshift_metrics_deploy: true openshift_ansible_python_interpreter: "/usr/bin/python3" + openshift_nodeselectors: "{{ osbs_orchestrator_nodeselector_labels }}" when: env == 'staging' tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] @@ -262,6 +263,7 @@ openshift_deployment_type: "origin" openshift_metrics_deploy: true openshift_ansible_python_interpreter: "/usr/bin/python3" + openshift_nodeselectors: "{{ osbs_worker_nodeselector_labels }}" when: env == 'staging' tags: ['openshift-cluster','ansible-ansible-openshift-ansible'] diff --git a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 index b193b315f..4aef47293 100644 --- a/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 +++ b/roles/ansible-ansible-openshift-ansible/templates/cluster-inventory.j2 @@ -826,11 +826,21 @@ openshift_master_console_port={{openshift_console_port}} {% 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] %} + +(% if openshift_nodeselectors is defined %} +{% if openshift_nodeselectors %} +{{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default', {{openshift_nodeselectors}}}" +{% else %} {{ host }} openshift_node_labels="{'region': 'primary', 'zone': 'default'}" +{% endif %} +{% endif %} + {% endfor %} {% endif %} |