Переглянути джерело

Remove unused l_openshift_version_check_hosts

We no longer check to see if the requested version actually
exists, thus we don't need this variable any more.
Michael Gugino 7 роки тому
батько
коміт
c510504663
38 змінених файлів з 0 додано та 39 видалено
  1. 0 1
      playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml
  2. 0 1
      playbooks/common/openshift-cluster/upgrades/pre/config.yml
  3. 0 1
      playbooks/common/openshift-cluster/upgrades/v3_10/upgrade_control_plane.yml
  4. 0 2
      playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml
  5. 0 1
      playbooks/openshift-descheduler/config.yml
  6. 0 1
      playbooks/openshift-descheduler/upgrade.yml
  7. 0 1
      playbooks/openshift-etcd/certificates.yml
  8. 0 1
      playbooks/openshift-etcd/config.yml
  9. 0 1
      playbooks/openshift-etcd/redeploy-ca.yml
  10. 0 1
      playbooks/openshift-etcd/redeploy-certificates.yml
  11. 0 1
      playbooks/openshift-etcd/restart.yml
  12. 0 1
      playbooks/openshift-etcd/scaleup.yml
  13. 0 1
      playbooks/openshift-etcd/upgrade.yml
  14. 0 1
      playbooks/openshift-glusterfs/config.yml
  15. 0 1
      playbooks/openshift-glusterfs/registry.yml
  16. 0 1
      playbooks/openshift-grafana/config.yml
  17. 0 1
      playbooks/openshift-hosted/config.yml
  18. 0 1
      playbooks/openshift-hosted/deploy_registry.yml
  19. 0 1
      playbooks/openshift-hosted/deploy_router.yml
  20. 0 1
      playbooks/openshift-hosted/redeploy-registry-certificates.yml
  21. 0 1
      playbooks/openshift-hosted/redeploy-router-certificates.yml
  22. 0 1
      playbooks/openshift-loadbalancer/config.yml
  23. 0 1
      playbooks/openshift-logging/config.yml
  24. 0 1
      playbooks/openshift-management/config.yml
  25. 0 1
      playbooks/openshift-master/scaleup.yml
  26. 0 1
      playbooks/openshift-metrics/config.yml
  27. 0 1
      playbooks/openshift-monitoring/config.yml
  28. 0 1
      playbooks/openshift-monitoring/install-gcp.yml
  29. 0 1
      playbooks/openshift-nfs/config.yml
  30. 0 1
      playbooks/openshift-node-problem-detector/config.yml
  31. 0 1
      playbooks/openshift-node-problem-detector/uninstall.yml
  32. 0 1
      playbooks/openshift-node-problem-detector/upgrade.yml
  33. 0 1
      playbooks/openshift-node/private/image_prep.yml
  34. 0 1
      playbooks/openshift-node/scaleup.yml
  35. 0 1
      playbooks/openshift-prometheus/config.yml
  36. 0 1
      playbooks/openshift-provisioners/config.yml
  37. 0 1
      playbooks/openshift-service-catalog/config.yml
  38. 0 1
      playbooks/openshift-web-console/config.yml

+ 0 - 1
playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml

@@ -20,7 +20,6 @@
 - import_playbook: ../../../../init/version.yml
   vars:
     l_openshift_version_set_hosts: "oo_etcd_to_config:oo_nodes_to_upgrade:oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
 
 # Ensure inventory sanity_checks are run.
 - import_playbook: ../../../../init/sanity_checks.yml

+ 0 - 1
playbooks/common/openshift-cluster/upgrades/pre/config.yml

@@ -49,7 +49,6 @@
     openshift_release: "{{ openshift_upgrade_target }}"
     # openshift_protect_installed_version is passed n via upgrade_control_plane.yml
     # l_openshift_version_set_hosts is passed via upgrade_control_plane.yml
-    # l_openshift_version_check_hosts is passed via upgrade_control_plane.yml
 
 # version_override will set various version-related variables during a double upgrade.
 - import_playbook: version_override.yml

+ 0 - 1
playbooks/common/openshift-cluster/upgrades/v3_10/upgrade_control_plane.yml

@@ -30,7 +30,6 @@
   # them by default.
   vars:
     l_openshift_version_set_hosts: "oo_etcd_to_config:oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "oo_masters_to_config:!oo_first_master"
     l_upgrade_repo_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_upgrade_no_proxy_hosts: "oo_masters_to_config"
     l_upgrade_health_check_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

+ 0 - 2
playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml

@@ -44,7 +44,6 @@
   vars:
     l_version_override_hosts: "oo_masters_to_config:oo_etcd_to_config"
     l_openshift_version_set_hosts: "oo_etcd_to_config:oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "oo_masters_to_config:!oo_first_master"
     l_upgrade_repo_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_upgrade_no_proxy_hosts: "oo_masters_to_config"
     l_upgrade_health_check_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
@@ -100,7 +99,6 @@
   # them by default.
   vars:
     l_openshift_version_set_hosts: "oo_etcd_to_config:oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "oo_masters_to_config:!oo_first_master"
     l_upgrade_repo_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_upgrade_no_proxy_hosts: "oo_masters_to_config"
     l_upgrade_health_check_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"

+ 0 - 1
playbooks/openshift-descheduler/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-descheduler/upgrade.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/upgrade.yml

+ 0 - 1
playbooks/openshift-etcd/certificates.yml

@@ -2,7 +2,6 @@
 - import_playbook: ../init/main.yml
   vars:
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 

+ 0 - 1
playbooks/openshift-etcd/config.yml

@@ -2,7 +2,6 @@
 - import_playbook: ../init/main.yml
   vars:
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 

+ 0 - 1
playbooks/openshift-etcd/redeploy-ca.yml

@@ -2,7 +2,6 @@
 - import_playbook: ../init/main.yml
   vars:
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 

+ 0 - 1
playbooks/openshift-etcd/redeploy-certificates.yml

@@ -2,7 +2,6 @@
 - import_playbook: ../init/main.yml
   vars:
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 

+ 0 - 1
playbooks/openshift-etcd/restart.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 
 - import_playbook: private/restart.yml

+ 0 - 1
playbooks/openshift-etcd/scaleup.yml

@@ -46,7 +46,6 @@
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_new_etcd_to_config"
     l_sanity_check_hosts: "{{ groups['oo_new_etcd_to_config'] | union(groups['oo_masters_to_config']) | union(groups['oo_etcd_to_config']) }}"
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
   when:
   - inventory_hostname in groups['oo_masters']
   - inventory_hostname in groups['oo_nodes_to_config']

+ 0 - 1
playbooks/openshift-etcd/upgrade.yml

@@ -2,7 +2,6 @@
 - import_playbook: ../init/main.yml
   vars:
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config"
     l_sanity_check_hosts: "{{ groups['oo_etcd_to_config'] | union(groups['oo_masters_to_config']) }}"
 

+ 0 - 1
playbooks/openshift-glusterfs/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_glusterfs_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] | union(groups['oo_glusterfs_to_config']) }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-glusterfs/registry.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_glusterfs_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] | union(groups['oo_glusterfs_to_config']) }}"
 
 - import_playbook: private/registry.yml

+ 0 - 1
playbooks/openshift-grafana/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-hosted/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-hosted/deploy_registry.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/openshift_hosted_registry.yml

+ 0 - 1
playbooks/openshift-hosted/deploy_router.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/openshift_hosted_router.yml

+ 0 - 1
playbooks/openshift-hosted/redeploy-registry-certificates.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/redeploy-registry-certificates.yml

+ 0 - 1
playbooks/openshift-hosted/redeploy-router-certificates.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/redeploy-router-certificates.yml

+ 0 - 1
playbooks/openshift-loadbalancer/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_lb_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] | union(groups['oo_lb_to_config']) }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-logging/config.yml

@@ -8,7 +8,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-management/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-master/scaleup.yml

@@ -39,6 +39,5 @@
 - import_playbook: ../init/version.yml
   vars:
     l_openshift_version_set_hosts: "oo_masters_to_config:oo_nodes_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "oo_masters_to_config:oo_nodes_to_config"
 
 - import_playbook: private/scaleup.yml

+ 0 - 1
playbooks/openshift-metrics/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 

+ 0 - 1
playbooks/openshift-monitoring/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-monitoring/install-gcp.yml

@@ -11,7 +11,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-nfs/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_nfs_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] | union(groups['oo_nfs_to_config']) }}"
 
 

+ 0 - 1
playbooks/openshift-node-problem-detector/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-node-problem-detector/uninstall.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/uninstall.yml

+ 0 - 1
playbooks/openshift-node-problem-detector/upgrade.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/upgrade.yml

+ 0 - 1
playbooks/openshift-node/private/image_prep.yml

@@ -6,7 +6,6 @@
     skip_validate_hostnames: True
     l_openshift_version_determine_hosts: "oo_nodes_to_config"
     l_openshift_version_set_hosts: "all:!all"
-    l_openshift_version_check_hosts: "all:!all"
 
 - name: run node config setup
   import_playbook: disable_excluders.yml

+ 0 - 1
playbooks/openshift-node/scaleup.yml

@@ -34,7 +34,6 @@
 - import_playbook: ../init/version.yml
   vars:
     l_openshift_version_set_hosts: "oo_nodes_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "oo_nodes_to_config"
 
 - import_playbook: private/bootstrap.yml
 - import_playbook: private/join.yml

+ 0 - 1
playbooks/openshift-prometheus/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 

+ 0 - 1
playbooks/openshift-provisioners/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 

+ 0 - 1
playbooks/openshift-service-catalog/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml

+ 0 - 1
playbooks/openshift-web-console/config.yml

@@ -3,7 +3,6 @@
   vars:
     l_init_fact_hosts: "oo_masters_to_config"
     l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
-    l_openshift_version_check_hosts: "all:!all"
     l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
 
 - import_playbook: private/config.yml