From 18dae01b22a6c9dbe7f17c5d99f6a81002c8e128 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 27 Aug 2018 10:10:36 -0600 Subject: [PATCH] Port items from instack-undercloud Currently we leverage the overcloud-full and pip-and-virtualenv-override elements from instack-undercloud during image building. In order to remove instack-undercloud as a dependency, we need to move these items elsewhere. Since you cannot have overlapping names, the overcloud-full element functionality has been moved to overcloud-base and overcloud-compute with the file names 50 being replaced with 51. The pip-and-virtualenv-override elements has been renamed to override-pip-and-virtualenv. A subsequent set of patches will be posted to tripleo-common to remove instack-undercloud from the image building path and an update to the elements required when building images. Change-Id: I1de0b6421ef455ef58c0146da7fe52c35682b395 Related-Blueprint: remove-instack-undercloud --- elements/overcloud-base/install.d/51-persistent-journal | 7 +++++++ .../post-install.d/51-remove-libvirt-default-net | 6 ++++++ elements/override-pip-and-virtualenv/README.md | 4 ++++ elements/override-pip-and-virtualenv/element-provides | 1 + 4 files changed, 18 insertions(+) create mode 100755 elements/overcloud-base/install.d/51-persistent-journal create mode 100755 elements/overcloud-compute/post-install.d/51-remove-libvirt-default-net create mode 100644 elements/override-pip-and-virtualenv/README.md create mode 100644 elements/override-pip-and-virtualenv/element-provides diff --git a/elements/overcloud-base/install.d/51-persistent-journal b/elements/overcloud-base/install.d/51-persistent-journal new file mode 100755 index 00000000..2721c7b2 --- /dev/null +++ b/elements/overcloud-base/install.d/51-persistent-journal @@ -0,0 +1,7 @@ +#!/bin/bash + +set -eu +set -o pipefail + +# Enable persistent logging for the systemd journal +mkdir -p /var/log/journal diff --git a/elements/overcloud-compute/post-install.d/51-remove-libvirt-default-net b/elements/overcloud-compute/post-install.d/51-remove-libvirt-default-net new file mode 100755 index 00000000..9b13648f --- /dev/null +++ b/elements/overcloud-compute/post-install.d/51-remove-libvirt-default-net @@ -0,0 +1,6 @@ +#!/bin/bash + +set -eux +set -o pipefail + +rm -f /etc/libvirt/qemu/networks/autostart/default.xml diff --git a/elements/override-pip-and-virtualenv/README.md b/elements/override-pip-and-virtualenv/README.md new file mode 100644 index 00000000..de8ffd5a --- /dev/null +++ b/elements/override-pip-and-virtualenv/README.md @@ -0,0 +1,4 @@ +This element will override the behavior from the pip-and-virtualenv element +from tripleo-image-elements so that python-pip and python-virtualenv are never +installed. + diff --git a/elements/override-pip-and-virtualenv/element-provides b/elements/override-pip-and-virtualenv/element-provides new file mode 100644 index 00000000..7c8922a0 --- /dev/null +++ b/elements/override-pip-and-virtualenv/element-provides @@ -0,0 +1 @@ +pip-and-virtualenv