From 505bb28b8d2c3582820ff736b168e64c74cb0a00 Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Fri, 16 Jun 2023 10:13:54 +0100 Subject: [PATCH] Correct name for role mrlesmithjr.manage_lvm The name of ``mrlesmithjr.manage_lvm`` was changed yesterday in release v0.2.10 to use an underscore, instead of a hyphen. As this changes the name of the role on Ansible Galaxy, it needs to be updated in ``requirements.yml``. Closes-Bug: #2024163 Change-Id: I4ea8d8c3a822a7c217bcfcfd5027eecfd21beaed --- ansible/inventory/group_vars/all/compute | 8 ++++---- ansible/inventory/group_vars/all/controllers | 8 ++++---- ansible/inventory/group_vars/all/infra-vms | 8 ++++---- ansible/inventory/group_vars/all/monitoring | 6 +++--- ansible/inventory/group_vars/all/seed | 8 ++++---- ansible/inventory/group_vars/all/seed-hypervisor | 4 ++-- ansible/inventory/group_vars/all/storage | 8 ++++---- ansible/lvm.yml | 2 +- doc/source/configuration/reference/hosts.rst | 4 ++-- doc/source/control-plane-service-placement.rst | 4 ++-- etc/kayobe/compute.yml | 8 ++++---- etc/kayobe/controllers.yml | 8 ++++---- etc/kayobe/infra-vms.yml | 8 ++++---- etc/kayobe/monitoring.yml | 6 +++--- etc/kayobe/seed-hypervisor.yml | 4 ++-- etc/kayobe/seed.yml | 8 ++++---- etc/kayobe/storage.yml | 8 ++++---- ...e-of-mrlesmithjr-manage_lvm-role-c34e217446c19a57.yaml | 6 ++++++ requirements.yml | 2 +- 19 files changed, 62 insertions(+), 56 deletions(-) create mode 100644 releasenotes/notes/correct-name-of-mrlesmithjr-manage_lvm-role-c34e217446c19a57.yaml diff --git a/ansible/inventory/group_vars/all/compute b/ansible/inventory/group_vars/all/compute index b53434708..e235397d8 100644 --- a/ansible/inventory/group_vars/all/compute +++ b/ansible/inventory/group_vars/all/compute @@ -70,15 +70,15 @@ compute_luks_devices: [] ############################################################################### # Compute node LVM configuration. -# List of compute volume groups. See mrlesmithjr.manage-lvm role for +# List of compute volume groups. See mrlesmithjr.manage_lvm role for # format. compute_lvm_groups: "{{ compute_lvm_groups_default + compute_lvm_groups_extra }}" -# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for +# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for # format. compute_lvm_groups_default: "{{ [compute_lvm_group_data] if compute_lvm_group_data_enabled | bool else [] }}" -# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role +# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role # for format. compute_lvm_groups_extra: [] @@ -89,7 +89,7 @@ compute_lvm_groups_extra: [] # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. compute_lvm_group_data_enabled: "{{ docker_storage_driver == 'devicemapper' }}" -# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. compute_lvm_group_data: vgname: data diff --git a/ansible/inventory/group_vars/all/controllers b/ansible/inventory/group_vars/all/controllers index e4cbe8b9f..ffae88c7f 100644 --- a/ansible/inventory/group_vars/all/controllers +++ b/ansible/inventory/group_vars/all/controllers @@ -92,15 +92,15 @@ controller_luks_devices: [] ############################################################################### # Controller node LVM configuration. -# List of controller volume groups. See mrlesmithjr.manage-lvm role for +# List of controller volume groups. See mrlesmithjr.manage_lvm role for # format. controller_lvm_groups: "{{ controller_lvm_groups_default + controller_lvm_groups_extra }}" -# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for +# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for # format. controller_lvm_groups_default: "{{ [controller_lvm_group_data] if controller_lvm_group_data_enabled | bool else [] }}" -# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role +# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role # for format. controller_lvm_groups_extra: [] @@ -111,7 +111,7 @@ controller_lvm_groups_extra: [] # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. controller_lvm_group_data_enabled: "{{ docker_storage_driver == 'devicemapper' }}" -# Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. controller_lvm_group_data: vgname: data diff --git a/ansible/inventory/group_vars/all/infra-vms b/ansible/inventory/group_vars/all/infra-vms index b849eea8e..3327ed69b 100644 --- a/ansible/inventory/group_vars/all/infra-vms +++ b/ansible/inventory/group_vars/all/infra-vms @@ -113,15 +113,15 @@ infra_vm_luks_devices: [] ############################################################################### # Infrastructure VM node LVM configuration. -# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for +# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for # format. infra_vm_lvm_groups: "{{ infra_vm_lvm_groups_default + infra_vm_lvm_groups_extra }}" -# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm +# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm # role for format. infra_vm_lvm_groups_default: "{{ [infra_vm_lvm_group_data] if infra_vm_lvm_group_data_enabled | bool else [] }}" -# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm +# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm # role for format. infra_vm_lvm_groups_extra: [] @@ -132,7 +132,7 @@ infra_vm_lvm_groups_extra: [] # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. infra_vm_lvm_group_data_enabled: "{{ docker_storage_driver == 'devicemapper' }}" -# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage-lvm role +# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role # for format. infra_vm_lvm_group_data: vgname: data diff --git a/ansible/inventory/group_vars/all/monitoring b/ansible/inventory/group_vars/all/monitoring index 6752ee34b..56da639e9 100644 --- a/ansible/inventory/group_vars/all/monitoring +++ b/ansible/inventory/group_vars/all/monitoring @@ -70,15 +70,15 @@ monitoring_luks_devices: [] ############################################################################### # Monitoring node LVM configuration. -# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for +# List of monitoring node volume groups. See mrlesmithjr.manage_lvm role for # format. monitoring_lvm_groups: "{{ monitoring_lvm_groups_default + monitoring_lvm_groups_extra }}" -# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm +# Default list of monitoring node volume groups. See mrlesmithjr.manage_lvm # role for format. monitoring_lvm_groups_default: "{{ controller_lvm_groups_default }}" -# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm +# Additional list of monitoring node volume groups. See mrlesmithjr.manage_lvm # role for format. monitoring_lvm_groups_extra: "{{ controller_lvm_groups_extra }}" diff --git a/ansible/inventory/group_vars/all/seed b/ansible/inventory/group_vars/all/seed index 54a91c7a6..cd3d9f2ed 100644 --- a/ansible/inventory/group_vars/all/seed +++ b/ansible/inventory/group_vars/all/seed @@ -41,14 +41,14 @@ seed_luks_devices: [] ############################################################################### # Seed node LVM configuration. -# List of seed volume groups. See mrlesmithjr.manage-lvm role for format. +# List of seed volume groups. See mrlesmithjr.manage_lvm role for format. seed_lvm_groups: "{{ seed_lvm_groups_default + seed_lvm_groups_extra }}" -# Default list of seed volume groups. See mrlesmithjr.manage-lvm role for +# Default list of seed volume groups. See mrlesmithjr.manage_lvm role for # format. seed_lvm_groups_default: "{{ [seed_lvm_group_data] if seed_lvm_group_data_enabled | bool else [] }}" -# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for +# Additional list of seed volume groups. See mrlesmithjr.manage_lvm role for # format. seed_lvm_groups_extra: [] @@ -59,7 +59,7 @@ seed_lvm_groups_extra: [] # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. seed_lvm_group_data_enabled: "{{ docker_storage_driver == 'devicemapper' }}" -# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format. +# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. seed_lvm_group_data: vgname: data disks: "{{ seed_lvm_group_data_disks }}" diff --git a/ansible/inventory/group_vars/all/seed-hypervisor b/ansible/inventory/group_vars/all/seed-hypervisor index ddab558d0..9b9cf889f 100644 --- a/ansible/inventory/group_vars/all/seed-hypervisor +++ b/ansible/inventory/group_vars/all/seed-hypervisor @@ -38,7 +38,7 @@ seed_hypervisor_luks_devices: [] ############################################################################### # Seed hypervisor node LVM configuration. -# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for +# List of seed hypervisor volume groups. See mrlesmithjr.manage_lvm role for # format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a # volume group for libvirt storage. seed_hypervisor_lvm_groups: [] @@ -47,7 +47,7 @@ seed_hypervisor_lvm_groups: [] seed_hypervisor_lvm_groups_with_data: - "{{ seed_hypervisor_lvm_group_data }}" -# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format. +# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. seed_hypervisor_lvm_group_data: vgname: data disks: "{{ seed_hypervisor_lvm_group_data_disks }}" diff --git a/ansible/inventory/group_vars/all/storage b/ansible/inventory/group_vars/all/storage index c7066096f..40bcd8586 100644 --- a/ansible/inventory/group_vars/all/storage +++ b/ansible/inventory/group_vars/all/storage @@ -82,15 +82,15 @@ storage_luks_devices: [] ############################################################################### # Storage node LVM configuration. -# List of storage volume groups. See mrlesmithjr.manage-lvm role for +# List of storage volume groups. See mrlesmithjr.manage_lvm role for # format. storage_lvm_groups: "{{ storage_lvm_groups_default + storage_lvm_groups_extra }}" -# Default list of storage volume groups. See mrlesmithjr.manage-lvm role for +# Default list of storage volume groups. See mrlesmithjr.manage_lvm role for # format. storage_lvm_groups_default: "{{ [storage_lvm_group_data] if storage_lvm_group_data_enabled | bool else [] }}" -# Additional list of storage volume groups. See mrlesmithjr.manage-lvm role +# Additional list of storage volume groups. See mrlesmithjr.manage_lvm role # for format. storage_lvm_groups_extra: [] @@ -101,7 +101,7 @@ storage_lvm_groups_extra: [] # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. storage_lvm_group_data_enabled: "{{ docker_storage_driver == 'devicemapper' }}" -# Storage LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. storage_lvm_group_data: vgname: data diff --git a/ansible/lvm.yml b/ansible/lvm.yml index 4403b9d56..53a176eda 100644 --- a/ansible/lvm.yml +++ b/ansible/lvm.yml @@ -27,7 +27,7 @@ vars: manage_lvm: True include_role: - name: mrlesmithjr.manage-lvm + name: mrlesmithjr.manage_lvm apply: become: True when: diff --git a/doc/source/configuration/reference/hosts.rst b/doc/source/configuration/reference/hosts.rst index 44e1ebbfe..b82f209d7 100644 --- a/doc/source/configuration/reference/hosts.rst +++ b/doc/source/configuration/reference/hosts.rst @@ -882,8 +882,8 @@ this is mapped to the following variables: * ``storage_lvm_groups`` The format of these variables is as defined by the ``lvm_groups`` variable of -the `mrlesmithjr.manage-lvm -`__ Ansible role. +the `mrlesmithjr.manage_lvm +`__ Ansible role. LVM for libvirt --------------- diff --git a/doc/source/control-plane-service-placement.rst b/doc/source/control-plane-service-placement.rst index c0f653bc2..b7fe19039 100644 --- a/doc/source/control-plane-service-placement.rst +++ b/doc/source/control-plane-service-placement.rst @@ -60,8 +60,8 @@ similar scheme is used for hosts in the ``monitoring`` group. ``bootstrap_user`` Username with which to access the host before ``ansible_user`` is configured. ``lvm_groups`` List of LVM volume groups to configure. See - `mrlesmithjr.manage-lvm role - `_ + `mrlesmithjr.manage_lvm role + `_ for format. ``mdadm_arrays`` List of software RAID arrays. See `mrlesmithjr.mdadm role diff --git a/etc/kayobe/compute.yml b/etc/kayobe/compute.yml index 03c41e3db..15c4cbcc6 100644 --- a/etc/kayobe/compute.yml +++ b/etc/kayobe/compute.yml @@ -63,15 +63,15 @@ ############################################################################### # Compute node LVM configuration. -# List of compute volume groups. See mrlesmithjr.manage-lvm role for +# List of compute volume groups. See mrlesmithjr.manage_lvm role for # format. #compute_lvm_groups: -# Default list of compute volume groups. See mrlesmithjr.manage-lvm role for +# Default list of compute volume groups. See mrlesmithjr.manage_lvm role for # format. #compute_lvm_groups_default: -# Additional list of compute volume groups. See mrlesmithjr.manage-lvm role +# Additional list of compute volume groups. See mrlesmithjr.manage_lvm role # for format. #compute_lvm_groups_extra: @@ -82,7 +82,7 @@ # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. #compute_lvm_group_data_enabled: -# Compute LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Compute LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. #compute_lvm_group_data: diff --git a/etc/kayobe/controllers.yml b/etc/kayobe/controllers.yml index 983251c6c..4780ec444 100644 --- a/etc/kayobe/controllers.yml +++ b/etc/kayobe/controllers.yml @@ -72,15 +72,15 @@ ############################################################################### # Controller node LVM configuration. -# List of controller volume groups. See mrlesmithjr.manage-lvm role for +# List of controller volume groups. See mrlesmithjr.manage_lvm role for # format. #controller_lvm_groups: -# Default list of controller volume groups. See mrlesmithjr.manage-lvm role for +# Default list of controller volume groups. See mrlesmithjr.manage_lvm role for # format. #controller_lvm_groups_default: -# Additional list of controller volume groups. See mrlesmithjr.manage-lvm role +# Additional list of controller volume groups. See mrlesmithjr.manage_lvm role # for format. #controller_lvm_groups_extra: @@ -91,7 +91,7 @@ # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. #controller_lvm_group_data_enabled: -# Controller LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Controller LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. #controller_lvm_group_data: diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index c8050d050..3e1db5d5e 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -92,15 +92,15 @@ ############################################################################### # Infrastructure VM node LVM configuration. -# List of infrastructure vm volume groups. See mrlesmithjr.manage-lvm role for +# List of infrastructure vm volume groups. See mrlesmithjr.manage_lvm role for # format. #infra_vm_lvm_groups: -# Default list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm +# Default list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm # role for format. #infra_vm_lvm_groups_default: -# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage-lvm +# Additional list of infrastructure vm volume groups. See mrlesmithjr.manage_lvm # role for format. #infra_vm_lvm_groups_extra: @@ -111,7 +111,7 @@ # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. #infra_vm_lvm_group_data_enabled: -# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage-lvm role +# Infrastructure VM LVM volume group for data. See mrlesmithjr.manage_lvm role # for format. #infra_vm_lvm_group_data: diff --git a/etc/kayobe/monitoring.yml b/etc/kayobe/monitoring.yml index f332ab938..5468936d3 100644 --- a/etc/kayobe/monitoring.yml +++ b/etc/kayobe/monitoring.yml @@ -63,15 +63,15 @@ ############################################################################### # Monitoring node LVM configuration. -# List of monitoring node volume groups. See mrlesmithjr.manage-lvm role for +# List of monitoring node volume groups. See mrlesmithjr.manage_lvm role for # format. #monitoring_lvm_groups: -# Default list of monitoring node volume groups. See mrlesmithjr.manage-lvm +# Default list of monitoring node volume groups. See mrlesmithjr.manage_lvm # role for format. #monitoring_lvm_groups_default: -# Additional list of monitoring node volume groups. See mrlesmithjr.manage-lvm +# Additional list of monitoring node volume groups. See mrlesmithjr.manage_lvm # role for format. #monitoring_lvm_groups_extra: diff --git a/etc/kayobe/seed-hypervisor.yml b/etc/kayobe/seed-hypervisor.yml index ac72fcd3d..dd8fbca23 100644 --- a/etc/kayobe/seed-hypervisor.yml +++ b/etc/kayobe/seed-hypervisor.yml @@ -36,7 +36,7 @@ ############################################################################### # Seed hypervisor node LVM configuration. -# List of seed hypervisor volume groups. See mrlesmithjr.manage-lvm role for +# List of seed hypervisor volume groups. See mrlesmithjr.manage_lvm role for # format. Set to "{{ seed_hypervisor_lvm_groups_with_data }}" to create a # volume group for libvirt storage. #seed_hypervisor_lvm_groups: @@ -45,7 +45,7 @@ # default. #seed_hypervisor_lvm_groups_with_data: -# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format. +# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. #seed_hypervisor_lvm_group_data: # List of disks for use by seed hypervisor LVM data volume group. Default to an diff --git a/etc/kayobe/seed.yml b/etc/kayobe/seed.yml index ade99307d..f7cacab42 100644 --- a/etc/kayobe/seed.yml +++ b/etc/kayobe/seed.yml @@ -36,14 +36,14 @@ ############################################################################### # Seed node LVM configuration. -# List of seed volume groups. See mrlesmithjr.manage-lvm role for format. +# List of seed volume groups. See mrlesmithjr.manage_lvm role for format. #seed_lvm_groups: -# Default list of seed volume groups. See mrlesmithjr.manage-lvm role for +# Default list of seed volume groups. See mrlesmithjr.manage_lvm role for # format. #seed_lvm_groups_default: -# Additional list of seed volume groups. See mrlesmithjr.manage-lvm role for +# Additional list of seed volume groups. See mrlesmithjr.manage_lvm role for # format. #seed_lvm_groups_extra: @@ -54,7 +54,7 @@ # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. #seed_lvm_group_data_enabled: -# Seed LVM volume group for data. See mrlesmithjr.manage-lvm role for format. +# Seed LVM volume group for data. See mrlesmithjr.manage_lvm role for format. #seed_lvm_group_data: # List of disks for use by seed LVM data volume group. Default to an invalid diff --git a/etc/kayobe/storage.yml b/etc/kayobe/storage.yml index 535666c95..e9e52dfe6 100644 --- a/etc/kayobe/storage.yml +++ b/etc/kayobe/storage.yml @@ -68,15 +68,15 @@ ############################################################################### # Storage node LVM configuration. -# List of storage volume groups. See mrlesmithjr.manage-lvm role for +# List of storage volume groups. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_groups: -# Default list of storage volume groups. See mrlesmithjr.manage-lvm role for +# Default list of storage volume groups. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_groups_default: -# Additional list of storage volume groups. See mrlesmithjr.manage-lvm role +# Additional list of storage volume groups. See mrlesmithjr.manage_lvm role # for format. #storage_lvm_groups_extra: @@ -87,7 +87,7 @@ # 'docker_storage_driver' is set to 'devicemapper', or false otherwise. #storage_lvm_group_data_enabled: -# Storage LVM volume group for data. See mrlesmithjr.manage-lvm role for +# Storage LVM volume group for data. See mrlesmithjr.manage_lvm role for # format. #storage_lvm_group_data: diff --git a/releasenotes/notes/correct-name-of-mrlesmithjr-manage_lvm-role-c34e217446c19a57.yaml b/releasenotes/notes/correct-name-of-mrlesmithjr-manage_lvm-role-c34e217446c19a57.yaml new file mode 100644 index 000000000..6f3069b3d --- /dev/null +++ b/releasenotes/notes/correct-name-of-mrlesmithjr-manage_lvm-role-c34e217446c19a57.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes download of roles from Ansible Galaxy following the renaming of the + ``mrlesmithjr.manage_lvm`` role. + `LP#2023502 `__ diff --git a/requirements.yml b/requirements.yml index 985290b60..4ed7c0d89 100644 --- a/requirements.yml +++ b/requirements.yml @@ -20,7 +20,7 @@ roles: version: v1.14.0 - src: mrlesmithjr.chrony version: v0.1.4 - - src: mrlesmithjr.manage-lvm + - src: mrlesmithjr.manage_lvm version: v0.2.8 - src: mrlesmithjr.mdadm version: v0.1.1