diff options
| author | Diego Castro <spinolacastro@gmail.com> | 2015-08-13 09:52:22 -0300 |
|---|---|---|
| committer | Diego Castro <spinolacastro@gmail.com> | 2015-08-13 09:52:22 -0300 |
| commit | 10b8c46d02d1ec9f4edf3df4b60e3bf533e73533 (patch) | |
| tree | 436e53b269a8a4ab4f2751a1b16052350a5cc5e6 /roles | |
| parent | d307f715764164c8f543d57486718f95b1987875 (diff) | |
| parent | cd989f62709db9f858205420869b9a665cc609a1 (diff) | |
| download | openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.gz openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.bz2 openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.tar.xz openshift-10b8c46d02d1ec9f4edf3df4b60e3bf533e73533.zip | |
Merge remote-tracking branch 'openshift/master'
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/openshift_manage_node/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/openshift_node/README.md | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml index d17f3f532..472d63efe 100644 --- a/roles/openshift_manage_node/tasks/main.yml +++ b/roles/openshift_manage_node/tasks/main.yml @@ -16,3 +16,11 @@ command: > {{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=true with_items: openshift_scheduleable_nodes + +- name: Label nodes + command: > + {{ openshift.common.client_binary }} label --overwrite node {{ item }} {{ hostvars[item]['openshift_node_labels'] | oo_combine_dict }} + with_items: + - "{{ openshift_nodes }}" + when: + "'openshift_node_labels' in hostvars[item]" diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md index 5edb3b8dd..300e6b495 100644 --- a/roles/openshift_node/README.md +++ b/roles/openshift_node/README.md @@ -34,6 +34,18 @@ openshift_common Example Playbook ---------------- +Notes +----- + +Currently we support re-labeling nodes but we don't re-schedule running pods nor remove existing labels. That means you will have to trigger the re-schedulling manually. To re-schedule your pods, just follow the steps below: + +``` +oadm manage-node --schedulable=false ${NODE} +oadm manage-node --evacuate ${NODE} +oadm manage-node --schedulable=true ${NODE} +```` + + TODO License |