summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Carpenter <tommy@research.att.com>2017-10-09 12:08:22 -0400
committerTommy Carpenter <tommy@research.att.com>2017-10-09 12:09:06 -0400
commit6d5cbab5f8d4274fd6058bad3666388814f40b6f (patch)
treeed58abe5be6d03cbc94d42b7eb511183fcc7b9c4
parent1d01367aa505d2a2c6f6ad450c051ba7fb1e21af (diff)
Cleanup broker and cbs blueprints
Issue-ID: DCAEGEN2-117 Change-Id: I2307f05b967601aaf5ebc2d8bda6d1f31db89ef0 Signed-off-by: Tommy Carpenter <tommy@research.att.com>
-rw-r--r--blueprints/cdap_broker.yaml10
-rw-r--r--blueprints/config_binding_service.yaml12
2 files changed, 7 insertions, 15 deletions
diff --git a/blueprints/cdap_broker.yaml b/blueprints/cdap_broker.yaml
index fd96133..835723a 100644
--- a/blueprints/cdap_broker.yaml
+++ b/blueprints/cdap_broker.yaml
@@ -31,13 +31,11 @@ imports:
inputs:
location_id:
- default: "rework-central"
+ type: string
+ default: ""
cdap_cluster_name:
type: string
default: "cdap"
- broker_image:
- type: string
- description: full url to cdap broker image
node_templates:
@@ -45,8 +43,6 @@ node_templates:
#does nothing on install, but deletes all registered apps when broker is uninstalled
#uninstalling the broker without doing this leaves them in purgatory forever, unless CDAP was also uninstalled, but that may or may not be true or in the same blueprint.
type: dcae.nodes.broker_deleter
- properties:
- location_id: { get_input: location_id }
interfaces:
cloudify.interfaces.lifecycle:
delete:
@@ -74,7 +70,7 @@ node_templates:
endpoint: "/"
interval: "120s"
timeout: "60s"
- image: { get_input : broker_image }
+ image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.cdapbroker:4.0"
interfaces:
cloudify.interfaces.lifecycle:
start:
diff --git a/blueprints/config_binding_service.yaml b/blueprints/config_binding_service.yaml
index d20d9c3..5dd5ced 100644
--- a/blueprints/config_binding_service.yaml
+++ b/blueprints/config_binding_service.yaml
@@ -29,18 +29,14 @@ imports:
- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml
inputs:
-
location_id:
- description: Location of where to deploy to
+ type: string
+ default: ""
docker_host_override:
description: Target docker host to deploy applications to
- # This default comes from the DockerBP.yaml
default: 'platform_dockerhost'
-
- cbs_image:
- description: full url of the CBS image
-
+
node_templates:
# Config binding service
service-config-binding:
@@ -49,7 +45,7 @@ node_templates:
name: 'config_binding_service'
host_port: 10000
container_port: 10000
- image: { get_input : cbs_image }
+ image: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.configbinding:1.2"
docker_config:
healthcheck:
type: "http"