From a9ccf71fd9d410b140354a0c8eba7b6ec3bf94ea Mon Sep 17 00:00:00 2001 From: DeWayne Filppi Date: Sat, 23 May 2015 16:11:44 -0700 Subject: [PATCH] fixes for getting mongo url propertly --- dproxy/example/nodejs/openstack-blueprint.yaml | 2 -- dproxy/example/nodejs/scripts/mongo/set-mongo-url.sh | 5 +++-- dproxy/example/nodejs/singlehost-blueprint.yaml | 8 +++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dproxy/example/nodejs/openstack-blueprint.yaml b/dproxy/example/nodejs/openstack-blueprint.yaml index adcc235..1a788d9 100644 --- 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 index 1583b9a..02952c5 100644 --- 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 index 6fa1320..3485a2a 100644 --- 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