소스 검색

Refactor vars in container-runtime/private

Vadim Rutkovsky 6 년 전
부모
커밋
f2ae921b5d
2개의 변경된 파일1개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 3
      playbooks/container-runtime/private/config.yml
  2. 0 3
      playbooks/container-runtime/private/setup_storage.yml

+ 1 - 3
playbooks/container-runtime/private/config.yml

@@ -3,9 +3,7 @@
 # l_etcd_scale_up_crt_hosts may be passed in via prerequisites.yml during etcd
 # scaleup plays.
 
-- hosts: "{{ l_etcd_scale_up_crt_hosts | default(l_scale_up_hosts) | default(l_default_container_runtime_hosts) }}"
-  vars:
-    l_default_container_runtime_hosts: "oo_nodes_to_config"
+- hosts: "{{ l_etcd_scale_up_crt_hosts | default(l_scale_up_hosts) | default('oo_nodes_to_config') }}"
   roles:
     - role: container_runtime
   tasks:

+ 0 - 3
playbooks/container-runtime/private/setup_storage.yml

@@ -4,9 +4,6 @@
 # scaleup plays.
 
 - hosts: "{{ l_etcd_scale_up_crt_hosts | default(l_scale_up_hosts) | default('oo_nodes_to_config') }}"
-  vars:
-    l_chg_temp: "{{ hostvars[groups['oo_first_master'][0]]['openshift_containerized_host_groups'] | default([]) }}"
-    l_containerized_host_groups: "{{ (['oo_nodes_to_config'] | union(l_chg_temp)) | join(':') }}"
   # role: container_runtime is necessary  here to bring role default variables
   # into the play scope.
   roles: