Merge changes Idcc4c510,I81261f51,Ica9fc768,I7b5d135a
* changes:
More default values and simplify onap config
Clarify packaging variables documentation
Helm install optional and default values
Helm charts dir commenting causes / dir copying
diff --git a/ansible/site.yml b/ansible/site.yml
new file mode 100644
index 0000000..db1281e
--- /dev/null
+++ b/ansible/site.yml
@@ -0,0 +1,12 @@
+---
+#
+# Master playbook to run offline installer.
+# Run this playbook e.g. with command: ./run_playbook.sh -e @application/application_configuration.yml
+#
+
+- import_playbook: setup.yml
+- import_playbook: upload_resources.yml
+- import_playbook: infrastructure.yml
+- import_playbook: rancher_kubernetes.yml
+- import_playbook: application.yml
+
diff --git a/build/data_lists/http_files.list b/build/data_lists/onap_3.0.0-http_files.list
similarity index 99%
rename from build/data_lists/http_files.list
rename to build/data_lists/onap_3.0.0-http_files.list
index c7486b7..038c447 100644
--- a/build/data_lists/http_files.list
+++ b/build/data_lists/onap_3.0.0-http_files.list
@@ -80,12 +80,12 @@
repo1.maven.org/maven2/com/att/research/xacml/xacml-pdp/1.0.1/xacml-pdp-1.0.1.pom.sha1
repo1.maven.org/maven2/com/att/research/xacml/xacml-pdp/1.0.1/xacml-pdp-1.0.1.pom
repo1.maven.org/maven2/com/att/research/xacml/xacml-pdp/1.0.1/xacml-pdp-1.0.1.jar
-git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl?h=beijing
+git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl?h=casablanca
nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/sshkeyshare/sshkey_types.yaml
nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
-nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/k8splugin/1.1.0/k8splugin_types.yaml
-nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/relationshipplugin/1.0.0/relationshipplugin_types.yaml
-nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R2/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
+nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3/k8splugin/1.1.0/k8splugin_types.yaml
+nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3/relationshipplugin/1.0.0/relationshipplugin_types.yaml
+nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R3/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
nexus.onap.org/content/sites/raw/org.onap.demo/boot/1.1.1/robot_install.sh
nexus.onap.org/content/repositories/staging/org/onap/policy/drools-applications/controlloop/common/model-impl/events/maven-metadata.xml.md5
nexus.onap.org/content/repositories/staging/org/onap/policy/drools-applications/controlloop/common/model-impl/events/maven-metadata.xml.sha1
diff --git a/build/download_offline_data_by_lists.sh b/build/download_offline_data_by_lists.sh
index 5fb2480..3b00cb2 100755
--- a/build/download_offline_data_by_lists.sh
+++ b/build/download_offline_data_by_lists.sh
@@ -69,7 +69,7 @@
$CTOOLS/download-git-repos.sh "${TAG}" "$DATA_DIR/git-repo"
echo "[Step $((CURR++))/$TOTAL Download http files]"
-$CTOOLS/download-http-files.sh "$LISTS_DIR/http_files.list" "$DATA_DIR/http"
+$CTOOLS/download-http-files.sh "$LISTS_DIR/${TAG}-http_files.list" "$DATA_DIR/http"
echo "[Step $((CURR++))/$TOTAL Download npm pkgs]"
$CTOOLS/download-npm-pkgs.sh "$LISTS_DIR/${TAG}-npm.list" "$DATA_DIR/offline_data/npm_tar"