From 8b733fed727048379caa34c1ca094d989be6d174 Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Sat, 16 May 2020 22:11:36 +0200
Subject: [PATCH] Remove inherited configuration options invalid for charm

The shared OVN code that previously was distributed using the
OVN layer is now in c-h.  The ovn-central charm does not have
common code with the chassis charms so it is safe to switch to
consuming the openstack layer directly.

Change-Id: I87706f0ba005d18688c4b87bc5fc1b7115fcf7d5
Closes-Bug: #1879088
---
 src/layer.yaml | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/layer.yaml b/src/layer.yaml
index 6bc2e45..ea830fa 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,6 +1,7 @@
 includes:
-  - layer:ovn
+  - layer:openstack
   - layer:leadership
+  - interface:ovsdb
   - interface:ovsdb-cluster
   - interface:ovsdb-cms
 options:
@@ -11,16 +12,9 @@ repo: https://opendev.org/x/charm-ovn-central
 config:
   deletes:
     - debug
-    - dpdk-bond-config
-    - dpdk-bond-mappings
-    - dpdk-driver
-    - dpdk-socket-cores
-    - dpdk-socket-memory
-    - enable-dpdk
-    - enable-hardware-offload
-    - enable-sriov
-    - interface-bridge-mappings
-    - networking-tools-source
-    - ovn-bridge-mappings
-    - sriov-device-mappings
-    - sriov-numvfs
+    - ssl_ca
+    - ssl_cert
+    - ssl_key
+    - use-internal-endpoints
+    - use-syslog
+    - verbose