diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index d2a8c29..fa16c25 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -16,20 +16,20 @@
     global:
       repository: 10.12.5.2:5000
       pullPolicy: IfNotPresent
-      robot:
-        openStackKeyStoneUrl: "http://10.12.25.2:5000"
-        openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
-        openStackPassword: "${OS_PASSWORD}"
-        openStackTenantId: "${OS_PROJECT_ID}"
+    robot:
+      openStackKeyStoneUrl: "http://10.12.25.2:5000"
+      openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+      openStackPassword: "${OS_PASSWORD}"
+      openStackTenantId: "${OS_PROJECT_ID}"
+      openStackUserName: "${OS_USERNAME}"
+      ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+      ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+      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-cloud-amd64"
-        ubuntu16Image: "ubuntu-16-04-cloud-amd64"
-        openStackPrivateNetId: "__oam_network_id__"
-        openStackPrivateSubnetId: "__oam_subnet_id__"
-        openStackPrivateNetCidr: "10.0.0.0/16"
-        openStackOamNetworkCidrPrefix: "10.0"
-      so:
-        config:
-          openStackUserName: "${OS_USERNAME}"
-          openStackKeyStoneUrl: "http://10.12.25.2:5000"
-          openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+        openStackKeyStoneUrl: "http://10.12.25.2:5000"
+        openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"