Merge "Alleviate startup disk contention issues"

diff --combined deployment/heat/onap-oom/env/tlab/onap-oom.env
index 65d952a,d41d462..bde8709
--- 1/deployment/heat/onap-oom/env/tlab/onap-oom.env
--- 2/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@@ -5,8 -5,8 +5,8 @@@ parameters
    apt_proxy: 192.168.31.204:8000
    docker_proxy: 192.168.31.204:5000
  
-   rancher_vm_flavor: m5.xlarge
-   k8s_vm_flavor: m4.xlarge
+   rancher_vm_flavor: m1.xlarge
+   k8s_vm_flavor: m1.xlarge
    etcd_vm_flavor: m1.large
    orch_vm_flavor: m1.xlarge
  
@@@ -20,8 -20,8 +20,8 @@@
        pullPolicy: IfNotPresent
      robot:
        flavor: large
 -      appcUsername: "appc@appc.onap.org"
 -      appcPassword: "demo123456!"
 +      appcUsername: "admin"
 +      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
        openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id
        openStackTenantId: "${OS_PROJECT_ID}"
@@@ -32,7 -32,7 +32,7 @@@
        openStackPrivateSubnetId: "__oam_subnet_id__"
        openStackPrivateNetCidr: "__oam_network_cidr__"
        openStackOamNetworkCidrPrefix: "10.0"
-       dcaeCollectorIp: "__k8s_1_vm_ip__"
+       dcaeCollectorIp: "__k8s_01_vm_ip__"
        vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
        demoArtifactsVersion: "1.3.0-SNAPSHOT"
        scriptVersion: "1.3.0-SNAPSHOT"

diff --combined deployment/heat/onap-oom/env/windriver/onap-oom.env
index ade8565,5ffbd8c..2d28fd7
--- 1/deployment/heat/onap-oom/env/windriver/onap-oom.env
--- 2/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@@ -5,7 -5,7 +5,7 @@@ parameters
    apt_proxy: 10.12.5.2:8000
    docker_proxy: 10.12.5.2:5000
  
-   rancher_vm_flavor: m2.xlarge
+   rancher_vm_flavor: m1.xlarge
    k8s_vm_flavor: m1.xlarge
    etcd_vm_flavor: m1.large
    orch_vm_flavor: m1.xlarge
@@@ -20,8 -20,8 +20,8 @@@
        pullPolicy: IfNotPresent
      robot:
        flavor: large
 -      appcUsername: "appc@appc.onap.org"
 -      appcPassword: "demo123456!"
 +      appcUsername: "admin"
 +      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
        openStackKeyStoneUrl: "http://10.12.25.2:5000"
        openStackPublicNetId: "__public_net_id__"
        openStackTenantId: "${OS_PROJECT_ID}"
@@@ -33,7 -33,7 +33,7 @@@
        openStackPrivateNetCidr: "__oam_network_cidr__"
        openStackSecurityGroup: "__sec_group__"
        openStackOamNetworkCidrPrefix: "10.0"
-       dcaeCollectorIp: "__k8s_1_vm_ip__"
+       dcaeCollectorIp: "__k8s_01_vm_ip__"
        vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
        demoArtifactsVersion: "1.3.0-SNAPSHOT"
        scriptVersion: "1.3.0-SNAPSHOT"