edits to the sushy baremetal readme and set up playbooks, removed redfish address var in group_vars/sushy-libvirt/ironic

Author: claudia-lola

etc/kayobe/environments/stackhpc-sushy-baremetal/README.rst

@@ -1,7 +1,7 @@
 Sushy Baremetal Environment
 ===========================
 This environment creates a virtual baremetal node using libvirt and Sushy Redfish Emulator.
-The libvirt VM is exposed via a Redfish endpoint provided by Sushy which allow the node
+The libvirt VM is exposed via a Redfish endpoint provided by Sushy which allows the node
 to be enrolled and managed by Openstack Ironic.
 This environment is based on the CI-AIO and stackhpc-baremetal environments.
 

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/auto-setup.yml

@@ -1,29 +1,7 @@
 ---
-- hosts: localhost
-  gather_facts: false
-
-  environment:
-    VIRTUAL_ENV: "{{ lookup('env', 'VIRTUAL_ENV') }}"
-    KAYOBE_CONFIG_PATH: "{{ lookup('env', 'KAYOBE_CONFIG_PATH') }}"
-
-  tasks:
-    - name: Run Sushy 1 playbook
-      ansible.builtin.shell: |
-          source "$VIRTUAL_ENV/bin/activate"
-          kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/sushy-1.yml"
-      args:
-        executable: /bin/bash
-
-    - name: Run Create Virtual Baremetal playbook
-      ansible.builtin.shell: |
-          source "$VIRTUAL_ENV/bin/activate"
-          kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/create-virtual-baremetal.yml"
-      args:
-        executable: /bin/bash
-
-    - name: Run Sushy 2 playbook
-      ansible.builtin.shell: |
-          source "$VIRTUAL_ENV/bin/activate"
-          kayobe playbook run "$KAYOBE_CONFIG_PATH/environments/stackhpc-sushy-baremetal/ansible/sushy-2.yml"
-      args:
-        executable: /bin/bash
+- name: Set up Sushy Host
+  ansible.builtin.import_playbook: ./sushy-1.yml
+- name: Create Libvirt vBMC nodes
+  ansible.builtin.import_playbook: ./create-virtual-baremetal.yml
+- name: Ensure Sushy Emulator is deployed
+  ansible.builtin.import_playbook: ./sushy-2.yml

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/requirements.txt

@@ -0,0 +1,2 @@
+libvirt-python
+sushy-tools

etc/kayobe/environments/stackhpc-sushy-baremetal/ansible/sushy-2.yml

@@ -20,9 +20,7 @@
         state: enabled
     - name: Create Sushy virtualenv
       ansible.builtin.pip:
-        name:
-          - libvirt-python
-          - sushy-tools
+        requirements: "{{ sushy_directory }}/requirements.txt"
         virtualenv: /opt/kayobe/venvs/sushy
         virtualenv_command: python3 -m venv
 

etc/kayobe/environments/stackhpc-sushy-baremetal/inventory/group_vars/sushy-libvirt/ironic

@@ -2,6 +2,5 @@
 
 ironic_redfish_system_id: "{{ '/redfish/v1/Systems/' + (inventory_hostname | to_uuid) }}"
 
-redifsh_address: "http://192.168.33.3:34343"
 ironic_redfish_address: "192.168.33.3:34343"
 ironic_flat_provisioning_network: provision-net