diff --git a/defaults/main.yml b/defaults/main.yml index 45e83a7c..a2b35762 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -58,8 +58,8 @@ openstack_host_specific_kernel_modules: [] ## Our default overrides will be combined with your overrides. # Overridable package list is composed of the old override -# named user_package_list and the standard defaults _package_list -openstack_hosts_package_list: "{{ _package_list + (user_package_list | default([])) }}" +# named user_package_list and the standard defaults _openstack_hosts_package_list +openstack_hosts_package_list: "{{ _openstack_hosts_package_list + (user_package_list | default([])) }}" # Overridable package repo is composed of the old override # named user_external_repo_lists and the standard defaults _package_repos diff --git a/vars/debian.yml b/vars/debian.yml index 02e09a19..2a95b9a6 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -76,7 +76,7 @@ _package_repos_keys: url: "http://osbpo.debian.net/osbpo/dists/pubkey.gpg" state: present -_package_list: +_openstack_hosts_package_list: - name: ca-certificates state: latest diff --git a/vars/redhat-9.yml b/vars/redhat-9.yml index e6f9d6fd..b3974be1 100644 --- a/vars/redhat-9.yml +++ b/vars/redhat-9.yml @@ -79,7 +79,7 @@ _package_repos_keys: key: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO keyfile: "gpg/61E8806C" -_package_list: +_openstack_hosts_package_list: - name: dnf-plugins-core state: present - name: epel-release diff --git a/vars/ubuntu-22.04.yml b/vars/ubuntu-22.04.yml index df0a40b7..eec767f5 100644 --- a/vars/ubuntu-22.04.yml +++ b/vars/ubuntu-22.04.yml @@ -80,7 +80,7 @@ _package_repos_keys: [] # url: # state: -_package_list: +_openstack_hosts_package_list: - name: ubuntu-cloud-keyring state: "{{ openstack_hosts_package_state }}" - name: ca-certificates