diff options
Diffstat (limited to 'heat')
-rw-r--r-- | heat/docker-compose-3.yaml | 5 | ||||
-rw-r--r-- | heat/docker-compose-4.yaml | 1 | ||||
-rwxr-xr-x | heat/register.sh | 24 |
3 files changed, 24 insertions, 6 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 54efe03..c13562d 100644 --- a/heat/docker-compose-4.yaml +++ b/heat/docker-compose-4.yaml @@ -164,3 +164,4 @@ services: volumes: - "./tls/shared:/opt/tls/shared" + diff --git a/heat/register.sh b/heat/register.sh index c48d8b7..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}" @@ -533,7 +555,7 @@ SERVICENAME="${SRVCNAME_STATIC_DFC}" "dmaap.dmaapConsumerConfiguration.consumerGroup": "OpenDcae-c12", "dmaap.dmaapConsumerConfiguration.timeoutMs": -1, "dmaap.dmaapConsumerConfiguration.messageLimit": 1, - "dmaap.dmaapProducerConfiguration.dmaapHostName": "{{ dr_ip_addr }}", + "dmaap.dmaapProducerConfiguration.dmaapHostName": "{{ mr_ip_addr }}", "dmaap.dmaapProducerConfiguration.dmaapPortNumber": 3907, "dmaap.dmaapProducerConfiguration.dmaapTopicName": "publish", "dmaap.dmaapProducerConfiguration.dmaapProtocol": "https", |