From a9ab69a59d0b1a1793ea48e9a39378b7b08809be Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 3 Sep 2020 14:46:48 -0600 Subject: [PATCH] Ensure yaml packages are installed Since all of our ansible modules have 'import yaml', we should ensure that we have the correct yaml python packages installed. When running in containers, they aren't there by default. Change-Id: I911f589817d7142711b8ef3c675a8098a3ebb0f3 --- tripleo_ansible/roles/test_deps/tasks/main.yml | 7 +++++++ tripleo_ansible/roles/test_deps/vars/centos-7.yml | 2 ++ tripleo_ansible/roles/test_deps/vars/centos-8.yml | 2 ++ tripleo_ansible/roles/test_deps/vars/redhat-8.yml | 2 ++ 4 files changed, 13 insertions(+) diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index dbbe191f8..86816dc10 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -83,6 +83,13 @@ when: - (ansible_os_family | lower) == 'redhat' + - name: Install python yaml libs + package: + name: "{{ test_deps_yaml_packages }}" + state: present + when: + - (ansible_os_family | lower) == 'redhat' + - name: Install extra packages package: name: "{{ test_deps_extra_packages }}" diff --git a/tripleo_ansible/roles/test_deps/vars/centos-7.yml b/tripleo_ansible/roles/test_deps/vars/centos-7.yml index 4362632d5..c31d830db 100644 --- a/tripleo_ansible/roles/test_deps/vars/centos-7.yml +++ b/tripleo_ansible/roles/test_deps/vars/centos-7.yml @@ -16,6 +16,8 @@ test_deps_repo: https://trunk.rdoproject.org/centos7/current +test_deps_yaml_packages: + - PyYAML test_deps_selinux_packages: - libselinux-python test_deps_tripleo_packages: diff --git a/tripleo_ansible/roles/test_deps/vars/centos-8.yml b/tripleo_ansible/roles/test_deps/vars/centos-8.yml index d25515983..5f25002a6 100644 --- a/tripleo_ansible/roles/test_deps/vars/centos-8.yml +++ b/tripleo_ansible/roles/test_deps/vars/centos-8.yml @@ -16,6 +16,8 @@ test_deps_repo: https://trunk.rdoproject.org/centos8-master/current +test_deps_yaml_packages: + - python3-pyyaml test_deps_selinux_packages: - python3-libselinux test_deps_tripleo_packages: diff --git a/tripleo_ansible/roles/test_deps/vars/redhat-8.yml b/tripleo_ansible/roles/test_deps/vars/redhat-8.yml index ac562752a..af702fc0f 100644 --- a/tripleo_ansible/roles/test_deps/vars/redhat-8.yml +++ b/tripleo_ansible/roles/test_deps/vars/redhat-8.yml @@ -16,6 +16,8 @@ test_deps_repo: https://trunk.rdoproject.org/redhat8-master/current +test_deps_yaml_packages: + - python3-pyyaml test_deps_selinux_packages: - python3-libselinux test_deps_tripleo_packages: