From 9444408bb1ab548995a81d4efe678d298aca66df Mon Sep 17 00:00:00 2001
From: Michael Hwang <mhwang@research.att.com>
Date: Tue, 12 Sep 2017 13:27:30 -0400
Subject: Use latest dcaepolicy

Issue-Id: DCAEGEN2-97
Change-Id: I6e5e701f5a64575c9280b1bea3b17e50023e599d
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---
 docker/README.md                            | 15 +++++++++++++++
 docker/examples/blueprint-laika-policy.yaml |  4 ++++
 docker/requirements.txt                     |  3 ++-
 docker/setup.py                             |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 08fb570..cb3e66c 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -4,6 +4,21 @@ This repository contains Cloudify artifacts used to orchestrate the deployment o
 
 More details about what is expected from Docker components can be found in the DCAE ONAP documentation.
 
+## Pre-requisites
+
+### Docker logins
+
+The Docker plugin requires a key-value entry in Consul that holds all the Docker login credentials needed to access remote registries.  The expected key is `docker_plugin/docker_logins` and the corresponding value is a json array with json objects:
+
+```
+[
+    { "username": "bob", "password": "123456", "registry": "this-docker-registry.com" },
+    { "username": "jane", "password": "7890ab", "registry": "that-docker-registry.com" }
+]
+```
+
+If there are no required Docker logins then set the value to empty list `[]`.
+
 ## Input parameters
 
 ### start
diff --git a/docker/examples/blueprint-laika-policy.yaml b/docker/examples/blueprint-laika-policy.yaml
index 1531d21..d0a9c68 100644
--- a/docker/examples/blueprint-laika-policy.yaml
+++ b/docker/examples/blueprint-laika-policy.yaml
@@ -31,11 +31,15 @@ node_templates:
     type: dcae.nodes.policy
     properties:
         policy_id: { get_input: host_capacity_policy_id }
+        # Use this property to toggle whether policy is required meaning errors are considered
+        # critical otherwise errors are silenced.
+        policy_required: true
 
   host_location_policy:
     type: dcae.nodes.policy
     properties:
         policy_id: { get_input: host_location_policy_id }
+        policy_required: true
 
   db_server_policy:
     type: dcae.nodes.policy
diff --git a/docker/requirements.txt b/docker/requirements.txt
index bae15ce..2845551 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -1,4 +1,5 @@
 # TODO: May need to add the following line
 # --extra-index-url <onap pypi url>
+--extra-index-url {{ ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2 }}
 python-dockering==1.3.0
-dcaepolicy==0.0.4
+dcaepolicy==1.0.0
diff --git a/docker/setup.py b/docker/setup.py
index 128e90b..cdb79d1 100644
--- a/docker/setup.py
+++ b/docker/setup.py
@@ -32,6 +32,6 @@ setup(
         "python-consul>=0.6.0,<1.0.0",
         "python-dockering>=1.0.0,<2.0.0",
         "uuid==1.30",
-        "dcaepolicy>=0.0.4"
+        "dcaepolicy>=1.0.0"
     ]
 )
-- 
cgit 1.2.3-korg