Merge pull request #2855 from detiber/updateSchedulerDefaults

Update scheduler defaults

3 files changed, 18 insertions, 5 deletions

diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 801c8065d..0f226f5f9 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -12,6 +12,8 @@
   - node
 
 - include: initialize_openshift_version.yml
+  tags:
+  - always
 
 - name: Set oo_option facts
   hosts: oo_all_hosts
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index b3e02fb97..65b45886a 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -36,6 +36,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_all_hosts | default([]) }}"
+    changed_when: no
 
   - name: Evaluate oo_masters
     add_host:
@@ -44,6 +45,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_master_hosts | union(g_new_master_hosts) | default([]) }}"
+    changed_when: no
 
   - name: Evaluate oo_etcd_to_config
     add_host:
@@ -52,6 +54,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_etcd_hosts | default([]) }}"
+    changed_when: no
 
   - name: Evaluate oo_masters_to_config
     add_host:
@@ -60,6 +63,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_new_master_hosts | default(g_master_hosts | default([], true), true) }}"
+    changed_when: no
 
   - name: Evaluate oo_nodes_to_config
     add_host:
@@ -68,9 +72,10 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_new_node_hosts | default(g_node_hosts | default([], true), true) }}"
+    changed_when: no
 
   # Skip adding the master to oo_nodes_to_config when g_new_node_hosts is
-  - name: Evaluate oo_nodes_to_config
+  - name: Add master to oo_nodes_to_config
     add_host:
       name: "{{ item }}"
       groups: oo_nodes_to_config
@@ -78,6 +83,7 @@
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_master_hosts | default([]) }}"
     when: g_nodeonmaster | default(false) | bool and not g_new_node_hosts | default(false) | bool
+    changed_when: no
 
   - name: Evaluate oo_first_etcd
     add_host:
@@ -85,6 +91,7 @@
       groups: oo_first_etcd
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
     when: g_etcd_hosts|length > 0
+    changed_when: no
 
   - name: Evaluate oo_first_master
     add_host:
@@ -93,6 +100,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     when: g_master_hosts|length > 0
+    changed_when: no
 
   - name: Evaluate oo_lb_to_config
     add_host:
@@ -101,6 +109,7 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_lb_hosts | default([]) }}"
+    changed_when: no
 
   - name: Evaluate oo_nfs_to_config
     add_host:
@@ -109,3 +118,4 @@
       ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
       ansible_become: "{{ g_sudo | default(omit) }}"
     with_items: "{{ g_nfs_hosts | default([]) }}"
+    changed_when: no
diff --git a/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py b/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
index 9a065fd1c..1238acb05 100755
--- a/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
+++ b/playbooks/common/openshift-cluster/upgrades/library/openshift_upgrade_config.py
@@ -17,6 +17,7 @@ requirements: [ ]
 EXAMPLES = '''
 '''
 
+
 def modify_api_levels(level_list, remove, ensure, msg_prepend='',
                       msg_append=''):
     """ modify_api_levels """
@@ -62,7 +63,6 @@ def upgrade_master_3_0_to_3_1(ansible_module, config_base, backup):
     config = yaml.safe_load(master_cfg_file.read())
     master_cfg_file.close()
 
-
     # Remove unsupported api versions and ensure supported api versions from
     # master config
     unsupported_levels = ['v1beta1', 'v1beta2', 'v1beta3']
@@ -118,7 +118,7 @@ def main():
     # redefined-outer-name
     global module
 
-    module = AnsibleModule(
+    module = AnsibleModule(  # noqa: F405
         argument_spec=dict(
             config_base=dict(required=True),
             from_version=dict(required=True, choices=['3.0']),
@@ -149,10 +149,11 @@ def main():
     except Exception, e:
         return module.fail_json(msg=str(e))
 
+
 # ignore pylint errors related to the module_utils import
-# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import
+# pylint: disable=redefined-builtin, unused-wildcard-import, wildcard-import, wrong-import-position
 # import module snippets
-from ansible.module_utils.basic import *
+from ansible.module_utils.basic import *  # noqa: E402,F403
 
 if __name__ == '__main__':
     main()