Merge branch 'master' into feature/add-exampleservice
diff --git a/xos/configurations/cord-pod/docker-compose.yml b/xos/configurations/cord-pod/docker-compose.yml
index fa8660a..03b1426 100644
--- a/xos/configurations/cord-pod/docker-compose.yml
+++ b/xos/configurations/cord-pod/docker-compose.yml
@@ -116,8 +116,25 @@
         - ./id_rsa.pub:/opt/xos/synchronizers/onos/onos_key.pub:ro
         - ./id_rsa.pub:/opt/xos/synchronizers/vcpe/vcpe_public_key:ro
         - ./id_rsa.pub:/opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key:ro
+        - ./id_rsa.pub:/opt/xos/synchronizers/exampleservice/exampleservice_public_key:ro
     log_driver: "json-file"
     log_opt:
             max-size: "100k"
             max-file: "5"
 
+xos_synchronizer_exampleservice:
+    image: xosproject/xos-synchronizer-openstack
+    command: bash -c "sleep 120; python /opt/xos/synchronizers/exampleservice/exampleservice-synchronizer.py -C /root/setup/files/exampleservice_config"
+    labels:
+        org.xosproject.kind: synchronizer
+        org.xosproject.target: exampleservice
+    links:
+        - xos_db
+    volumes:
+        - .:/root/setup:ro
+        - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
+        - ./id_rsa:/opt/xos/synchronizers/exampleservice/exampleservice_private_key:ro
+    log_driver: "json-file"
+    log_opt:
+            max-size: "100k"
+            max-file: "5"
diff --git a/xos/tools/xos-manage b/xos/tools/xos-manage
index a4705d9..540f241 100755
--- a/xos/tools/xos-manage
+++ b/xos/tools/xos-manage
@@ -151,6 +151,7 @@
     python ./manage.py makemigrations vrouter
     python ./manage.py makemigrations vtn
     python ./manage.py makemigrations fabric
+    python ./manage.py makemigrations exampleservice
     #python ./manage.py makemigrations servcomp
 }
 
diff --git a/xos/xos/settings.py b/xos/xos/settings.py
index 2f8fa27..607c145 100644
--- a/xos/xos/settings.py
+++ b/xos/xos/settings.py
@@ -193,6 +193,7 @@
     'services.vrouter',
     'services.vtn',
     'services.fabric',
+    'services.exampleservice',
     'geoposition',
     'rest_framework_swagger',
 )