Merge pull request #462 from rebtoor/playbooks-refactoring

Moved roles from `configure_network.yml` playbook to `bootstrap.yml` playbook
openstack-k8s-operators · Oct 19, 2023 · faf7d51 · faf7d51
2 parents 151262a + ed3bdbc
commit faf7d51
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 42 deletions.
diff --git a/playbooks/bootstrap.yml b/playbooks/bootstrap.yml
@@ -0,0 +1,49 @@
+---
+
+- name: Bootstrap node
+  hosts: all
+  strategy: linear
+  become: true
+  tasks:
+    - name: Grow volumes
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_growvols
+      tags:
+        - edpm_growvols
+    - name: Install edpm_bootstrap
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_bootstrap
+        tasks_from: bootstrap.yml
+      tags:
+        - edpm_bootstrap
+    # This should be done very early in the bootstrap process
+    # to ensure that the created users and groups are available
+    # before any packages are installed or services are started
+    # that may need them.
+    - name: Configure host users and groups
+      ansible.builtin.import_role:
+        name: edpm_users
+      tags:
+        - edpm_users
+    - name: Install edpm_kernel
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_kernel
+      tags:
+        - edpm_kernel
+    - name: Import edpm_tuned
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_tuned
+      tags:
+        - edpm_tuned
+    - name: Configure Kernel Args
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_kernel
+        tasks_from: kernelargs.yml
+      tags:
+        - edpm_kernel
+    - name: Configure KSM for kernel
+      ansible.builtin.import_role:
+        name: osp.edpm.edpm_kernel
+        tasks_from: ksm.yml
+      tags:
+        - edpm_kernel
diff --git a/playbooks/configure_network.yml b/playbooks/configure_network.yml
@@ -3,49 +3,8 @@
 - name: Deploy EDPM Network
   hosts: all
   strategy: linear
+  become: true
   tasks:
-    - name: Grow volumes
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_growvols
-      tags:
-        - edpm_growvols
-    - name: Install edpm_bootstrap
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_bootstrap
-        tasks_from: bootstrap.yml
-      tags:
-        - edpm_bootstrap
-    # This should be done very early in the bootstrap process
-    # to ensure that the created users and groups are available
-    # before any packages are installed or services are started
-    # that may need them.
-    - name: Configure host users and groups
-      ansible.builtin.import_role:
-        name: edpm_users
-      tags:
-        - edpm_users
-    - name: Install edpm_kernel
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_kernel
-      tags:
-        - edpm_kernel
-    - name: Import edpm_tuned
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_tuned
-      tags:
-        - edpm_tuned
-    - name: Configure Kernel Args
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_kernel
-        tasks_from: kernelargs.yml
-      tags:
-        - edpm_kernel
-    - name: Configure KSM for kernel
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_kernel
-        tasks_from: ksm.yml
-      tags:
-        - edpm_kernel
     - name: Import edpm_network_config
       ansible.builtin.import_role:
         name: osp.edpm.edpm_network_config