diff options
5 files changed, 7 insertions, 7 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index bd3970f52..f10fb79d5 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -73,7 +73,7 @@ parameters: rancher_version: type: string - default: "1.6.22" + default: "1.6.25" rancher_agent_version: type: string @@ -81,7 +81,7 @@ parameters: kubectl_version: type: string - default: "1.11.2" + default: "1.11.5" helm_version: type: string diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml index 242bbe886..b79bb1b5e 100644 --- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml +++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml @@ -70,7 +70,7 @@ parameters: rancher_version: type: string - default: "1.6.22" + default: "1.6.25" rancher_agent_version: type: string @@ -78,7 +78,7 @@ parameters: kubectl_version: type: string - default: "1.11.2" + default: "1.11.5" helm_version: type: string diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 8e6a36ba4..f13e63964 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -166,7 +166,7 @@ curl -s -u "${CATTLE_ACCESS_KEY}:${CATTLE_SECRET_KEY}" \ -X PUT \ -H 'Accept: application/json' \ -H 'Content-Type: application/json' \ --d '{"stacks":[{"type":"catalogTemplate", "answers":{"CONSTRAINT_TYPE":"required"}, "name":"kubernetes", "templateVersionId":"library:infra*k8s:52"}, {"type":"catalogTemplate", "name":"network-services", "templateId":"library:infra*network-services"}, {"type":"catalogTemplate", "name":"ipsec", "templateId":"library:infra*ipsec", "answers":{"MTU":"__mtu__"}}, {"type":"catalogTemplate", "name":"healthcheck", "templateId":"library:infra*healthcheck"}]}' \ +-d '{"stacks":[{"type":"catalogTemplate", "answers":{"CONSTRAINT_TYPE":"required"}, "name":"kubernetes", "templateVersionId":"library:infra*k8s:53"}, {"type":"catalogTemplate", "name":"network-services", "templateId":"library:infra*network-services"}, {"type":"catalogTemplate", "name":"ipsec", "templateId":"library:infra*ipsec", "answers":{"MTU":"__mtu__"}}, {"type":"catalogTemplate", "name":"healthcheck", "templateId":"library:infra*healthcheck"}]}' \ "http://$RANCHER_IP:8080/v2-beta/projecttemplates/$TEMPLATE_ID" curl -s -u "${CATTLE_ACCESS_KEY}:${CATTLE_SECRET_KEY}" -X POST -H 'Content-Type: application/json' -d '{ "name":"oom", "projectTemplateId":"'$TEMPLATE_ID'" }' "http://$RANCHER_IP:8080/v2-beta/projects" > project.json diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index 0d97d2203..8d9bd791c 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -72,7 +72,7 @@ onap/network-discovery,1.4.2 onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 onap/optf-cmso-service,1.0.1 -onap/optf-has,1.2.4 +onap/optf-has,1.2.5 onap/optf-osdf,1.2.4 onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.5 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index 7a73097cd..b55de72d6 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -71,7 +71,7 @@ onap/network-discovery,1.4.2 onap/oom/kube2msb,1.1.0 onap/optf-cmso-dbinit,1.0.1 onap/optf-cmso-service,1.0.1 -onap/optf-has,1.2.4 +onap/optf-has,1.2.5 onap/optf-osdf,1.2.4 onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server,1.0.5 onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main,1.0.2 |