Browse Source

Fix building Ubuntu 20.04 focal amphorae

Ubuntu 20.04 is a "Tested Runtime" for the Victoria release[1].
This patch updated our diskimage-create script and elements to
support building a amphora image that uses Ubuntu 20.04 (focal).

[1] https://governance.openstack.org/tc/reference/runtimes/victoria.html

Change-Id: I6f53ea5d012ab64b985d981ecd1b1967e18e4e81
changes/42/722542/15
Michael Johnson 1 year ago
parent
commit
70079d861d
  1. 4
      diskimage-create/diskimage-create.sh
  2. 3
      elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install
  3. 8
      elements/amphora-agent/package-installs.yaml
  4. 13
      elements/amphora-agent/pkg-map
  5. 4
      elements/amphora-agent/post-install.d/10-enable-network-scripts

4
diskimage-create/diskimage-create.sh

@ -420,10 +420,8 @@ AMP_element_sequence="$AMP_element_sequence ${AMP_BASEOS}"
if [ "$AMP_PACKAGE_INSTALL" -eq 1 ]; then
export DIB_INSTALLTYPE_amphora_agent=package
else
# We will need pip for amphora-agent
AMP_element_sequence="$AMP_element_sequence pip-and-virtualenv"
fi
# Add our backend element (haproxy, etc.)
AMP_element_sequence="$AMP_element_sequence $AMP_BACKEND"

3
elements/amphora-agent/install.d/amphora-agent-source-install/75-amphora-agent-install

@ -9,8 +9,7 @@ set -o pipefail
SCRIPTDIR=$(dirname $0)
AMP_VENV=/opt/amphora-agent-venv
# Create a virtual environment to contain the amphora agent
${DIB_PYTHON} -m virtualenv $AMP_VENV
/usr/bin/python3 -m venv $AMP_VENV
$AMP_VENV/bin/pip install pip --upgrade

8
elements/amphora-agent/package-installs.yaml

@ -6,8 +6,14 @@ libffi-dev:
build-only: True
libssl-dev:
build-only: True
python-dev:
python3-dev:
build-only: True
installtype: source
python3-pip:
installtype: source
python3:
python3-venv:
installtype: source
acl:
# Note: Red Hat family does not currently ship acpid for ppc64le.

13
elements/amphora-agent/pkg-map

@ -3,7 +3,9 @@
"rhel": {
"8": {
"isc-dhcp-client": "dhcp-client",
"python-dev": "platform-python-devel",
"python3-dev": "platform-python-devel",
"python3-venv": "python3-virtualenv",
"python3": "python36",
"vlan": "",
"screen": "",
"dkms": ""
@ -12,11 +14,18 @@
"centos": {
"8": {
"isc-dhcp-client": "dhcp-client",
"python-dev": "platform-python-devel",
"python3-dev": "platform-python-devel",
"python3-venv": "python3-virtualenv",
"python3": "python36",
"vlan": "",
"screen": "",
"dkms": ""
}
},
"ubuntu": {
"focal": {
"ureadahead": ""
}
}
},
"family": {

4
elements/amphora-agent/post-install.d/10-enable-network-scripts

@ -10,3 +10,7 @@ set -o pipefail
if [[ "$DISTRO_NAME" =~ (rhel|centos) ]] && [ "$DIB_RELEASE" == "8" ]; then
chkconfig network on
fi
if [[ "$DISTRO_NAME" =~ (ubuntu) ]] && [ "$DIB_RELEASE" == "focal" ]; then
systemctl enable systemd-networkd
fi
Loading…
Cancel
Save