diff --git a/salt/libvirt/packages.sls b/salt/libvirt/packages.sls index 73a96811f..195232329 100644 --- a/salt/libvirt/packages.sls +++ b/salt/libvirt/packages.sls @@ -25,12 +25,25 @@ install_xorriso: pkg.installed: - name: xorriso -{% if 'hyper' in grains.id.split('_') | last %} - install_libvirt-libs: pkg.installed: - name: libvirt-libs +libvirt_python_wheel: + file.recurse: + - name: /opt/so/conf/libvirt/source-packages/libvirt-python + - source: salt://libvirt/source-packages/libvirt-python + - makedirs: True + - clean: True + +libvirt_python_module: + cmd.run: + - name: /opt/saltstack/salt/bin/python3 -m pip install --no-index --find-links=/opt/so/conf/libvirt/source-packages/libvirt-python libvirt-python + - onchanges: + - file: libvirt_python_wheel + +{% if 'hyper' in grains.id.split('_') | last %} + # provides virsh install_libvirt-client: pkg.installed: @@ -50,19 +63,6 @@ install_python3-libguestfs: - name: python3-libguestfs ### -libvirt_python_wheel: - file.recurse: - - name: /opt/so/conf/libvirt/source-packages/libvirt-python - - source: salt://libvirt/source-packages/libvirt-python - - makedirs: True - - clean: True - -libvirt_python_module: - cmd.run: - - name: /opt/saltstack/salt/bin/python3 -m pip install --no-index --find-links=/opt/so/conf/libvirt/source-packages/libvirt-python libvirt-python - - onchanges: - - file: libvirt_python_wheel - {% endif %} {% else %} diff --git a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja index 70a14225c..0e65c60e0 100644 --- a/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja +++ b/salt/salt/cloud/cloud.profiles.d/socloud.conf.jinja @@ -11,7 +11,7 @@ sool9-{{host}}: base_domain: sool9 ip_source: qemu-agent ssh_username: soqemussh - private_key: /home/soqemussh/.ssh/id_ed25519 + private_key: /etc/ssh/auth_keys/soqemussh/id_ed25519 sudo: True deploy_command: sh /tmp/.saltcloud-*/deploy.sh script_args: -F -x python3 stable 3006.9