From: Matthew Watkins <mwatkins@linuxfoundation.org>
Date: Wed, 28 Jun 2023 12:51:26 +0000 (+0100)
Subject: Chore: Openstack/devstack template updates
X-Git-Tag: v0.15.0~2^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F71877%2F3;p=releng%2Fcommon-packer.git

Chore: Openstack/devstack template updates

Add further Ubuntu packages and fix missing conditional statements

Issue: RELENG-4765
Change-Id: Ic1a42f501a688eeb8202cd8baa1e1da21512aed3
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
---

diff --git a/provision/devstack.yaml b/provision/devstack.yaml
index cf037c1..811a49d 100644
--- a/provision/devstack.yaml
+++ b/provision/devstack.yaml
@@ -11,13 +11,22 @@
   tasks:
     - name: "Install devstack dependencies"
       block:
-        - name: Install xpath dependencies
+        - name: Install xpath dependencies (CentOS/RedHat)
           yum:
             name:
               - perl-XML-XPath
               - crudini
             state: present
           become: true
+          when: ansible_os_family == 'RedHat'
+        - name: Install xpath dependencies (Ubuntu/Debian)
+          apt:
+            name:
+              - libxml-xpath-perl
+              - crudini
+            state: present
+          become: true
+          when: ansible_os_family == 'Debian'
         - name: Installing non-baseline requirements (CentOS/RedHat)
           yum:
             name:
@@ -28,6 +37,7 @@
               - "@development"
             state: present
           become: true
+          when: ansible_os_family == 'RedHat'
         - name: Installing non-baseline requirements (Ubuntu/Debian)
           apt:
             name:
@@ -38,7 +48,7 @@
               - build-essential
             state: present
           become: true
-          when: ansible_distribution == "Ubuntu"  or ansible_distribution == "Debian"
+          when: ansible_os_family == 'Debian'
         - name: check if net link setup exists
           stat:
             path: /etc/udev/rules.d/80-net-setup-link.rules