summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--heat/docker-compose-3.yaml5
-rw-r--r--heat/docker-compose-4.yaml7
-rwxr-xr-xheat/register.sh22
3 files changed, 29 insertions, 5 deletions
diff --git a/heat/docker-compose-3.yaml b/heat/docker-compose-3.yaml
index 6ef467c..27dbb38 100644
--- a/heat/docker-compose-3.yaml
+++ b/heat/docker-compose-3.yaml
@@ -49,11 +49,6 @@ services:
- "CLOUDIFY_USER=admin"
ports:
- "8188:8443"
- labels:
- - "SERVICE_8443_NAME=deployment_handler"
- - "SERVICE_8443_CHECK_HTTP=/"
- - "SERVICE_8443_CHECK_INTERVAL=15s"
- - "SERVICE_8443_CHECK_INITIAL_STATUS=passing"
volumes:
- "./tls/shared:/opt/app/dh/etc/cert/"
diff --git a/heat/docker-compose-4.yaml b/heat/docker-compose-4.yaml
index d0a8d4f..c13562d 100644
--- a/heat/docker-compose-4.yaml
+++ b/heat/docker-compose-4.yaml
@@ -106,6 +106,10 @@ services:
- "SERVICE_NAME=static-dcaegen2-services-mua"
- "HOSTNAME=static-dcaegen2-services-mua"
- "HOSTALIASES=/etc/host.aliases"
+ - "MR_DEFAULT_PORT_NUMBER=3904"
+ - "URL_JDBC=jdbc:postgresql://{{dcae_ip_addr}}:5433/inventory"
+ - "JDBC_USERNAME=inventory"
+ - "JDBC_PASSWORD=inventorypwd"
labels:
- "SERVICE_NAME=static-dcaegen2-services-mua"
- "SERVICE_CHECK_DOCKER_SCRIPT=/opt/app/datafile/bin/healthcheck.sh"
@@ -127,6 +131,9 @@ services:
- "SERVICE_NAME=static-dcaegen2-services-msnmp"
- "HOSTNAME=static-dcaegen2-services-msnmp"
- "HOSTALIASES=/etc/host.aliases"
+ - "URL_JDBC=jdbc:postgresql://{{dcae_ip_addr}}:5433/inventory"
+ - "JDBC_USERNAME=inventory"
+ - "JDBC_PASSWORD=inventorypwd"
labels:
- "SERVICE_NAME=static-dcaegen2-services-msnmp"
- "SERVICE_CHECK_DOCKER_SCRIPT=/opt/app/datafile/bin/healthcheck.sh"
diff --git a/heat/register.sh b/heat/register.sh
index 62ef091..6843fa4 100755
--- a/heat/register.sh
+++ b/heat/register.sh
@@ -89,6 +89,28 @@ curl -v -X PUT -H 'Content-Type: application/json' \
"http://${HOSTNAME_CONSUL}:8500/v1/kv/docker_plugin/docker_logins"
+# registering deployment handler
+SVC_NAME="deployment_handler"
+SVC_IP="$(cat /opt/config/dcae_ip_addr.txt)"
+REGREQ="
+{
+ \"Name\" : \"${SVC_NAME}\",
+ \"ID\" : \"${SVC_NAME}\",
+ \"Address\": \"${SVC_IP}\",
+ \"Port\": 8188,
+ \"Check\" : {
+ \"Name\" : \"${SVC_NAME}_health\",
+ \"Interval\" : \"15s\",
+ \"HTTP\" : \"https://${SVC_IP}:8188/\",
+ \"tls_skip_verify\": true,
+ \"Status\" : \"passing\"
+ }
+}
+"
+curl -v -X PUT -H 'Content-Type: application/json' \
+--data-binary \
+"$REGREQ" "http://${HOSTNAME_CONSUL}:8500/v1/agent/service/register"
+
# registering Holmes services
SVC_NAME="${SRVCNAME_MVP_HR}"