commit e78743c51a1db139b58447edd2c42e7d004c9f4f
author Scott Baker <scottb@onlab.us> Fri Jul 08 15:42:19 2016 -0700
committer Gerrit Code Review <gerrit@localhost> Fri Jul 08 15:42:19 2016 -0700
tree 97115d3f0ec2dcfebd776f6831fa3dbf239c3466
parent 0da50d17330a3a79cecfaae2777aab0ade13d7d2
parent cccb0a360e8a46b73b7d254d9f496987236eafc8

Merge "FIXes in Makefile for monitoring service deployment"

cord-pod/make-vtn-external-yaml.sh

diff --git a/cord-pod/make-vtn-external-yaml.sh b/cord-pod/make-vtn-external-yaml.sh
index 71437d5..fc05922 100644
--- a/cord-pod/make-vtn-external-yaml.sh
+++ b/cord-pod/make-vtn-external-yaml.sh
@@ -104,7 +104,7 @@
               node: service#vtn
               relationship: tosca.relationships.UsedByService
       properties:
-          install_dependencies: http://new-host:8080/repository/org/opencord/cord-config/1.0-SNAPSHOT/cord-config-1.0-SNAPSHOT.oar,http://new-host:8080/repository/org/opencord/vtn/1.0-SNAPSHOT/vtn-1.0-SNAPSHOT.oar
+          install_dependencies: http://mavenrepo:8080/repository/org/opencord/cord-config/1.0-SNAPSHOT/cord-config-1.0-SNAPSHOT.oar,http://mavenrepo:8080/repository/org/opencord/vtn/1.0-SNAPSHOT/vtn-1.0-SNAPSHOT.oar
           dependencies: org.onosproject.drivers, org.onosproject.drivers.ovsdb, org.onosproject.openflow-base, org.onosproject.ovsdb-base, org.onosproject.dhcp
           autogenerate: vtn-network-cfg
 EOF

frontend/xos.yaml

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