HONEYCOMB-355: move BGP to separate distribution

Given current YangBindingProviderModule implementation (HONEYCOMB-358),
needed to preserve footprint of minimal distro.

The change also:
- reverts logger&persistence config changes
introduced by https://gerrit.fd.io/r/#/c/5972/
- improves logging for BGP component initialization

Change-Id: Ie223833518be21628edb7ace36c7618e427585e0
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 4 insertions, 60 deletions

diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json
deleted file mode 100644
index 6de2065b8..000000000
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/bgp-peers.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "bgp-openconfig-extensions:neighbors": {
-    "neighbor": [
-      {
-        "neighbor-address": "10.25.1.9",
-        "config": {
-          "peer-group": "application-peers"
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      },
-      {
-        "neighbor-address": "127.0.0.2",
-        "config": {
-          "peer-type": "INTERNAL"
-        },
-        "timers": {
-          "config": {
-            "connect-retry": 10,
-            "hold-time": 90
-          }
-        },
-        "transport": {
-          "config": {
-            "remote-port": 17900,
-            "passive-mode": false
-          }
-        },
-        "afi-safis": {
-          "afi-safi": [
-            {
-              "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
-              "receive": true,
-              "send-max": 0
-            }
-          ]
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
index 95ab71292..1199f85bc 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/honeycomb.json
@@ -1,8 +1,8 @@
   {
-  "persist-context": "false",
+  "persist-context": "true",
   "persisted-context-path": "/var/lib/honeycomb/persist/context/data.json",
   "persisted-context-restoration-type": "Merge",
-  "persist-config": "false",
+  "persist-config": "true",
   "persisted-config-path": "/var/lib/honeycomb/persist/config/data.json",
   "persisted-config-restoration-type": "Merge",
 
@@ -37,14 +37,6 @@
   "netconf-ssh-binding-port": 2831,
   "netconf-notification-stream-name": "honeycomb",
 
-  "bgp-enabled": "true",
-  "bgp-binding-address": "127.0.0.1",
-  "bgp-port": 1790,
-  "bgp-as-number": 65000,
-  "bgp-receive-multiple-paths": "true",
-  "bgp-send-max-paths": 0,
-  "bgp-netty-threads": 2,
-
   "username": "admin",
   "password": "admin"
 }
\ No newline at end of file
diff --git a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
index 02e801d00..6dd4d4fc0 100644
--- a/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
+++ b/infra/minimal-distribution/src/main/resources/honeycomb-minimal-resources/config/logback.xml
@@ -6,10 +6,10 @@
     </encoder>
   </appender>
   <appender name="honeycomb.log" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>honeycomb.log</file>
+    <file>/var/log/honeycomb/honeycomb.log</file>
 
     <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-      <fileNamePattern>logs/honeycomb.%d.log.zip</fileNamePattern>
+      <fileNamePattern>/var/log/honeycomb/logs/honeycomb.%d.log.zip</fileNamePattern>
       <maxHistory>1</maxHistory>
     </rollingPolicy>