fixes for getting mongo url propertly

dfilppi · May 23, 2015 · a9ccf71 · a9ccf71
1 parent c323f37
commit a9ccf71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/dproxy/example/nodejs/openstack-blueprint.yaml b/dproxy/example/nodejs/openstack-blueprint.yaml
@@ -137,8 +137,6 @@ node_templates:
 
       - type: node_contained_in_nodejs
         target: nodejs
-      - type: cloudify.relationships.depends_on
-        target: proxy
 
   ##
   #  The blueprint proxy to mongo

diff --git a/dproxy/example/nodejs/scripts/mongo/set-mongo-url.sh b/dproxy/example/nodejs/scripts/mongo/set-mongo-url.sh
@@ -2,5 +2,6 @@
 
 set -e
 
-ctx source instance runtime_properties mongo_ip_address $(ctx target instance runtime_properties outputs.server_info.value.ip_address)
-ctx source instance runtime_properties mongo_port $(ctx target instance runtime_properties outputs.server_info.value.port)
+ctx source instance runtime_properties mongo_ip_address $(ctx target instance runtime_properties outputs.endpoint.value.ip_address)
+ctx source instance runtime_properties mongo_port $(ctx target instance runtime_properties outputs.endpoint.value.port)
+
diff --git a/dproxy/example/nodejs/singlehost-blueprint.yaml b/dproxy/example/nodejs/singlehost-blueprint.yaml
@@ -101,17 +101,15 @@ node_templates:
       # Setting the mongo connection
       ################################
 
-#      - type: node_connected_to_mongo
-#        target: mongod
-#
+      - type: node_connected_to_mongo
+        target: mongod
+
       ################################
       # Setting the nodejs connection
       ################################
 
       - type: node_contained_in_nodejs
         target: nodejs
-      - type: cloudify.relationships.depends_on
-        target: proxy
 
   proxy:
     type: cloudify.nodes.DeploymentProxy