From da9cdd6a23d2fa2748795a6c83b14cc4d3fa3d13 Mon Sep 17 00:00:00 2001 From: Michael Hwang Date: Wed, 6 Sep 2017 17:46:45 -0400 Subject: Enhance to query Consul for target docker host * `SelectedDockerHost` actually queries by a name stem and location * Shorten name * Tag components with deployment id Change-Id: I715f1de25fa047ce70eb26a5cc7615cfd3b408e7 Issue-ID: DCAEGEN2-91 Signed-off-by: Michael Hwang --- docker/docker-node-type.yaml | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'docker/docker-node-type.yaml') diff --git a/docker/docker-node-type.yaml b/docker/docker-node-type.yaml index 5fb0e27..b1bf64c 100644 --- a/docker/docker-node-type.yaml +++ b/docker/docker-node-type.yaml @@ -7,7 +7,7 @@ plugins: docker: executor: 'central_deployment_agent' package_name: dockerplugin - package_version: 2.3.0 + package_version: 2.3.0+t.0.3 node_types: # The DockerContainerForComponents node type is to be used for DCAE service components that @@ -29,11 +29,18 @@ node_types: service_id: type: string - description: Unique id for this DCAE service instance this component belongs to + description: > + Unique id for this DCAE service instance this component belongs to. This value + will be applied as a tag in the registration of this component with Consul. + default: Null location_id: type: string - description: Location id of where to run the container + description: > + Location id of where to run the container. + DEPRECATED - No longer used. Infer the location from the docker host service + and/or node. + default: Null service_component_name_override: type: string @@ -228,12 +235,18 @@ node_types: type: string description: Location id of the Docker host to use + name_search: + type: string + description: String to use when matching for names + default: component-dockerhost + # REVIEW: This field should really be optional but because there's no functionality # that provides the dynamic solution sought after yet, it has been promoted to be # required. docker_host_override: type: string description: Docker hostname here is used as a manual override + default: Null interfaces: cloudify.interfaces.lifecycle: -- cgit 1.2.3-korg