From 0b36661caa4c32d652614f256b41644ade09a937 Mon Sep 17 00:00:00 2001
From: Michael Hwang <mhwang@research.att.com>
Date: Thu, 12 Apr 2018 10:24:30 -0400
Subject: Change consul host to be "consul"

And not localhost

Change-Id: I68c1cb4bf52e0a39a256c0adc4b6b8fb0db269ac
Issue-ID: DCAEGEN2-442
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---
 docker/ChangeLog.md          | 5 +++++
 docker/README.md             | 4 ++++
 docker/docker-node-type.yaml | 2 +-
 docker/dockerplugin/tasks.py | 6 +++---
 docker/pom.xml               | 2 +-
 docker/requirements.txt      | 2 +-
 docker/setup.py              | 4 ++--
 7 files changed, 17 insertions(+), 8 deletions(-)

(limited to 'docker')

diff --git a/docker/ChangeLog.md b/docker/ChangeLog.md
index 4fd7da1..e6eb7d1 100644
--- a/docker/ChangeLog.md
+++ b/docker/ChangeLog.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.2.0]
+
+* Change requirements.txt to use a version range for dcaepolicylib
+* DCAEGEN2-442
+
 ## [3.1.0]
 
 * DCAEGEN2-415 - Change requirements.txt to use dcaepolicy 2.3.0. *Apparently* this constitutes a version bump.
diff --git a/docker/README.md b/docker/README.md
index cb3e66c..6a9ce70 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -19,6 +19,10 @@ The Docker plugin requires a key-value entry in Consul that holds all the Docker
 
 If there are no required Docker logins then set the value to empty list `[]`.
 
+### "consul" DNS query
+
+The Docker plugin assumes that the DNS query for "consul" will resolve.  Make sure the Cloudify installation includes any steps (e.g. adding a line to `/etc/hosts`) to ensure this.
+
 ## Input parameters
 
 ### start
diff --git a/docker/docker-node-type.yaml b/docker/docker-node-type.yaml
index 75d19a1..8e7a6d0 100644
--- a/docker/docker-node-type.yaml
+++ b/docker/docker-node-type.yaml
@@ -24,7 +24,7 @@ plugins:
   docker:
     executor: 'central_deployment_agent'
     package_name: dockerplugin
-    package_version: 3.1.0
+    package_version: 3.2.0
 
 node_types:
     # The DockerContainerForComponents node type is to be used for DCAE service components that 
diff --git a/docker/dockerplugin/tasks.py b/docker/dockerplugin/tasks.py
index d64a65c..03eba62 100644
--- a/docker/dockerplugin/tasks.py
+++ b/docker/dockerplugin/tasks.py
@@ -35,9 +35,9 @@ from dockerplugin import utils
 
 # TODO: Remove this Docker port hardcoding and query for this port instead
 DOCKER_PORT = 2376
-# Always use the local Consul agent for interfacing with Consul from the plugin.
-# Safe to assume that its always there.
-CONSUL_HOST = "localhost"
+# Rely on the setup of the cloudify manager host to resolve "consul" for the
+# plugin. NOTE: This variable is not passed to components.
+CONSUL_HOST = "consul"
 
 # Used to construct delivery urls for data router subscribers. Data router in FTL
 # requires https but this author believes that ONAP is to be defaulted to http.
diff --git a/docker/pom.xml b/docker/pom.xml
index ebe2f26..236a4fb 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -28,7 +28,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.platform.plugins</groupId>
   <artifactId>docker</artifactId>
   <name>docker-plugin</name>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>3.2.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/docker/requirements.txt b/docker/requirements.txt
index 5dc2f31..257a641 100644
--- a/docker/requirements.txt
+++ b/docker/requirements.txt
@@ -1,2 +1,2 @@
 onap-dcae-dockering==1.4.0
-onap-dcae-dcaepolicy-lib==2.3.0
+onap-dcae-dcaepolicy-lib>=2.3.0,<3.0.0
diff --git a/docker/setup.py b/docker/setup.py
index 3b174a6..4f521c1 100644
--- a/docker/setup.py
+++ b/docker/setup.py
@@ -24,7 +24,7 @@ from setuptools import setup
 setup(
     name='dockerplugin',
     description='Cloudify plugin for applications run in Docker containers',
-    version="3.1.0",
+    version="3.2.0",
     author='Michael Hwang, Tommy Carpenter',
     packages=['dockerplugin'],
     zip_safe=False,
@@ -32,6 +32,6 @@ setup(
         "python-consul>=0.6.0,<1.0.0",
         "onap-dcae-dockering>=1.0.0,<2.0.0",
         "uuid==1.30",
-        "onap-dcae-dcaepolicy-lib>=2.1.0,<3.0.0"
+        "onap-dcae-dcaepolicy-lib>=2.3.0,<3.0.0"
     ]
 )
-- 
cgit 1.2.3-korg