From 58be7ae5db4c7637ea9c7a3b070cf35ecbaa49e9 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 16 Jan 2025 11:16:20 -0500 Subject: [PATCH] rename from coreol9 or coreol9Small to sool9 --- salt/hypervisor/tools/sbin/so-qcow2-modify-network | 4 ++-- salt/libvirt/images/coreol9Small/README | 1 - salt/libvirt/images/init.sls | 6 +++--- salt/libvirt/images/sool9/README | 1 + salt/libvirt/init.sls | 2 +- salt/manager/tools/sbin/so-salt-cloud | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 salt/libvirt/images/coreol9Small/README create mode 100644 salt/libvirt/images/sool9/README diff --git a/salt/hypervisor/tools/sbin/so-qcow2-modify-network b/salt/hypervisor/tools/sbin/so-qcow2-modify-network index 7920985b4..4e96bca22 100644 --- a/salt/hypervisor/tools/sbin/so-qcow2-modify-network +++ b/salt/hypervisor/tools/sbin/so-qcow2-modify-network @@ -12,9 +12,9 @@ Usage: python so-qcow2-modify-network.py -I -i (--dhcp4 | --static4 --ip4 --gw4 ) [--dns4 ] [--search4 ] Examples: - python so-qcow2-modify-network.py -I /var/lib/libvirt/images/coreol9/coreol9.qcow2 -i eth0 --static4 --ip4 192.168.1.10/24 --gw4 192.168.1.1 --dns4 192.168.1.1,8.8.8.8 --search4 example.local + python so-qcow2-modify-network.py -I /var/lib/libvirt/images/sool9/sool9.qcow2 -i eth0 --static4 --ip4 192.168.1.10/24 --gw4 192.168.1.1 --dns4 192.168.1.1,8.8.8.8 --search4 example.local - python so-qcow2-modify-network.py -I /var/lib/libvirt/images/coreol9/coreol9.qcow2 -i eth0 --dhcp4 + python so-qcow2-modify-network.py -I /var/lib/libvirt/images/sool9/sool9.qcow2 -i eth0 --dhcp4 """ import argparse diff --git a/salt/libvirt/images/coreol9Small/README b/salt/libvirt/images/coreol9Small/README deleted file mode 100644 index 28d066458..000000000 --- a/salt/libvirt/images/coreol9Small/README +++ /dev/null @@ -1 +0,0 @@ -# The files in this directory (/opt/so/saltstack/local/salt/libvirt/images/coreol9Small) are generated by createvm.sh. They are then distributed to the hypervisors where a storage pool will be created then the image can be installed. diff --git a/salt/libvirt/images/init.sls b/salt/libvirt/images/init.sls index 605af2368..864a2e2eb 100644 --- a/salt/libvirt/images/init.sls +++ b/salt/libvirt/images/init.sls @@ -1,6 +1,6 @@ -# the source location will be /opt/so/saltstack/local/salt/libvirt/imaages/coreol9Small +# the source location will be /opt/so/saltstack/local/salt/libvirt/images/sool9 # this will need to change to save the images to /nsm baseimagefiles: file.recurse: - - name: /var/lib/libvirt/images/coreol9Small/ - - source: salt://libvirt/images/coreol9Small/ + - name: /var/lib/libvirt/images/sool9/ + - source: salt://libvirt/images/sool9/ diff --git a/salt/libvirt/images/sool9/README b/salt/libvirt/images/sool9/README new file mode 100644 index 000000000..286dd8a44 --- /dev/null +++ b/salt/libvirt/images/sool9/README @@ -0,0 +1 @@ +# The files in this directory (/opt/so/saltstack/local/salt/libvirt/images/sool9) are generated by createvm.sh. They are then distributed to the hypervisors where a storage pool will be created then the image can be installed. diff --git a/salt/libvirt/init.sls b/salt/libvirt/init.sls index b0c131330..de67f2971 100644 --- a/salt/libvirt/init.sls +++ b/salt/libvirt/init.sls @@ -79,7 +79,7 @@ set_default_pool: virt.pool_running: - name: default - ptype: dir - - target: /var/lib/libvirt/images/coreol9 + - target: /var/lib/libvirt/images/sool9 - permissions: - mode: 0711 - owner: qemu diff --git a/salt/manager/tools/sbin/so-salt-cloud b/salt/manager/tools/sbin/so-salt-cloud index 2691ea382..9bf4e2227 100644 --- a/salt/manager/tools/sbin/so-salt-cloud +++ b/salt/manager/tools/sbin/so-salt-cloud @@ -236,7 +236,7 @@ def run_qcow2_modify_hardware_config(profile, vm_name, cpu=None, memory=None, pc def run_qcow2_modify_network_config(profile, mode, ip=None, gateway=None, dns=None, search_domain=None): hv_name = profile.split('-')[1] target = hv_name + "_*" - image = '/var/lib/libvirt/images/coreol9/coreol9.qcow2.MODIFIED' + image = '/var/lib/libvirt/images/sool9/sool9.qcow2' interface = 'eth0' try: