From: Marco Platania Date: Mon, 22 Apr 2019 12:52:00 +0000 (+0000) Subject: Merge "Adapt to latest tosca onboarding DM change" X-Git-Tag: 1.4.0~30 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=091c4647dbfc8115cac3153e55a23ebb5623add1;hp=7d6e84da8bec7fc0d3d141992b97b0bb2d16ebdb;p=demo.git Merge "Adapt to latest tosca onboarding DM change" --- diff --git a/vnfs/DAaaS/applications/Charts.yaml b/vnfs/DAaaS/applications/Chart.yaml similarity index 100% rename from vnfs/DAaaS/applications/Charts.yaml rename to vnfs/DAaaS/applications/Chart.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/Charts.yml b/vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml similarity index 77% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/Charts.yml rename to vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml index 50b52b98..3ce06e28 100644 --- a/vnfs/DAaaS/applications/charts/sample-horovod-app/Charts.yml +++ b/vnfs/DAaaS/applications/sample-horovod-app/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" description: "A sample horovod application which runs the MNIST application using Tensorflow as backend" -name: sample-horovod-app +name: sample-horovod-app-keras-mnist-advanced version: 0.1.0 diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/Dockerfile b/vnfs/DAaaS/applications/sample-horovod-app/Dockerfile similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/Dockerfile rename to vnfs/DAaaS/applications/sample-horovod-app/Dockerfile diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/README.md b/vnfs/DAaaS/applications/sample-horovod-app/README.md similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/README.md rename to vnfs/DAaaS/applications/sample-horovod-app/README.md diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/keras_mnist_advanced_modified.py b/vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/keras_mnist_advanced_modified.py rename to vnfs/DAaaS/applications/sample-horovod-app/keras_mnist_advanced_modified.py diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/sample_values.yaml b/vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/sample_values.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/sample_values.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/NOTES.txt b/vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/NOTES.txt rename to vnfs/DAaaS/applications/sample-horovod-app/templates/NOTES.txt diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/_helpers.tpl b/vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/_helpers.tpl rename to vnfs/DAaaS/applications/sample-horovod-app/templates/_helpers.tpl diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/config.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/config.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/config.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/job-service.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/job-service.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/job-service.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/job.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/job.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/job.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/secrets.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/secrets.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/secrets.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/statefulset-service.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/statefulset-service.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset-service.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-horovod-app/templates/statefulset.yaml b/vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-horovod-app/templates/statefulset.yaml rename to vnfs/DAaaS/applications/sample-horovod-app/templates/statefulset.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/.helmignore b/vnfs/DAaaS/applications/sample-spark-app/.helmignore similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/.helmignore rename to vnfs/DAaaS/applications/sample-spark-app/.helmignore diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/Chart.yaml b/vnfs/DAaaS/applications/sample-spark-app/Chart.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/Chart.yaml rename to vnfs/DAaaS/applications/sample-spark-app/Chart.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/Dockerfile b/vnfs/DAaaS/applications/sample-spark-app/Dockerfile similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/Dockerfile rename to vnfs/DAaaS/applications/sample-spark-app/Dockerfile diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/templates/SampleSparkApp.yaml b/vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/templates/SampleSparkApp.yaml rename to vnfs/DAaaS/applications/sample-spark-app/templates/SampleSparkApp.yaml diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/templates/_helpers.tpl b/vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/templates/_helpers.tpl rename to vnfs/DAaaS/applications/sample-spark-app/templates/_helpers.tpl diff --git a/vnfs/DAaaS/applications/charts/sample-spark-app/values.yaml b/vnfs/DAaaS/applications/sample-spark-app/values.yaml similarity index 100% rename from vnfs/DAaaS/applications/charts/sample-spark-app/values.yaml rename to vnfs/DAaaS/applications/sample-spark-app/values.yaml