diff options
| -rw-r--r-- | blueprints/DockerBP.yaml-template | 15 | ||||
| -rw-r--r-- | blueprints/inventory.yaml-template | 6 | ||||
| -rw-r--r-- | input-templates/inputs.yaml | 2 |
3 files changed, 21 insertions, 2 deletions
diff --git a/blueprints/DockerBP.yaml-template b/blueprints/DockerBP.yaml-template index a64525d..28f2180 100644 --- a/blueprints/DockerBP.yaml-template +++ b/blueprints/DockerBP.yaml-template @@ -132,6 +132,13 @@ inputs: CONSUL_BIN_DIR=/opt/consul/bin curl -Ss https://releases.hashicorp.com/consul/0.8.3/consul_0.8.3_linux_amd64.zip > $CONSUL_BIN_DIR/consul_0.8.3_linux_amd64.zip unzip $CONSUL_BIN_DIR/consul_0.8.3_linux_amd64.zip -d $CONSUL_BIN_DIR + # NOTE: The health check for the docker host is a simple existence look up for + # registrator (name is hardcoded). It does not check if registrator is running. + # This would require a script health check which means we might need to turn on + # "enable_script_check". + # NOTE: At the time of this change, there is no issue but there could be a + # chicken-and-egg issue where the health check might depend upon future downstream + # nodes (registrator) that downstream node requires a *healthy* docker host. cat <<EOF > /opt/consul/config/consul.json { "bind_addr" : "0.0.0.0", @@ -156,7 +163,13 @@ inputs: "name": "$REGNAME", "address": "$MYPUB", "port": 2376, - "tags": $SERVICE_TAGS + "tags": $SERVICE_TAGS, + "checks": [ + { + "http": "http://$MYPUB:2376/containers/registrator/json", + "interval": "30s" + } + ] }, "node_meta": { "fqdn": "$FQDN" diff --git a/blueprints/inventory.yaml-template b/blueprints/inventory.yaml-template index e0dbef6..7e209d9 100644 --- a/blueprints/inventory.yaml-template +++ b/blueprints/inventory.yaml-template @@ -83,6 +83,12 @@ node_templates: isFilterInEmptyResources: false dcaeInventoryClient: uri: http://inventory:8080 + docker_config: + healthcheck: + type: "docker" + interval: "30s" + timeout: "3s" + script: "/opt/health.sh" image: { get_input: service_change_handler_image } relationships: diff --git a/input-templates/inputs.yaml b/input-templates/inputs.yaml index a30b2cd..71db905 100644 --- a/input-templates/inputs.yaml +++ b/input-templates/inputs.yaml @@ -15,4 +15,4 @@ key_filename: '/opt/dcae/key' location_prefix: 'onapr1' location_domain: 'dcae2.onapdevlab.onap.org' codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content' -codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts/cloud_init' +codesource_version: 'org.onap.dcaegen2.deployments/releases' |