diff options
| author | Tlacenka <tlacencin@gmail.com> | 2017-08-23 16:39:17 +0200 |
|---|---|---|
| committer | Bogdan Dobrelya <bdobreli@redhat.com> | 2017-08-23 16:39:17 +0200 |
| commit | 2a0afda0940b63d71f05c0d11834e3b4582f4e90 (patch) | |
| tree | b236af2759f82670040ec44045fa5b32d5d8b8b1 /playbooks/provisioning/openstack/sample-inventory/group_vars | |
| parent | ce9b66f71b60857f644cc5a3559a5c21af5d9b24 (diff) | |
| download | openshift-2a0afda0940b63d71f05c0d11834e3b4582f4e90.tar.gz openshift-2a0afda0940b63d71f05c0d11834e3b4582f4e90.tar.bz2 openshift-2a0afda0940b63d71f05c0d11834e3b4582f4e90.tar.xz openshift-2a0afda0940b63d71f05c0d11834e3b4582f4e90.zip | |
Fix node label customisation (#679)
* node labels: add checks for custom labels
- README: add more info about customising labels
- pre_tasks: add checks for label values, set to empty dict if undefined
- group_vars: move labels customisation from OSEv3 to all
* pre_tasks: tried a new approach to updating variables
* pre_tasks: variable update fixed
* pre_tasks: rollback upscaling changes (to be added in upscaling PR)
* pre_tasks: blank line removed
* pre_tasks: add check for undefined variable (should not happen though)
* pre_tasks: be sure to have regions defined
Diffstat (limited to 'playbooks/provisioning/openstack/sample-inventory/group_vars')
| -rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml | 6 | ||||
| -rw-r--r-- | playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml index 9d47815ec..4d27ae873 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/OSEv3.yml @@ -8,12 +8,6 @@ openshift_master_cluster_method: native openshift_master_cluster_hostname: "{{ groups.lb.0|default(groups.masters.0) }}" openshift_master_cluster_public_hostname: "{{ groups.lb.0|default(groups.masters.0) }}" -#openshift_cluster_node_labels: -# app: -# region: primary -# infra: -# region: infra - osm_default_node_selector: 'region=primary' # NOTE(shadower): the hostname check seems to always fail because the diff --git a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml index bdd98d239..4b077be0a 100644 --- a/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml +++ b/playbooks/provisioning/openstack/sample-inventory/group_vars/all.yml @@ -122,3 +122,12 @@ ansible_user: openshift # If you want to use the VM storage instead of Cinder volumes, set this to `true`. # NOTE: this is for testing only! Your data will be gone once the VM disappears! # ephemeral_volumes: false + +# # OpenShift node labels +# # - in order to customise node labels for app and/or infra group, set the +# # openshift_cluster_node_labels variable +#openshift_cluster_node_labels: +# app: +# region: primary +# infra: +# region: infra |