commit 6032074f07b5525f60af9d20b1cf5354d32794ce
author Scott Baker <smbaker@gmail.com> Tue Jun 19 09:51:19 2018 -0700
committer Scott Baker <smbaker@gmail.com> Wed Jun 27 11:06:48 2018 -0700
tree 3b867465d7a183cbebc7b6efd7fa0dfd285c8e28
parent 575a14ef7b5c26574b3e87814a1c7cfd64390f4c

CORD-3162 split exampleservice config files

Change-Id: I678f998e39321ba6f6249e2a560972338cfdd020

xos/synchronizer/config.yaml

diff --git a/xos/synchronizer/exampleservice_config.yaml b/xos/synchronizer/config.yaml
similarity index 85%
rename from xos/synchronizer/exampleservice_config.yaml
rename to xos/synchronizer/config.yaml
index 57e1f80..edce5e0 100644
--- a/xos/synchronizer/exampleservice_config.yaml
+++ b/xos/synchronizer/config.yaml
@@ -15,9 +15,6 @@
 
 
 name: exampleservice
-accessor:
-  username: xosadmin@opencord.org
-  password: "@/opt/xos/services/exampleservice/credentials/xosadmin@opencord.org"
 required_models:
   - ExampleService
   - ExampleServiceInstance
@@ -28,3 +25,13 @@
 sys_dir: "/opt/xos/synchronizers/exampleservice/sys"
 model_policies_dir: "/opt/xos/synchronizers/exampleservice/model_policies"
 models_dir: "/opt/xos/synchronizers/exampleservice/models"
+logging:
+  version: 1
+  handlers:
+    console:
+      class: logging.StreamHandler
+  loggers:
+    'multistructlog':
+      handlers:
+          - console
+      level: DEBUG

xos/synchronizer/exampleservice-synchronizer.py

diff --git a/xos/synchronizer/exampleservice-synchronizer.py b/xos/synchronizer/exampleservice-synchronizer.py
index 2548f7c..06fea1b 100644
--- a/xos/synchronizer/exampleservice-synchronizer.py
+++ b/xos/synchronizer/exampleservice-synchronizer.py
@@ -16,15 +16,20 @@
 
 #!/usr/bin/env python
 
-# Runs the standard XOS synchronizer
+# ExampleService Synchronizer. This loads the config file and starts the synchronizer
 
 import importlib
 import os
 import sys
 from xosconfig import Config
 
-config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/exampleservice_config.yaml')
-Config.init(config_file, 'synchronizer-config-schema.yaml')
+base_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/config.yaml')
+mounted_config_file = os.path.abspath(os.path.dirname(os.path.realpath(__file__)) + '/mounted_config.yaml')
+
+if os.path.isfile(mounted_config_file):
+    Config.init(base_config_file, 'synchronizer-config-schema.yaml', mounted_config_file)
+else:
+    Config.init(base_config_file, 'synchronizer-config-schema.yaml')
 
 synchronizer_path = os.path.join(os.path.dirname(
     os.path.realpath(__file__)), "../../synchronizers/new_base")