From c967fe862dc78150d5b954d0cbc625e070ec6d77 Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Tue, 30 Jun 2015 14:34:46 -0400
Subject: Removing unneeded delegate_to calls
---
roles/openshift_manage_node/tasks/main.yml | 2 --
roles/openshift_node_certificates/tasks/main.yml | 1 -
2 files changed, 3 deletions(-)
diff --git a/roles/openshift_manage_node/tasks/main.yml b/roles/openshift_manage_node/tasks/main.yml
index d4c623f10..b9ab16e7c 100644
--- a/roles/openshift_manage_node/tasks/main.yml
+++ b/roles/openshift_manage_node/tasks/main.yml
@@ -1,11 +1,9 @@
- name: Handle unscheduleable node
- delegate_to: "{{ openshift_first_master }}"
command: >
{{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=false
with_items: openshift_unscheduleable_nodes
- name: Handle scheduleable node
- delegate_to: "{{ openshift_first_master }}"
command: >
{{ openshift.common.admin_binary }} manage-node {{ item }} --schedulable=true
with_items: openshift_scheduleable_nodes
diff --git a/roles/openshift_node_certificates/tasks/main.yml b/roles/openshift_node_certificates/tasks/main.yml
index 1b68bc673..949afc5eb 100644
--- a/roles/openshift_node_certificates/tasks/main.yml
+++ b/roles/openshift_node_certificates/tasks/main.yml
@@ -21,7 +21,6 @@
with_items: nodes_needing_certs
- name: Generate the node server certificate
- delegate_to: "{{ openshift_first_master }}"
command: >
{{ openshift.common.admin_binary }} create-server-cert
--cert=server.crt --key=server.key --overwrite=true
--
cgit v1.2.3
From 93c2bf00cd766771455e82a3fb9fd56d1a1c8dd5 Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Tue, 30 Jun 2015 16:54:12 -0400
Subject: Using openshift.common.hostname instead of openshift_hostname for
determining node scheduleability
---
playbooks/common/openshift-node/config.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/playbooks/common/openshift-node/config.yml b/playbooks/common/openshift-node/config.yml
index 0eec1ae61..2017a7156 100644
--- a/playbooks/common/openshift-node/config.yml
+++ b/playbooks/common/openshift-node/config.yml
@@ -141,12 +141,12 @@
vars:
openshift_unscheduleable_nodes: "{{ hostvars
| oo_select_keys(groups['oo_nodes_to_config'])
- | oo_collect('openshift_hostname', {'openshift_scheduleable': False}) }}"
+ | oo_collect('openshift.common.hostname', {'openshift_scheduleable': False}) }}"
pre_tasks:
- set_fact:
openshift_scheduleable_nodes: "{{ hostvars
| oo_select_keys(groups['oo_nodes_to_config'])
- | oo_collect('openshift_hostname')
+ | oo_collect('openshift.common.hostname')
| difference(openshift_unscheduleable_nodes) }}"
roles:
- openshift_manage_node
--
cgit v1.2.3