debian / libvirt / devconfig fixes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

kdevops-kpd wants to merge 7 commits into main_base from series/946588=>main

Kconfig

-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ config NEEDS_LOCAL_DEVELOPMENT_PATH @@
     config KDEVOPS_FIRST_RUN
     	bool "Is this your first time running kdevops on this system?"
+    	output yaml
     	default n
     	help
     	  When you run kdevops for the first time we can enable options
@@ Expand Down @@

empty

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		empty

kconfigs/Kconfig.guestfs

-Original file line number
+Diff line change
@@ -1,5 +1,20 @@
     if GUESTFS
+    config STORAGE_POOL_PATH
+    	string
+    	output yaml
+    	default LIBVIRT_STORAGE_POOL_PATH
+    config GUESTFS_STORAGE_DIR
+    	string
+    	output yaml
+    	default "{{ kdevops_storage_pool_path }}/kdevops/guestfs"
+    config GUESTFS_BASE_IMAGE_DIR
+    	string
+    	output yaml
+    	default "{{ guestfs_storage_dir }}/base_images"
     config GUESTFS_HAS_CUSTOM_RAW_IMAGE
     	bool
@@ Expand Down @@

kconfigs/Kconfig.libvirt

-Original file line number
+Diff line change
@@ Expand Up / @@ -155,13 +155,20 @@ config LIBVIRT_QEMU_GROUP @@
     	default "qemu" if !DISTRO_DEBIAN && !DISTRO_UBUNTU
     	default "libvirt-qemu" if DISTRO_DEBIAN || DISTRO_UBUNTU
-    config KDEVOPS_STORAGE_POOL_PATH
+    config LIBVIRT_STORAGE_POOL_PATH
     	string
+    	output yaml
     	default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && !LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
     	default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
     	default LIBVIRT_STORAGE_POOL_PATH_CUSTOM if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
     	default VIRTUALBOX_STORAGE_POOL_PATH_CUSTOM if VAGRANT_VIRTUALBOX
+    config KDEVOPS_STORAGE_POOL_PATH
+    	string
+    	output yaml
+    	default "{{ libvirt_storage_pool_path }}/kdevops"
     config QEMU_BIN_PATH
     	string
     	default QEMU_BIN_PATH_LIBVIRT if LIBVIRT
@@ Expand Down Expand Up / @@ -1052,6 +1059,7 @@ endif @@
     config LIBVIRT_STORAGE_POOL_CREATE
     	bool "Should we build a custom storage pool for you?"
+    	output yaml
     	default n if !LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
     	default $(shell, ./scripts/get_libvirsh_pool_enabled.sh) if LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
     	help
@@ Expand All / @@ -1063,6 +1071,7 @@ config LIBVIRT_STORAGE_POOL_CREATE @@
     config LIBVIRT_STORAGE_POOL_NAME
     	string "Libvirt storage pool name"
+    	output yaml
     	depends on LIBVIRT_STORAGE_POOL_CREATE
     	default "default" if !LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
     	default $(shell, ./scripts/get_libvirsh_pool_name.sh) if LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
@@ Expand Down @@

playbooks/roles/bringup_guestfs/tasks/main.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,65 @@ @@
       when: guestfs_subdirectories.matched == 0
       tags: [ 'config-check' ]
+    - name: Create kdevops guestfs storage directory if missing (libvirt session uri)
+      file:
+        path: "{{ guestfs_base_image_dir }}"
+        state: directory
+        mode: '0755'
+      tags: ['storage-pool-path']
+      when:
+        - 'not libvirt_uri_system|bool'
+    - name: Create kdevops guestfs storage directory if missing (libvirt system uri)
+      become: yes
+      become_flags: 'su - -c'
+      become_method: sudo
+      file:
+        path: "{{ guestfs_base_image_dir }}"
+        state: directory
+        mode: '0775'
+        group: "{{ libvirt_qemu_group }}"
+      tags: ['storage-pool-path']
+      when:
+        - 'libvirt_uri_system|bool'
+    - name: Check if directory is owned by the correct group (libvirt system uri)
+      become: yes
+      become_flags: 'su - -c'
+      become_method: sudo
+      command: stat -c '%G' "{{ libvirt_storage_pool_path }}"
+      register: dir_group
+      changed_when: false
+      tags: ['storage-pool-path']
+      when:
+        - 'libvirt_uri_system|bool'
+    - name: Check if directory has group write permissions (libvirt system uri)
+      become: yes
+      become_flags: 'su - -c'
+      become_method: sudo
+      command: stat -c '%A' "{{ libvirt_storage_pool_path }}"
+      register: dir_perms
+      changed_when: false
+      tags: ['storage-pool-path']
+      when:
+        - 'libvirt_uri_system|bool'
+    - name: Verify storage pool path directory is group-writable (libvirt system uri)
+      become: yes
+      become_flags: 'su - -c'
+      become_method: sudo
+      fail:
+        msg: |
+          The permissions for {{ libvirt_storage_pool_path }} should be group
+          writeable by the group used by libvirt: {{ libvirt_qemu_group }}
+          Current group: {{ dir_group.stdout }}
+          Current permissions: {{ dir_perms.stdout }}
+      tags: ['storage-pool-path']
+      when:
+        - 'libvirt_uri_system|bool'
+        - (dir_group.stdout != libvirt_qemu_group) or (dir_perms.stdout[5] != 'w')
     - name: Check for dnsmasq configuration files
       stat:
         path: "{{ item }}"
@@ Expand Down @@

playbooks/roles/devconfig/tasks/install-deps/debian/main.yml

-Original file line number
+Diff line change
@@ -1,4 +1,26 @@
     ---
+    - name: Check if unattended-upgrades is installed
+      command: dpkg-query -W -f='${Status}' unattended-upgrades
+      register: unattended_upgrade_status
+      ignore_errors: true
+      changed_when: false
+    - name: Set fact if unattended-upgrades is installed
+      set_fact:
+        unattended_upgrades_installed: "{{ 'install ok installed' in unattended_upgrade_status.stdout }}"
+    - name: Verify unattended-upgrades is not installed
+      fail:
+        msg: |
+          The unattended-upgrades package is installed on the base image, this
+          can cause tons of issues with CIs. Fix this by running the following
+          commands:
+          make cleancache
+          make bringup
+      when:
+        - unattended_upgrades_installed|bool
     - name: Upgrade Packages
       become: yes
       become_method: sudo
@@ Expand Down @@

playbooks/roles/gen_nodes/tasks/main.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,11 @@ @@
       command: "id -g -n"
       register: my_group
+    - name: Fail if kdevops_host_prefix contains a dash
+      fail:
+        msg: "Invalid kdevops_host_prefix '{{ kdevops_host_prefix }}'. The prefix cannot contain a dash ('-')."
+      when: kdevops_host_prefix is search("-")
     - name: Create guestfs directory
       ansible.builtin.file:
         path: "{{ guestfs_path }}"
@@ Expand Down @@

scripts/bringup_guestfs.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ IMG_FMT="qcow2" @@
     if [ "${CONFIG_LIBVIRT_EXTRA_DRIVE_FORMAT_RAW}" = "y" ]; then
     	IMG_FMT="raw"
     fi
-    STORAGETOPDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}"
+    STORAGETOPDIR="${CONFIG_LIBVIRT_STORAGE_POOL_PATH}"
     STORAGEDIR="${STORAGETOPDIR}/kdevops/guestfs"
     QEMU_GROUP=$CONFIG_LIBVIRT_QEMU_GROUP
     GUESTFSDIR="${TOPDIR}/guestfs"
@@ Expand Down Expand Up / @@ -223,6 +223,7 @@ firstboot-command systemctl stop ssh @@
     firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure -p low --force openssh-server
     firstboot-command systemctl start ssh
     firstboot-command apt update && apt upgrade --yes
+    uninstall unattended-upgrades
     _EOT
     	# CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST will not work
     	# if /etc/nsswitch.conf has a line like this:
@@ Expand Down Expand Up / @@ -270,9 +271,6 @@ if [[ "$CONFIG_LIBVIRT_URI_SYSTEM" == "y" ]]; then @@
     	USE_SUDO="sudo "
     fi
-    $USE_SUDO mkdir -p $STORAGEDIR
-    $USE_SUDO mkdir -p $BASE_IMAGE_DIR
     cmdfile=$(mktemp)
     if [ ! -f $BASE_IMAGE ]; then
@@ Expand Down @@

scripts/bringup_vagrant.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ vagrant_check_dups() @@
     			# instances *and* we know one does not exist in another
     			# directory for this user.
-    			kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
+    			kdevops_pool_path="$CONFIG_LIBVIRT_STORAGE_POOL_PATH"
     			# For libvirt we can do one more global sanity check
     			if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
     				possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
@@ Expand Down @@

scripts/destroy_guestfs.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ source ${TOPDIR}/scripts/lib.sh @@
     export LIBVIRT_DEFAULT_URI=$CONFIG_LIBVIRT_URI
-    STORAGEDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}/kdevops/guestfs"
+    STORAGEDIR="${CONFIG_LIBVIRT_STORAGE_POOL_PATH}/kdevops/guestfs"
     GUESTFSDIR="${TOPDIR}/guestfs"
     if [ -f "$GUESTFSDIR/kdevops_nodes.yaml" ]; then
@@ Expand Down @@

scripts/destroy_vagrant.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ rm -rf .vagrant @@
     # doing so we don't check for global dups or anything like that.
     UNINIT_CURRENT_INSTANCES=$(vagrant status --machine-readable | grep ",state," | grep not_created | awk -F "," '{print $2}')
     for i in $UNINIT_CURRENT_INSTANCES; do
-    	UNINIT_INSTANCE_SPARE_DRIVE_DIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}/kdevops/$i"
+    	UNINIT_INSTANCE_SPARE_DRIVE_DIR="${CONFIG_LIBVIRT_STORAGE_POOL_PATH}/kdevops/$i"
     	if [[ -d $UNINIT_INSTANCE_SPARE_DRIVE_DIR ]]; then
     		echo "Found unitialized (possibly old) instance spare drive directory, removing it ... $i"
     		rm -rf $UNINIT_INSTANCE_SPARE_DRIVE_DIR
@@ Expand Down @@

scripts/gen-nodes.Makefile

-Original file line number
+Diff line change
@@ Expand Up @@
     GEN_NODES_EXTRA_ARGS += libvirt_session_public_network_dev='$(subst ",,$(CONFIG_LIBVIRT_SESSION_PUBLIC_NETWORK_DEV))'
     endif
-    ifeq (y,$(CONFIG_LIBVIRT_STORAGE_POOL_CREATE))
-    GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_create='True'
-    GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_name='$(subst ",,$(CONFIG_LIBVIRT_STORAGE_POOL_NAME))'
-    GEN_NODES_EXTRA_ARGS += libvirt_storage_pool_path='$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))'
-    endif
     GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_MODE))'
     GEN_NODES_EXTRA_ARGS += libvirt_extra_storage_aio_cache_mode='$(subst ",,$(CONFIG_LIBVIRT_AIO_CACHE_MODE))'
@@ Expand Down @@

scripts/guestfs.Makefile

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,11 +18,6 @@ QEMU_GROUP:=$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))
  
    GUESTFS_ARGS += kdevops_storage_pool_group='$(QEMU_GROUP)'

    GUESTFS_ARGS += storage_pool_group='$(QEMU_GROUP)'

    STORAGE_POOL_PATH:=$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))

    KDEVOPS_STORAGE_POOL_PATH:=$(STORAGE_POOL_PATH)/kdevops

    GUESTFS_ARGS += storage_pool_path=$(STORAGE_POOL_PATH)

    GUESTFS_ARGS += kdevops_storage_pool_path=$(KDEVOPS_STORAGE_POOL_PATH)

    9P_HOST_CLONE :=

    ifeq (y,$(CONFIG_BOOTLINUX_9P))

    9P_HOST_CLONE := 9p_linux_clone

    @@ -88,7 +83,7 @@ bringup_guestfs: $(GUESTFS_BRINGUP_DEPS)
  
    		playbooks/bringup_guestfs.yml \

    		-e 'ansible_python_interpreter=/usr/bin/python3' \

    		--extra-vars=@./extra_vars.yaml \

    		--tags config-check,network

    		--tags config-check,network,storage-pool-path

    	$(Q)$(TOPDIR)/scripts/bringup_guestfs.sh

    	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \

    		--inventory localhost, \

    @@ -109,4 +104,4 @@ destroy_guestfs:
  
    PHONY += destroy_guestfs

    cleancache:

    	$(Q)rm -f $(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))/kdevops/guestfs/base_images/*

    	$(Q)rm -f $(subst ",,$(CONFIG_LIBVIRT_STORAGE_POOL_PATH))/kdevops/guestfs/base_images/*

scripts/prune_stale_vagrant.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,7 @@ if [[ "$CONFIG_LIBVIRT" != "y" ]]; then @@
     fi
     if [[ $# -eq 0 ]]; then
-    	KDEVOPS_POOL_PATH="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
+    	KDEVOPS_POOL_PATH="$CONFIG_LIBVIRT_STORAGE_POOL_PATH"
     elif [[ $# -eq 1 ]]; then
     	if [[ "$1" == "--help" ]]; then
     		echo "Usage: $0"
@@ Expand Down @@

scripts/vagrant.Makefile

-Original file line number
+Diff line change
@@ Expand Up / @@ -44,11 +44,6 @@ ifeq (y,$(CONFIG_VAGRANT_VIRTUALBOX)) @@
     VAGRANT_ARGS += virtualbox_provider=True
     endif
-    STORAGE_POOL_PATH:=$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))
-    KDEVOPS_STORAGE_POOL_PATH:=$(STORAGE_POOL_PATH)/kdevops
-    VAGRANT_ARGS += storage_pool_path=$(STORAGE_POOL_PATH)
-    VAGRANT_ARGS += kdevops_storage_pool_path=$(KDEVOPS_STORAGE_POOL_PATH)
     VAGRANT_9P_HOST_CLONE :=
     ifeq (y,$(CONFIG_BOOTLINUX_9P))
     VAGRANT_9P_HOST_CLONE := vagrant_9p_linux_clone
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

debian / libvirt / devconfig fixes #25

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

debian / libvirt / devconfig fixes #25

Are you sure you want to change the base?

Uh oh!

debian / libvirt / devconfig fixes #25

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!