diff options
| author |   vagrant <vv770d@att.com> | 2018-04-20 19:44:55 +0000 |
|---|---|---|
| committer | vagrant <vv770d@att.com> | 2018-04-20 20:45:30 +0000 |
| commit | d5f2aa475956fefeec4af6b4aea9b08127649a29 (patch) | |
| tree | 23ad2b1c0f2f21415b142988e415908d958c04cd | |
| parent | 394caa9be021595b46b13339d629199dba6c5ab0 (diff) | |
fixing heat deployment issues noted
Plugin Script is common between K8S and Heat deploy, incorporating
additonal required plugin.
Modified registration to include dockerhost login info
Change-Id: I228cdb2e48c47cc698a19986ccf12b6d21ab265c
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-464
| -rwxr-xr-x | heat/register.sh | 14 | ||||
| -rwxr-xr-x | k8s-bootstrap-container/build-plugins.sh | 1 | ||||
| -rw-r--r-- | k8s-bootstrap-container/pom.xml | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/heat/register.sh b/heat/register.sh index 4b4e100..bdf6814 100755 --- a/heat/register.sh +++ b/heat/register.sh @@ -61,6 +61,20 @@ curl -v -X PUT -H 'Content-Type: application/json' \ --data-binary "$REGREQ" \ "http://${HOSTNAME_CONSUL}:8500/v1/agent/service/register" +#Add KV for dockerplugin login +REGREQ=" +[ + { + \"username\": \"docker\", + \"password\": \"docker\", + \"registry\": \"nexus3.onap.org:10001\" + } +] +" +curl -v -X PUT -H 'Content-Type: application/json' \ +--data-binary "$REGREQ" \ +"http://${HOSTNAME_CONSUL}:8500/v1/kv/docker_plugin/docker_logins" + # registering Holmes services diff --git a/k8s-bootstrap-container/build-plugins.sh b/k8s-bootstrap-container/build-plugins.sh index 69fb121..84e4faa 100755 --- a/k8s-bootstrap-container/build-plugins.sh +++ b/k8s-bootstrap-container/build-plugins.sh @@ -33,6 +33,7 @@ DCAEPLUGINFILES=\ "\ k8splugin/1.1.0/k8splugin-1.1.0.tgz dockerplugin/3.2.0/dockerplugin-3.2.0.tgz +relationshipplugin/1.0.0/relationshipplugin-1.0.0.tgz dcaepolicyplugin/2.3.0/dcaepolicyplugin-2.3.0.tgz \ " diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml index 6eca043..abbe3d0 100644 --- a/k8s-bootstrap-container/pom.xml +++ b/k8s-bootstrap-container/pom.xml @@ -27,7 +27,7 @@ limitations under the License. <groupId>org.onap.dcaegen2.deployments</groupId> <artifactId>k8s-bootstrap-container</artifactId> <name>dcaegen2-deployments-k8s-bootstrap-container</name> - <version>1.1.5</version> + <version>1.1.6</version> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> |