Merge branch 'develop' into feature/REPORTING-307-msr-vpn-proxy-endpoint

inventory_provider/config.py

@@ -226,7 +226,6 @@ CONFIG_SCHEMA = {
     'oneOf': [
         {
             'required': [
-                'ops-db',
                 'ssh',
                 'redis',
                 'redis-databases',
@@ -237,7 +236,6 @@ CONFIG_SCHEMA = {
         },
         {
             'required': [
-                'ops-db',
                 'ssh',
                 'sentinel',
                 'redis-databases',

test/conftest.py

@@ -28,12 +28,6 @@ def data_config_filename():
 
     with tempfile.NamedTemporaryFile() as f:
         config = {
-            "ops-db": {
-                "hostname": "xxxxxxx.yyyyy.zzz",
-                "dbname": "xxxxxx",
-                "username": "xxxxxx",
-                "password": "xxxxxxxx"
-            },
             "ssh": {
                 "username": "uSeR-NaMe",
                 "private-key": "private-key-filename",