refix syntax error, fix IP address

retrieve the proper value for the IP address to register in Consul

Change-Id: I8742d15bf4d80bad1914cb92dd7033aaa944aef0
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: DCAEGEN2-185

diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template
index 9a85288..a08df40 100644 (file)
--- a/blueprints/pgaas-cluster.yaml-template
+++ b/blueprints/pgaas-cluster.yaml-template
@@ -129,7 +129,7 @@ inputs:
         *00 ) WRITE=-write ;;
         *01 ) WRITE= ;;
       esac
-      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d '{"name" : "${CLUSTER_NAME}${WRITE}", "Address" : "${LOCAL_IP}", "Port" : 5432}"'
+      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d "{\"name\" : \"${CLUSTER_NAME}${WRITE}\", \"Address\" : \"${LOCAL_IP}\", \"Port\" : 5432}"
 
       echo ALL DONE
 
@@ -236,7 +236,7 @@ node_templates:
                   - { get_property: [ dns_pgrs00, fqdn ] }
                   - "'\n"
                   - "LOCAL_IP='"
-                  - { get_attribute: [ host_pgrs00, ip ] }
+                  - { get_attribute: [ floatingip_pgrs00, floating_ip_address ] }
                   - "'\n"
                   - "PG_NODES='"
                   - { get_property: [ dns_pgrs00, fqdn ] }
@@ -338,7 +338,7 @@ node_templates:
                   - { get_property: [ dns_pgrs00, fqdn ] }
                   - "'\n"
                   - "LOCAL_IP='"
-                  - { get_attribute: [ host_pgrs01, ip ] }
+                  - { get_attribute: [ floatingip_pgrs01, floating_ip_address ] }
                   - "'\n"
                   - "PG_NODES='"
                   - { get_property: [ dns_pgrs00, fqdn ] }

diff --git a/blueprints/pgaas-onevm.yaml-template b/blueprints/pgaas-onevm.yaml-template
index ec7aa36..213a35f 100644 (file)
--- a/blueprints/pgaas-onevm.yaml-template
+++ b/blueprints/pgaas-onevm.yaml-template
@@ -118,8 +118,8 @@ inputs:
           dpkg --install $OUT
       done
 
-      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d '{"name" : "${CLUSTER_NAME}-write", "Address" : "${LOCAL_IP}", "Port" : 5432}"'
-      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d '{"name" : "${CLUSTER_NAME}", "Address" : "${LOCAL_IP}", "Port" : 5432}"'
+      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d "{\"name\" : \"${CLUSTER_NAME}-write\", \"Address\" : \"${LOCAL_IP}\", \"Port\" : 5432}\""
+      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d "{\"name\" : \"${CLUSTER_NAME}\", \"Address\" : \"${LOCAL_IP}\", \"Port\" : 5432}"
 
       echo ALL DONE
 
@@ -229,7 +229,7 @@ node_templates:
                   - { get_property: [ dns_pgrs00, fqdn ] }
                   - "'\n"
                   - "LOCAL_IP='"
-                  - { get_attribute: [ host_pgrs00, ip ] }
+                  - { get_attribute: [ floatingip_pgrs00, floating_ip_address ] }
                   - "'\n"
                   - "PG_NODES='"
                   - { get_property: [ dns_pgrs00, fqdn ] }

diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template
index 245b564..845ba72 100644 (file)
--- a/blueprints/pgaas.yaml-template
+++ b/blueprints/pgaas.yaml-template
@@ -122,7 +122,7 @@ inputs:
         *00 ) WRITE=-write ;;
         *01 ) WRITE= ;;
       esac
-      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d '{"name" : "${CLUSTER_NAME}${WRITE}", "Address" : "${LOCAL_IP}", "Port" : 5432}"'
+      curl -v -X PUT -H "Content-Type: application/json" "http://${LOCATION_PREFIX}cnsl00.${LOCATION_DOMAIN}:8500/v1/agent/service/register" -d "{\"name\" : \"${CLUSTER_NAME}${WRITE}\", \"Address\" : \"${LOCAL_IP}\", \"Port\" : 5432}"
 
       echo ALL DONE
 
@@ -232,7 +232,7 @@ node_templates:
                   - { get_property: [ dns_pgrs00, fqdn ] }
                   - "'\n"
                   - "LOCAL_IP='"
-                  - { get_attribute: [ host_pgrs00, ip ] }
+                  - { get_attribute: [ floatingip_pgrs00, floating_ip_address ] }
                   - "'\n"
                   - "PG_NODES='"
                   - { get_property: [ dns_pgrs00, fqdn ] }
@@ -334,7 +334,7 @@ node_templates:
                   - { get_property: [ dns_pgrs00, fqdn ] }
                   - "'\n"
                   - "LOCAL_IP='"
-                  - { get_attribute: [ host_pgrs01, ip ] }
+                  - { get_attribute: [ floatingip_pgrs01, floating_ip_address ] }
                   - "'\n"
                   - "PG_NODES='"
                   - { get_property: [ dns_pgrs00, fqdn ] }