From 81b242147f174fc5d7cc983c36769d029ac1761b Mon Sep 17 00:00:00 2001 From: Tommy Carpenter Date: Mon, 11 Sep 2017 11:59:09 -0400 Subject: Cleanup after Policy update Issue-ID: DCAEGEN2-96 Change-Id: Iebc195340211faea6d0bcc834015117ba9ded09d Signed-off-by: Tommy Carpenter --- cdap/demo_blueprints/cdap_hello_world.yaml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'cdap/demo_blueprints/cdap_hello_world.yaml') diff --git a/cdap/demo_blueprints/cdap_hello_world.yaml b/cdap/demo_blueprints/cdap_hello_world.yaml index 197603f..f150cb0 100644 --- a/cdap/demo_blueprints/cdap_hello_world.yaml +++ b/cdap/demo_blueprints/cdap_hello_world.yaml @@ -2,9 +2,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - #- {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.0.2/cdap_types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.0/cdap_types.yaml - #TODO: IMPORT ALEX'S TYPE FILE + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.1/cdap_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dcaepolicy/0.0.1/node-type.yaml inputs: hello_world_jar_url: @@ -13,25 +12,6 @@ inputs: type: string default : "cdap_broker" -#TODO: THIS WILL GO AWAY ONCE TYPE FILE IS IMP[ORTED -node_types: - dcae.nodes.policy: - derived_from: cloudify.nodes.Root - properties: - policy_id: - description: PK to policy - type: string - default: DCAE_alex.Config_empty-policy - policy_apply_mode: - description: choice of how to apply the policy update - none or script - type: string - default: none - interfaces: - cloudify.interfaces.lifecycle: - create: - implementation: cdap_deploy.cdapcloudify.cdap_plugin.policy_get -#TODO: THIS WILL GO AWAY ONCE TYPE FILE IS IMP[ORTED - node_templates: hw_app_policy_test: type: dcae.nodes.policy @@ -53,8 +33,8 @@ node_templates: 'who' service_endpoints: [{"service_name" : "Greeting", "service_endpoint" : "greet", "endpoint_method" : "GET"}] - app_config: {"foo" : "foo-test"} - app_preferences: {"foo_updated" : "foo-pref-test"} + app_config: {"foo" : "you should never see this; it should be overwritten by policy"} + app_preferences: {"foo_updated" : "you should never see this; it should be overwritten by policy"} interfaces: cloudify.interfaces.lifecycle: -- cgit 1.2.3-korg