summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchmalzried, Terry (ts862m) <ts862m@att.com>2019-01-17 14:44:29 -0500
committerSchmalzried, Terry (ts862m) <ts862m@att.com>2019-01-21 11:12:13 -0500
commit861fc4a4f2a036a3ff8c4974abcdd5c793858bcb (patch)
tree37333a204444001d0d24ddba5827a117d27e8136
parent4805f9001e82c7d94eca6a5b4a0cb60ce8f53932 (diff)
use new onap-dcae-dcaepolicy-lib
Issue-ID: DCAEGEN2-1086 Change-Id: I64f994e99b417f4d79ac95f64aa9596bb77ce8f0 Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com>
-rw-r--r--docker/ChangeLog.md3
-rw-r--r--docker/docker-node-type.yaml2
-rw-r--r--docker/pom.xml2
-rw-r--r--docker/requirements.txt2
-rw-r--r--docker/setup.py4
-rw-r--r--k8s/ChangeLog.md3
-rw-r--r--k8s/k8s-node-type.yaml2
-rw-r--r--k8s/pom.xml2
-rw-r--r--k8s/requirements.txt4
-rw-r--r--k8s/setup.py4
10 files changed, 17 insertions, 11 deletions
diff --git a/docker/ChangeLog.md b/docker/ChangeLog.md
index 9ffbc91..053adf9 100644
--- a/docker/ChangeLog.md
+++ b/docker/ChangeLog.md
@@ -5,6 +5,9 @@ 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.1]
+* DCAEGEN2-1086 update onap-dcae-dcaepolicy-lib version to avoid Consul stores under old service_component_name
+
## [3.2.0]
* Change requirements.txt to use a version range for dcaepolicylib
diff --git a/docker/docker-node-type.yaml b/docker/docker-node-type.yaml
index 0eddb0f..58a8856 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.2.0
+ package_version: 3.2.1
data_types:
diff --git a/docker/pom.xml b/docker/pom.xml
index 236a4fb..5c79537 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>3.2.0-SNAPSHOT</version>
+ <version>3.2.1-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 257a641..35db24e 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,<3.0.0
+onap-dcae-dcaepolicy-lib>=2.4.1,<3.0.0
diff --git a/docker/setup.py b/docker/setup.py
index 4f521c1..d301c49 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.2.0",
+ version="3.2.1",
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.3.0,<3.0.0"
+ "onap-dcae-dcaepolicy-lib>=2.4.1,<3.0.0"
]
)
diff --git a/k8s/ChangeLog.md b/k8s/ChangeLog.md
index bf3353e..70b5869 100644
--- a/k8s/ChangeLog.md
+++ b/k8s/ChangeLog.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [1.4.5]
+* DCAEGEN2-1086 update onap-dcae-dcaepolicy-lib version to avoid Consul stores under old service_component_name
+
## [1.3.0]
* Enhancement: Add support for changing the image running in the application container. ("Rolling upgrade")
diff --git a/k8s/k8s-node-type.yaml b/k8s/k8s-node-type.yaml
index dff1fd3..a6f1559 100644
--- a/k8s/k8s-node-type.yaml
+++ b/k8s/k8s-node-type.yaml
@@ -25,7 +25,7 @@ plugins:
k8s:
executor: 'central_deployment_agent'
package_name: k8splugin
- package_version: 1.4.4
+ package_version: 1.4.5
data_types:
diff --git a/k8s/pom.xml b/k8s/pom.xml
index 39649ca..844f214 100644
--- a/k8s/pom.xml
+++ b/k8s/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>k8s</artifactId>
<name>k8s-plugin</name>
- <version>1.4.4-SNAPSHOT</version>
+ <version>1.4.5-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/k8s/requirements.txt b/k8s/requirements.txt
index 833039f..12d9fea 100644
--- a/k8s/requirements.txt
+++ b/k8s/requirements.txt
@@ -1,5 +1,5 @@
python-consul>=0.6.0,<1.0.0
uuid==1.30
-onap-dcae-dcaepolicy-lib==2.4.0
+onap-dcae-dcaepolicy-lib>=2.4.1,<3.0.0
kubernetes==4.0.0
-cloudify-plugins-common==3.4 \ No newline at end of file
+cloudify-plugins-common==3.4
diff --git a/k8s/setup.py b/k8s/setup.py
index 458328d..9b7f2bb 100644
--- a/k8s/setup.py
+++ b/k8s/setup.py
@@ -23,14 +23,14 @@ from setuptools import setup
setup(
name='k8splugin',
description='Cloudify plugin for containerized components deployed using Kubernetes',
- version="1.4.4",
+ version="1.4.5",
author='J. F. Lucas, Michael Hwang, Tommy Carpenter',
packages=['k8splugin','k8sclient','msb','configure'],
zip_safe=False,
install_requires=[
"python-consul>=0.6.0,<1.0.0",
"uuid==1.30",
- "onap-dcae-dcaepolicy-lib>=2.1.0,<3.0.0",
+ "onap-dcae-dcaepolicy-lib>=2.4.1,<3.0.0",
"cloudify-plugins-common==3.4",
"cloudify-python-importer==0.1.0",
"kubernetes==4.0.0"