diff --git a/releasenotes/notes/package-list-name-changes-38f1554097b6bbe9.yaml b/releasenotes/notes/package-list-name-changes-38f1554097b6bbe9.yaml new file mode 100644 index 00000000..6875b9f2 --- /dev/null +++ b/releasenotes/notes/package-list-name-changes-38f1554097b6bbe9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - The variable ``glance_apt_packages`` has been renamed to + ``glance_distro_packages``. diff --git a/tasks/glance_install_apt.yml b/tasks/glance_install_apt.yml index 29ed800a..b01c83b0 100644 --- a/tasks/glance_install_apt.yml +++ b/tasks/glance_install_apt.yml @@ -34,4 +34,4 @@ until: install_packages|success retries: 5 delay: 2 - with_items: "{{ glance_apt_packages }}" + with_items: "{{ glance_distro_packages }}" diff --git a/tests/test-glance-functional.yml b/tests/test-glance-functional.yml index be6d5c8c..7896b3b5 100644 --- a/tests/test-glance-functional.yml +++ b/tests/test-glance-functional.yml @@ -50,4 +50,4 @@ - name: Ensure image uploaded fail: msg: "Image upload failed" - when: (glance_images is not defined) or (glance_images.cirros is not defined) or (glance_images.cirros.id is not defined) \ No newline at end of file + when: (glance_images is not defined) or (glance_images.cirros is not defined) or (glance_images.cirros.id is not defined) diff --git a/tests/test-install-infra.yml b/tests/test-install-infra.yml index 77a90bd0..7b3acf0b 100644 --- a/tests/test-install-infra.yml +++ b/tests/test-install-infra.yml @@ -29,4 +29,4 @@ galera_wsrep_node_name: "{{ inventory_hostname }}" galera_wsrep_provider_options: - { option: "gcache.size", value: "32M" } - galera_server_id: "{{ inventory_hostname | string_2_int }}" \ No newline at end of file + galera_server_id: "{{ inventory_hostname | string_2_int }}" diff --git a/tests/test-prepare-containers.yml b/tests/test-prepare-containers.yml index ccb40af9..914c17f1 100644 --- a/tests/test-prepare-containers.yml +++ b/tests/test-prepare-containers.yml @@ -30,4 +30,4 @@ port: "{{ ansible_ssh_port | default('22') }}" host: "{{ ansible_ssh_host | default(inventory_hostname) }}" search_regex: OpenSSH - delay: 1 \ No newline at end of file + delay: 1 diff --git a/tests/test.yml b/tests/test.yml index f79188dc..8254f3fb 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -29,4 +29,4 @@ - include: test-install-keystone.yml # Install Glance -- include: test-install-glance.yml \ No newline at end of file +- include: test-install-glance.yml diff --git a/vars/ubuntu-14.04.yml b/vars/ubuntu-14.04.yml index fe31302a..96ff60dd 100644 --- a/vars/ubuntu-14.04.yml +++ b/vars/ubuntu-14.04.yml @@ -16,8 +16,8 @@ cache_timeout: 600 # Common apt packages -glance_apt_packages: +glance_distro_packages: - rpcbind - rsync - git - - nfs-common \ No newline at end of file + - nfs-common diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index fe31302a..96ff60dd 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -16,8 +16,8 @@ cache_timeout: 600 # Common apt packages -glance_apt_packages: +glance_distro_packages: - rpcbind - rsync - git - - nfs-common \ No newline at end of file + - nfs-common