#!/bin/bash

set -eux

yum install -y \
    jq \
    puppet-tripleo\
    os-net-config \
    openvswitch \
    python3-heat-agent* \
    lvm2 \
    openstack-selinux

ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules

echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/iptables
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/ip6tables

if [ ! -f /usr/bin/ansible-playbook ]; then
    if [ -f /usr/bin/ansible-playbook-3 ]; then
        ln -s -f /usr/bin/ansible-playbook-3 /usr/local/bin/ansible-playbook
    fi
else
    if [ ! -f /usr/bin/ansible-playbook-3 ]; then
        ln -s -f /usr/bin/ansible-playbook /usr/local/bin/ansible-playbook-3
    fi
fi

# https://launchpad.net/bugs/1823353
systemctl enable network
systemctl start network

#!/bin/bash

set -eux

yum install -y \
    jq \
    python-ipaddress \
    puppet-tripleo\
    os-net-config \
    openvswitch \
    python-heat-agent* \
    openstack-selinux

ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules

echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/iptables
echo '# empty ruleset created by deployed-server bootstrap' > /etc/sysconfig/ip6tables

if [ ! -f /usr/bin/ansible-playbook ]; then
    if [ -f /usr/bin/ansible-playbook-3 ]; then
        ln -s -f /usr/bin/ansible-playbook-3 /usr/local/bin/ansible-playbook
    fi
else
    if [ ! -f /usr/bin/ansible-playbook-3 ]; then
        ln -s -f /usr/bin/ansible-playbook /usr/local/bin/ansible-playbook-3
    fi
fi

# https://launchpad.net/bugs/1823353
systemctl enable network
systemctl start network

--- 
+++ 
@@ -4,11 +4,11 @@
 
 yum install -y \
     jq \
-    python-ipaddress \
     puppet-tripleo\
     os-net-config \
     openvswitch \
-    python-heat-agent* \
+    python3-heat-agent* \
+    lvm2 \
     openstack-selinux
 
 ln -s -f /usr/share/openstack-puppet/modules/* /etc/puppet/modules
Adjust deployed-server install package list for RHEL8

 - python-ipaddress is not available in rhel8
 - python3-heat-agent* need to be installed instead of
   python-heat-agent*
 - lvm2 is required by ceph deployments

Closes-bug: 1827276

Change-Id: Id5eb7edb48a7c56e8c9a3798fc8bd3eb08f4294a
