From 2924a7e6835c108683f2fff531a64d2ea4459b2a Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@gmail.com>
Date: Thu, 10 Oct 2019 15:51:50 +0200
Subject: [PATCH] Add ``source`` configuration option

Remove unused configuration options provided by layer.
---
 src/config.yaml                        | 23 +++++++++++++++++++++++
 src/layer.yaml                         |  6 ++++++
 src/lib/charm/openstack/ovn_chassis.py |  1 +
 3 files changed, 30 insertions(+)
 create mode 100644 src/config.yaml

diff --git a/src/config.yaml b/src/config.yaml
new file mode 100644
index 0000000..f9a13c4
--- /dev/null
+++ b/src/config.yaml
@@ -0,0 +1,23 @@
+options:
+  source:
+    default: distro
+    type: string
+    description: |
+      Repository from which to install OVS+OVN
+
+      May be one of the following:
+
+        distro (default)
+        ppa:somecustom/ppa (PPA name must include UCA OpenStack Release name)
+        deb url sources entry|key id
+        or a supported Ubuntu Cloud Archive pocket.
+
+      Supported Ubuntu Cloud Archive pockets include:
+
+        cloud:xenial-pike
+        cloud:xenial-queens
+        cloud:bionic-rocky
+
+      Note that updating this setting to a source that is known to
+      provide a later version of Ceph will trigger a software
+      upgrade.
diff --git a/src/layer.yaml b/src/layer.yaml
index efb9516..65e30bf 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -9,4 +9,10 @@ options:
 repo: https://github.com/openstack/charm-ovn-controller
 config:
   deletes:
+    - debug
+    - ssl_ca
+    - ssl_cert
+    - ssl_key
+    - use-internal-endpoints
+    - use-syslog
     - verbose
diff --git a/src/lib/charm/openstack/ovn_chassis.py b/src/lib/charm/openstack/ovn_chassis.py
index 4fb04d7..dbf015c 100644
--- a/src/lib/charm/openstack/ovn_chassis.py
+++ b/src/lib/charm/openstack/ovn_chassis.py
@@ -52,6 +52,7 @@ class OVNChassisCharm(charms_openstack.charm.OpenStackCharm):
         '/etc/default/ovn-host': ['ovn-host'],
     }
     python_version = 3
+    source_config_key = 'source'
     # Name of unitdata key with information on whether to enable metadata
     metadata_kv_key = 'ovn-chassis-enable-metadata'