Merge "Re-apply use of probe settings for public clouds"

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index d5c0247..2440473 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -5,7 +5,7 @@ parameters:
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
-  rancher_vm_flavor: m4.xlarge
+  rancher_vm_flavor: m5.xlarge
   k8s_vm_flavor: m4.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index a44eca9..9b122e5 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -5,7 +5,7 @@ parameters:
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
-  rancher_vm_flavor: m1.xlarge
+  rancher_vm_flavor: m2.xlarge
   k8s_vm_flavor: m1.xlarge
 
   public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4

diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index 05b7e24..2eabf4e 100644 (file)
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -67,9 +67,9 @@ while ! hash jq &> /dev/null; do
 done
 
 # use RAM disk for /dockerdata-nfs for testing
-#echo "tmpfs /dockerdata-nfs tmpfs noatime 1 2" >> /etc/fstab
+echo "tmpfs /dockerdata-nfs tmpfs noatime,size=75% 1 2" >> /etc/fstab
 mkdir -pv /dockerdata-nfs
-#mount /dockerdata-nfs
+mount /dockerdata-nfs
 
 # version control the persistence volume to see what's happening
 chmod 777 /dockerdata-nfs/
@@ -84,7 +84,7 @@ git commit -m "initial commit"
 # export NFS mount
 NFS_EXP=""
 for K8S_VM_IP in $(tr -d ',[]' < /opt/config/k8s_private_ips.txt); do
-    NFS_EXP+="$K8S_VM_IP(rw,fsid=1,sync,no_root_squash,no_subtree_check) "
+    NFS_EXP+="$K8S_VM_IP(rw,fsid=1,async,no_root_squash,no_subtree_check) "
 done
 echo "/dockerdata-nfs $NFS_EXP" | tee /etc/exports
 

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 6fe1751..985110c 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -8,11 +8,11 @@ onap/aaf/aaf_hello,2.1.5-SNAPSHOT
 onap/aaf/aaf_locate,2.1.5-SNAPSHOT
 onap/aaf/aaf_oauth,2.1.5-SNAPSHOT
 onap/aaf/aaf_service,2.1.5-SNAPSHOT
-onap/aaf/abrmd,latest
-onap/aaf/distcenter,latest
+onap/aaf/abrmd,3.0.0-SNAPSHOT-latest
+onap/aaf/distcenter,3.0.0-SNAPSHOT-latest
 onap/aaf/sms,3.0.0-SNAPSHOT-latest
 onap/aaf/smsquorumclient,3.0.0-SNAPSHOT-latest
-onap/aaf/testcaservice,latest
+onap/aaf/testcaservice,3.0.0-SNAPSHOT-latest
 onap/aai-graphadmin,1.0-STAGING-latest
 onap/aai-resources,1.3-STAGING-latest
 onap/aai-traversal,1.3-STAGING-latest
@@ -33,7 +33,7 @@ onap/clamp-dashboard-kibana,3.0-STAGING-latest
 onap/clamp-dashboard-logstash,3.0-STAGING-latest
 onap/cli,2.0.4
 onap/data-router,1.3-STAGING-latest
-onap/dmaap/buscontroller,1.0.22
+onap/dmaap/buscontroller,1.0.23
 onap/dmaap/datarouter-node,latest
 onap/dmaap/datarouter-prov,latest
 onap/dmaap/dmaap-mr,1.1.8

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index e5bffab..da23c51 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -6,8 +6,11 @@ onap/aaf/aaf_hello,2.1.5
 onap/aaf/aaf_locate,2.1.5
 onap/aaf/aaf_oauth,2.1.5
 onap/aaf/aaf_service,2.1.5
+onap/aaf/abrmd,3.0.0
+onap/aaf/distcenter,3.0.0
 onap/aaf/sms,3.0.0
 onap/aaf/smsquorumclient,3.0.0
+onap/aaf/testcaservice,3.0.0
 onap/aai-cacher,1.0.0
 onap/aai-graphadmin,1.0.0
 onap/aai-resources,1.3.0
@@ -29,7 +32,7 @@ onap/clamp-dashboard-kibana,3.0.0
 onap/clamp-dashboard-logstash,3.0.0
 onap/cli,2.0.4
 onap/data-router,1.3.0
-onap/dmaap/buscontroller,1.0.22
+onap/dmaap/buscontroller,1.0.23
 onap/dmaap/datarouter-node,1.0.2
 onap/dmaap/datarouter-prov,1.0.2
 onap/dmaap/dmaap-mr,1.1.7