review and split non-provider intergration changes

mtulio · May 2, 2023 · dd1bd5a · dd1bd5a
1 parent ebf7900
commit dd1bd5a
Show file tree

Hide file tree

Showing 28 changed files with 401 additions and 190 deletions.
diff --git a/playbooks/config.yaml b/playbooks/config.yaml
@@ -2,6 +2,5 @@
 - name: okd-installer | Installer Configuration
   hosts: localhost
   connection: local
-
   roles:
     - config
diff --git a/playbooks/create_all.yaml b/playbooks/create_all.yaml
@@ -9,27 +9,43 @@
       ansible.builtin.set_fact:
         okdi_call_timer_start: "{{ ansible_date_time.date }} {{ ansible_date_time.time }}"
 
-# - name: OKD Installer | Create all | check required vars
-#   ansible.builtin.import_playbook: var_check_required.yaml
-
-- name: OKD Installer | Create all | create config
+- name: OKD Installer | Create all | Config | create config
   ansible.builtin.import_playbook: config.yaml
   vars:
-    mode: create
+    mode: create-config
 
-- name: OKD Installer | Create all | create stack | network
-  ansible.builtin.import_playbook: stack_network.yaml
+- name: OKD Installer | Create all | Config | create config
+  ansible.builtin.import_playbook: config.yaml
+  vars:
+    mode: create-manifests
 
 - name: OKD Installer | Create all | create stack | IAM
   ansible.builtin.import_playbook: stack_iam.yaml
 
+- name: OKD Installer | Create all | create stack | network
+  ansible.builtin.import_playbook: stack_network.yaml
+
 - name: OKD Installer | Create all | create stack | DNS
   ansible.builtin.import_playbook: stack_dns.yaml
 
 - name: OKD Installer | Create all | create stack | Load Balancer
   ansible.builtin.import_playbook: stack_loadbalancer.yaml
 
-- name: OKD Installer | Create all | create stack | Compute
+- name: OKD Installer | Create all | Config | patch manifests
+  ansible.builtin.import_playbook: config.yaml
+  vars:
+    mode: patch-manifests
+
+- name: OKD Installer | Create all | Config | create ignitions
+  ansible.builtin.import_playbook: config.yaml
+  vars:
+    mode: create-ignitions
+
+- name: OKD Installer | Create all | os_mirror
+  ansible.builtin.import_playbook: os_mirror.yaml
+  when: os_mirror | d(false)
+
+- name: OKD Installer | Create all | create stack | Compute nodes
   ansible.builtin.import_playbook: create_node_all.yaml
 
 - name: OKD Installer | Create all | create stack | Load Balancer Router
@@ -54,7 +70,6 @@
   ansible.builtin.import_playbook: destroy_bootstrap.yaml
   when: destroy_bootstrap | d('yes') == 'yes'
 
-
 - name: OKD Installer | Create ALL | End
   hosts: '{{ target|default("localhost") }}'
   connection: local

diff --git a/playbooks/destroy_cluster.yaml b/playbooks/destroy_cluster.yaml
@@ -3,14 +3,11 @@
   hosts: '{{ target|default("localhost") }}'
   connection: local
   gather_facts: yes
-
   tasks:
     - name: OKD Installer | Destroy | Timer start
       ansible.builtin.set_fact:
         okdi_del_timer_start: "{{ ansible_date_time.date }} {{ ansible_date_time.time }}"
 
-# - ansible.builtin.import_playbook: var_check_required.yaml
-
 - name: okd-installer | Cluster Destroy | Config load
   ansible.builtin.import_playbook: config.yaml
   vars:
@@ -20,12 +17,14 @@
   hosts: '{{target|default("localhost")}}'
   connection: local
   gather_facts: yes
+
   vars:
     profile_path: "{{ playbook_dir }}/vars/{{ config_provider }}/profiles/{{ cluster_profile|d('default') }}"
 
   vars_files:
     - "{{ profile_path }}/iam.yaml"
     - "{{ profile_path }}/dns.yaml"
+
   pre_tasks:
     # Network
     - name: okd-installer | Destroy | Network | Loading Topology Names
@@ -45,35 +44,30 @@
       ansible.builtin.include_vars:
         file: "{{ profile_path }}/loadbalancer-router-default.yaml"
 
-    - name: okd-installer | Destroy | LB | Merge list
+    - name: okd-installer | Destroy | LB | Merge
       ansible.builtin.set_fact:
-        load_balancers_all: "{{ load_balancers_all + cloud_loadbalancers }}"
+        load_balancers_all: "{{ (load_balancers_all | d([])) + (cloud_loadbalancers | d([])) }}"
 
     - name: okd-installer | Destroy | LB | Load API Names
       ansible.builtin.include_vars:
         file: "{{ profile_path }}/loadbalancer.yaml"
 
-    - name: okd-installer | Destroy | LB | Merge list
+    - name: okd-installer | Destroy | LB | Merge
       ansible.builtin.set_fact:
-        load_balancers_all: "{{ load_balancers_all + cloud_loadbalancers }}"
+        load_balancers_all: "{{ load_balancers_all + (cloud_loadbalancers | d([])) }}"
 
     - name: okd-installer | Destroy | LB | Consolidate
       ansible.builtin.set_fact:
         cloud_loadbalancers: "{{ load_balancers_all }}"
 
-    - name: okd-installer | Destroy | LB | Show number of resources
+    - name: okd-installer | Destroy | LB | Show resource count
       ansible.builtin.debug:
         msg: "Found {{ cloud_loadbalancers | length }} Load Balancers on the Configuration"
 
   roles:
     - role: destroy
 
-
-- name: okd-installer | Destroy | Finish
-  hosts: '{{ target|default("localhost") }}'
-  connection: local
-  gather_facts: true
-  tasks:
+  post_tasks:
     - name: okd-installer | Destroy | Finish | Timer end
       ansible.builtin.set_fact:
         okdi_del_timer_end: "{{ ansible_date_time.date }} {{ ansible_date_time.time }}"
@@ -82,4 +76,4 @@
       ansible.builtin.debug:
         msg:
         - "start=[{{ okdi_del_timer_start | d('') }}] end=[{{ okdi_del_timer_end }}]"
-        - "total=[{{ ((okdi_del_timer_end | to_datetime) - (okdi_del_timer_start | to_datetime)) }}]"
+        - "total=[{{ ((okdi_del_timer_end | to_datetime) - (okdi_del_timer_start | to_datetime)) }}]"
diff --git a/playbooks/group_vars/all.yaml b/playbooks/group_vars/all.yaml
@@ -9,7 +9,8 @@ collection_cluster_dir:  "{{ bindir | d(collection_work_dir + '/clusters') }}"
 
 config_install_dir: "{{ collection_cluster_dir }}/{{ cluster_name }}"
 bin_openshift_install: "{{ collection_bin_dir }}/openshift-install"
-bin_oc: "{{ collection_bin_dir }}/openshift-install"
+bin_oc: "{{ collection_bin_dir }}/oc"
+bin_butane: "{{ collection_bin_dir }}/butane"
 
 ## export CONFIG_PULL_SECRET_FILE=${HOME}/.openshift/pull-secret-latest.jso
 config_pull_secret_file: "{{ lookup('ansible.builtin.env', 'CONFIG_PULL_SECRET_FILE') }}"

diff --git a/playbooks/os_mirror.yaml b/playbooks/os_mirror.yaml
@@ -0,0 +1,12 @@
+---
+- name: okd-installer | Create Stack | Compute | Load Config
+  ansible.builtin.import_playbook: config.yaml
+  vars:
+    mode: load
+
+- name: okd-installer | OS Mirror
+  hosts: localhost
+  connection: local
+
+  roles:
+    - os_mirror
diff --git a/playbooks/stack_loadbalancer.yaml b/playbooks/stack_loadbalancer.yaml
@@ -1,4 +1,5 @@
 ---
+# - ansible.builtin.import_playbook: var_check_required.yaml
 
 - name: okd-installer | Stack | Load Balancer | Config load
   ansible.builtin.import_playbook: config.yaml
@@ -9,6 +10,7 @@
   hosts: '{{target|default("localhost")}}'
   connection: local
   vars:
+    cloud_loadbalancers_state: []
     profile_path: "{{ playbook_dir }}/vars/{{ config_provider }}/profiles/{{ cluster_profile|d('default') }}"
 
   pre_tasks:
@@ -22,11 +24,16 @@
         file: "{{ profile_path }}/loadbalancer.yaml"
       when: var_file is not defined
 
-  roles:
-    - cloud_load_balancer
+    - name: okd-installer | Stack | LB | setup
+      ansible.builtin.include_role:
+        name: cloud_load_balancer
 
-- name: okd-installer | Stack | LB | Save state
-  ansible.builtin.import_playbook: config.yaml
-  vars:
-    mode: save-state
-    cluster_state: "{{ cluster_state | combine({'load_balancers': cloud_load_balancers_state}) }}"
+    - name: okd-installer | Stack | LB | update cluster_state
+      ansible.builtin.set_fact:
+        cluster_state: "{{ cluster_state | combine({'loadbalancers': cloud_loadbalancers_state}) }}"
+
+    - name: okd-installer | Stack | LB | save cluster_state
+      ansible.builtin.include_role:
+        name: config
+      vars:
+        mode: save-state
diff --git a/playbooks/templates/ocp-bootstrap-user-data.j2 b/playbooks/templates/ocp-bootstrap-user-data.j2
@@ -2,9 +2,9 @@
   "ignition": {
     "config": {
       "replace": {
-        "source": "{{ openshift_userdata.config_source }}"
+        "source": "{{ userdata_config_source }}"
       }
     },
     "version": "3.1.0"
   }
-}
+}
diff --git a/roles/bootstrap/meta/main.yml b/roles/bootstrap/meta/main.yml
@@ -14,8 +14,5 @@ galaxy_info:
     - okd
     - installer
     - bootstrap
-    - aws
-    - amazon
-    - digitalocean
 
 dependencies: []
diff --git a/roles/clients/defaults/main.yaml b/roles/clients/defaults/main.yaml
@@ -20,3 +20,10 @@ release_image_version_arch: "{{ release_image }}:{{ release_version }}"
 
 workdir: "{{ lookup('env', 'HOME') }}/.ansible/okd-installer"
 client_os: linux
+
+## Butane https://github.com/coreos/butane
+cli_butane_version: v0.17.0
+cli_butane_arch: x86_64
+cli_butane_os: unknown-linux-gnu
+cli_butane_bin: "butane-{{ cli_butane_arch }}-{{ cli_butane_os }}"
+cli_butane_url: "https://github.com/coreos/butane/releases/download/{{ cli_butane_version }}/{{ cli_butane_bin }}"
diff --git a/roles/clients/meta/main.yml b/roles/clients/meta/main.yml
@@ -16,7 +16,8 @@ galaxy_info:
     - openshift
     - okd
     - installer
-    - aws
-    - amazon
+    - okd-installer
+    - openshift-installer
+    - automation
 
 dependencies: []