Restore install_additional_packages.yml include

Regression caused by #10

Fixes #14

tasks/become.yml

@@ -3,3 +3,4 @@
 - { become: yes, include: Debian.yml, when: ansible_os_family == 'Debian' }
 - { become: yes, include: RedHat.yml, when: ansible_os_family == 'RedHat' }
 - { become: yes, include: install_package_names.yml }
+- { become: yes, include: install_additional_packages.yml }

tasks/install_additional_packages.yml

@@ -1,7 +1,6 @@
 ---
 - name: install {{gcloud_sdk_additional_package_names | join(' ')}} with default package manager
  action: "{{backcompat_pkg_mgr}} name={{item}}"
- sudo: yes
  register: result_install_additional
  until: result_install_additional|success
  # Workaround https://github.com/ansible/ansible/issues/16868 and
@@ -24,7 +23,6 @@
 # Use command since dnf was only added as a module in ansible 1.9.0
 - name: install {{gcloud_sdk_additional_package_names | join (' ')}} with dnf
  command: dnf install -y {{gcloud_sdk_additional_package_names | join(' ')}}
- sudo: yes
  register: result_install_additional_dnf
  until: result_install_additional_dnf|success
  # Workaround https://github.com/ansible/ansible/issues/16868 and

tasks/install_additional_packages_sudo.yml

@@ -0,0 +1,36 @@
+---
+- name: install {{gcloud_sdk_additional_package_names | join(' ')}} with default package manager
+ action: "{{backcompat_pkg_mgr}} name={{item}}"
+ sudo: yes
+ register: result_install_additional
+ until: result_install_additional|success
+ # Workaround https://github.com/ansible/ansible/issues/16868 and
+ # increase default retry count
+ retries: 20
+ delay: 10
+ when: >
+ gcloud_sdk_additional_package_names is defined and
+ (backcompat_pkg_mgr == "yum" or backcompat_pkg_mgr == "apt")
+ with_items: "{{ gcloud_sdk_additional_package_names }}"
+
+# Handle dnf case for Fedora
+- name: "check if {{gcloud_sdk_additional_package_names | join(' ')}} exists"
+ command: "rpm -q {{gcloud_sdk_additional_package_names | join(' ')}}"
+ changed_when: False
+ ignore_errors: True
+ register: package_exists_result
+ when: gcloud_sdk_additional_package_names is defined and backcompat_pkg_mgr == "dnf"
+
+# Use command since dnf was only added as a module in ansible 1.9.0
+- name: install {{gcloud_sdk_additional_package_names | join (' ')}} with dnf
+ command: dnf install -y {{gcloud_sdk_additional_package_names | join(' ')}}
+ sudo: yes
+ register: result_install_additional_dnf
+ until: result_install_additional_dnf|success
+ # Workaround https://github.com/ansible/ansible/issues/16868 and
+ # increase default retry count
+ retries: 20
+ delay: 10
+ when: >
+ gcloud_sdk_additional_package_names is defined and backcompat_pkg_mgr == "dnf" and
+ package_exists_result|failed

tasks/sudo.yml

@@ -5,3 +5,4 @@
 - include: RedHat_sudo.yml
  when: ansible_os_family == 'RedHat'
 - include: install_package_names_sudo.yml
+- include: install_additional_packages_sudo.yml