780a4c4ead
Major changes: * Plumbing necessary for strict confinement with the microstack-support interface https://github.com/snapcore/snapd/pull/8926 * Until the interface is merged, devmode will be used and kernel modules will be loaded via an auxiliary service. * upgraded OpenStack components to Focal (20.04) and OpenStack Ussuri; * reworked the old patches; * added the Placement service since it is now separate; * addressed various build issues due to changes in snapcraft and built dependencies: * e.g. libvirt requires the build directory to be separate from the source directory) and LP: #1882255; * LP: #1882535 and https://github.com/pypa/pip/issues/8414 * LP: #1882839 * LP: #1885294 * https://storyboard.openstack.org/#!/story/2007806 * LP: #1864589 * LP: #1777121 * LP: #1881590 * ML2/OVS replated with ML2/OVN; * dnsmasq is not used anymore; * neutron l3 and DHCP agents are not used anymore; * Linux network namespaces are only used for neutron-ovn-metadata-agent. * ML2 DNS support is done via native OVN mechanisms; * OVN-related database services (southbound and northbound dbs); * OVN-related control plane services (ovn-controller, ovn-northd); * core20 base support (bionic hosts are supported); * the removal procedure now relies on the "remove" hook since `snap remove` cannot be used from the confined environment anymore; * prerequisites to enabling AppArmor confinement for QEMU processes created by the confined libvirtd. * Added the Spice html5 console proxy service to enable clients to retrieve and use it via `microstack.openstack console url show --spice <servername>`. * Added missing Cinder templates and DB migrations for the Cinder DB. * Added experimental support for a loop device-based LVM backend for Cinder. Due to LP: #1892895 this is not recommended to be used in production except for tempest testing with an applied workaround; * includes iscsid and iscsi-tcp kernel module loading; * includes LIO and loading of relevant kernel modules; * An LVM PV is created on top of a loop device with a backing file present in $SNAP_COMMON/cinder-lvm.img; * A VG is created on top of the PV; * LVs are created by Cinder and exported via LIO over iscsi to iscsid which hot-plugs new SCSI devices. Those SCSI devices are then propagated by Nova to libvirt and QEMU during volume attachment; * Added post-deployment testing via rally and tempest (via the microstack-test snap). A set of tests included into Refstack 2018.02 is executed (except for object storage tests due to the lack of object storage support). Change-Id: Ic70770095860a57d5e0a55a8a9451f9db6be7448
67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
From 36c45710c8cc3bbdf86fe2513a07a0d5f0a5c3f9 Mon Sep 17 00:00:00 2001
|
|
From: Dmitrii Shcherbakov <dmitrii.shcherbakov@canonical.com>
|
|
Date: Mon, 8 Jun 2020 13:56:20 +0000
|
|
Subject: [PATCH] Use SNAP_COMMON paths
|
|
|
|
---
|
|
openstack_dashboard/local/local_settings.py | 4 +++-
|
|
openstack_dashboard/settings.py | 6 ++++--
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/lib/python3.8/site-packages/openstack_dashboard/local/local_settings.py b/lib/python3.8/site-packages/openstack_dashboard/local/local_settings.py
|
|
index 2b084bf24..aad403c04 100644
|
|
--- a/lib/python3.8/site-packages/openstack_dashboard/local/local_settings.py
|
|
+++ b/lib/python3.8/site-packages/openstack_dashboard/local/local_settings.py
|
|
@@ -22,6 +22,8 @@ from openstack_dashboard.settings import HORIZON_CONFIG
|
|
|
|
DEBUG = True
|
|
|
|
+SNAP_COMMON = os.environ['SNAP_COMMON']
|
|
+
|
|
# This setting controls whether or not compression is enabled. Disabling
|
|
# compression makes Horizon considerably slower, but makes it much easier
|
|
# to debug JS and CSS changes
|
|
@@ -74,7 +76,7 @@ DEBUG = True
|
|
# including on the login form.
|
|
#HORIZON_CONFIG["disable_password_reveal"] = False
|
|
|
|
-LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
|
|
+LOCAL_PATH = "{}/etc/horizon".format(SNAP_COMMON)
|
|
|
|
# Set custom secret key:
|
|
# You can either set it to a specific value or you can let horizon generate a
|
|
diff --git a/lib/python3.8/site-packages/openstack_dashboard/settings.py b/lib/python3.8/site-packages/openstack_dashboard/settings.py
|
|
index 81b8e45e1..5909bc8a8 100644
|
|
--- a/lib/python3.8/site-packages/openstack_dashboard/settings.py
|
|
+++ b/lib/python3.8/site-packages/openstack_dashboard/settings.py
|
|
@@ -50,6 +50,8 @@ if ROOT_PATH not in sys.path:
|
|
|
|
DEBUG = False
|
|
|
|
+SNAP_COMMON = os.environ['SNAP_COMMON']
|
|
+
|
|
ROOT_URLCONF = 'openstack_dashboard.urls'
|
|
|
|
HORIZON_CONFIG = {
|
|
@@ -211,7 +213,7 @@ USE_TZ = True
|
|
DEFAULT_EXCEPTION_REPORTER_FILTER = 'horizon.exceptions.HorizonReporterFilter'
|
|
|
|
SECRET_KEY = None
|
|
-LOCAL_PATH = None
|
|
+LOCAL_PATH = "{}/etc/horizon".format(SNAP_COMMON)
|
|
|
|
ADD_INSTALLED_APPS = []
|
|
|
|
@@ -260,7 +262,7 @@ else:
|
|
)
|
|
|
|
# allow to drop settings snippets into a local_settings_dir
|
|
-LOCAL_SETTINGS_DIR_PATH = os.path.join(ROOT_PATH, "local", "local_settings.d")
|
|
+LOCAL_SETTINGS_DIR_PATH = os.path.join(LOCAL_PATH, "local_settings.d")
|
|
if os.path.exists(LOCAL_SETTINGS_DIR_PATH):
|
|
for (dirpath, dirnames, filenames) in os.walk(LOCAL_SETTINGS_DIR_PATH):
|
|
for filename in sorted(filenames):
|
|
--
|
|
2.17.1
|
|
|