commit f95cd5bf327f74c4793ba0dc961163efb68e5f3b
author Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Sun Jul 10 19:08:04 2016 +0000
committer Srikanth Vavilapalli <srikanth.vavilapalli@ericsson.com> Mon Jul 25 18:30:24 2016 +0000
tree b9f99f729869b4c4dc10b3f6acefc8619ba3b5b3
parent 78ea35acefd7a54d40f66d58c56ae2469ef311a3

Fixes to make ACORD service-profile work in devstack mitaka backend-part1

Change-Id: Ie0d2e8dc6d3a9a92506e21a23c7bc6df73deca9e

acord/docker-compose.yml

diff --git a/acord/docker-compose.yml b/acord/docker-compose.yml
index da9562e..9ef6fc7 100644
--- a/acord/docker-compose.yml
+++ b/acord/docker-compose.yml
@@ -4,8 +4,8 @@
         - "5432"
 
 xos_synchronizer_openstack:
-    command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
     image: xosproject/xos-synchronizer-openstack
+    command: bash -c "sleep 120; python /opt/xos/synchronizers/openstack/xos-synchronizer.py"
     labels:
         org.xosproject.kind: synchronizer
         org.xosproject.target: openstack
@@ -15,35 +15,7 @@
         - ctl:${MYIP}
     volumes:
         - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
-        - ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
-        - ../setup:/root/setup:ro
-
-xos_synchronizer_monitoring_channel:
-    image: xosproject/xos-synchronizer-openstack
-    command: bash -c "sleep 120; python /opt/xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer.py -C /opt/xos/synchronizers/monitoring_channel/monitoring_channel_synchronizer_config"
-    labels:
-        org.xosproject.kind: synchronizer
-        org.xosproject.target: monitoring_channel
-    links:
-        - xos_db
-    extra_hosts:
-        - ctl:${MYIP}
-    volumes:
-        - ../setup/id_rsa:/opt/xos/synchronizers/monitoring_channel/monitoring_channel_private_key:ro  # private key
-
-#Ensure exampleservice is enabled in xos/tools/xos-manage and xos/settings.py file before uncommenting below lines
-#xos_synchronizer_exampleservice:
-#    image: xosproject/xos-synchronizer-openstack
-#    command: bash -c "sleep 120; python /opt/xos/synchronizers/exampleservice/exampleservice-synchronizer.py -C /opt/xos/synchronizers/exampleservice/exampleservice_config"
-#    labels:
-#        org.xosproject.kind: synchronizer
-#        org.xosproject.target: exampleservice
-#    links:
-#        - xos_db
-#    volumes:
-#        - ../setup:/root/setup:ro
-#        - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
-#        - ../setup/id_rsa:/opt/xos/synchronizers/exampleservice/exampleservice_private_key:ro
+        - ./images:/opt/xos/images:ro
 
 # FUTURE
 #xos_swarm_synchronizer:
@@ -62,6 +34,3 @@
     volumes:
       - ../setup:/root/setup:ro
       - ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config:ro
-      - ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
-      - ../setup/id_rsa.pub:/opt/xos/synchronizers/monitoring_channel/monitoring_channel_public_key:ro
-#      - ../setup/id_rsa.pub:/opt/xos/synchronizers/exampleservice/exampleservice_public_key:ro