Merge changes from topic "data-download-refactor"

[oom/offline-installer.git] / ansible / infrastructure.yml

diff --git a/ansible/infrastructure.yml b/ansible/infrastructure.yml
index 83e185f..7fdbd2e 100644 (file)
--- a/ansible/infrastructure.yml
+++ b/ansible/infrastructure.yml
@@ -3,11 +3,13 @@
   hosts: infrastructure, kubernetes
   roles:
     - package-repository
-    - role: firewall
+    - firewall
 
 - name: Setup infrastructure servers
   hosts: infrastructure
   roles:
+    - chrony
+    - package-repository-check
     - certificates
     - docker
     - dns
@@ -16,10 +18,14 @@
     - nexus
 
 - name: Setup base for Kubernetes nodes
-  hosts: kubernetes
+  hosts: kubernetes:!infrastructure
   roles:
+    - chrony
+    - package-repository-check
     - docker
   tasks:
-    - import_tasks: roles/certificates/tasks/upload_root_ca.yml
+    - include_role:
+        name: certificates
+        tasks_from: upload_root_ca.yml
       vars:
-        certificates_local_dir: certs
+        certificates_local_dir: "{{ playbook_dir }}/certs"