commit eb573b85720f0485f865001aa57c902c9eed8a58
author Gary Wu <gary.i.wu@huawei.com> Thu May 03 15:28:21 2018 -0700
committer Gary Wu <gary.i.wu@huawei.com> Thu May 03 15:28:21 2018 -0700
tree 7bc99f073080af2acd79b48e95f7a499c49bd27a
parent c41cad9bcb624f8ea42f63e917d6155e7db18129

Fix indentation level in integration-override.yaml

Change-Id: I7d5fe498511f50dc3a52d3049e21a1a906b76d62
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env

diff --git a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
index 59e0598..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-HEAT-Test.env
@@ -16,20 +16,20 @@
     global:
       repository: 192.168.31.204:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-        openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "Ubuntu 14.04 LTS Generic"
-        ubuntu16Image: "Ubuntu 16.04 LTS Generic"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"

deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env

diff --git a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
index 59e0598..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
+++ b/deployment/heat/onap-oom/env/tlab/ETE-OOM-Test.env
@@ -16,20 +16,20 @@
     global:
       repository: 192.168.31.204:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-        openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
         openStackUserName: "${OS_USERNAME}"
-        ubuntu14Image: "Ubuntu 14.04 LTS Generic"
-        ubuntu16Image: "Ubuntu 16.04 LTS Generic"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"

deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env

diff --git a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
index eb0afc4..d0beefa 100644
--- a/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
+++ b/deployment/heat/onap-oom/env/tlab/EXTONAP_DEV.env
@@ -1,9 +1,7 @@
 parameters:
 
-  ubuntu_1404_image: "Ubuntu 14.04 LTS Generic"
   ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
 
-  lab_name: tlab
   apt_proxy: 192.168.31.204:3142
   docker_proxy: 192.168.31.204:5000
 
@@ -11,6 +9,27 @@
   k8s_vm_flavor: m1.xlarge
 
   public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
-  public_net_name: admin-vpn-floating
 
   oam_network_cidr: 10.0.0.0/16
+
+  integration_override_yaml: >
+    global:
+      repository: 192.168.31.204:5000
+      pullPolicy: IfNotPresent
+    robot:
+      openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+      openStackPublicNetId: "fbe8fd92-6636-4e63-ab28-bb6a5b0888a9"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "Ubuntu 14.04 LTS Generic"
+      ubuntu16Image: "Ubuntu 16.04 LTS Generic"
+      openStackPrivateNetId: "__oam_network_id__"
+      openStackPrivateSubnetId: "__oam_subnet_id__"
+      openStackPrivateNetCidr: "10.0.0.0/16"
+      openStackOamNetworkCidrPrefix: "10.0"
+    so:
+      config:
+        openStackUserName: "${OS_USERNAME}"
+        openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"