Преглед на файлове

Include Deprecation - openshift-loadbalancer

Russell Teague преди 7 години
родител
ревизия
508ea5e5e6
променени са 3 файла, в които са добавени 5 реда и са изтрити 6 реда
  1. 2 2
      playbooks/openshift-loadbalancer/config.yml
  2. 1 2
      roles/openshift_loadbalancer/tasks/main.yml
  3. 2 2
      roles/os_firewall/tasks/main.yml

+ 2 - 2
playbooks/openshift-loadbalancer/config.yml

@@ -1,4 +1,4 @@
 ---
-- include: ../init/main.yml
+- import_playbook: ../init/main.yml
 
-- include: private/config.yml
+- import_playbook: private/config.yml

+ 1 - 2
roles/openshift_loadbalancer/tasks/main.yml

@@ -1,7 +1,6 @@
 ---
 - name: setup firewall
-  include: firewall.yml
-  static: yes
+  import_tasks: firewall.yml
 
 - name: Install haproxy
   package: name=haproxy state=present

+ 2 - 2
roles/os_firewall/tasks/main.yml

@@ -8,12 +8,12 @@
   set_fact:
     r_os_firewall_is_atomic: "{{ r_os_firewall_ostree_booted.stat.exists }}"
 
-- include: firewalld.yml
+- include_tasks: firewalld.yml
   when:
   - os_firewall_enabled | bool
   - os_firewall_use_firewalld | bool
 
-- include: iptables.yml
+- include_tasks: iptables.yml
   when:
   - os_firewall_enabled | bool
   - not os_firewall_use_firewalld | bool