commit dcb30094d27961b94024a38d5d5c2b5d0d8baf69
author Matteo Scandolo <teo@onlab.us> Wed Jul 20 17:08:24 2016 -0700
committer Gerrit Code Review <gerrit@localhost> Wed Jul 20 17:08:24 2016 -0700
tree 434f7b025e1f8451b7930b65a0aa11fa0c7ccf64
parent 7bb770ba441ef143e8a88cd10f970304b65704d6
parent 1aeb49f58e921f45db3baec45ecedcc7651cf9d5

Merge "Sharing xosapi"

frontend/Vagrantfile

diff --git a/frontend/Vagrantfile b/frontend/Vagrantfile
index 38b2a92..62f981c 100644
--- a/frontend/Vagrantfile
+++ b/frontend/Vagrantfile
@@ -7,7 +7,8 @@
 
   # share the folder
   config.vm.synced_folder "../", "/opt/service-profile"
-  config.vm.synced_folder "../../xos", "/opt/xos"
+  config.vm.synced_folder "../../xos", "/opt/xos", create: true
+  config.vm.synced_folder "../../xos_services", "/opt/xos_services", create: true
   config.vm.synced_folder ".", "/vagrant", disabled: true
 
   # increase RAM

frontend/docker-compose-bootstrap.yml

diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index f2055fc..3d7677a 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -19,6 +19,9 @@
       - ../../xos_services:/opt/xos_services
       - ../../xos/xos/api/utility:/opt/xos/api/utility
       - ../../xos/xos/core:/opt/xos/core
+      - ../../xos/xos/xos:/opt/xos/xos
+      - ../../xos/xos/tosca:/opt/xos/tosca
+      - ../../xos/xos/synchronizers:/opt/xos/synchronizers
 
 xos_synchronizer_onboarding:
     image: xosproject/xos-synchronizer-onboarding

frontend/xos.yaml

diff --git a/frontend/xos.yaml b/frontend/xos.yaml
index ea222be..4eaddf5 100644
--- a/frontend/xos.yaml
+++ b/frontend/xos.yaml
@@ -54,4 +54,24 @@
           requirements:
               - xos:
                   node: xos
+                  relationship: tosca.relationships.UsedByXOS
+
+    /opt/xos/tosca:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/tosca/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
+                  relationship: tosca.relationships.UsedByXOS
+
+    /opt/xos/xos:
+          type: tosca.nodes.XOSVolume
+          properties:
+              host_path: { path_join: [ SELF, CONFIG_DIR, ../../xos/xos/xos/, ENV_VAR ] }
+              read_only: false
+          requirements:
+              - xos:
+                  node: xos
                   relationship: tosca.relationships.UsedByXOS
\ No newline at end of file