From a92682521587b7ca4df646ac02bd13ce62134ae6 Mon Sep 17 00:00:00 2001
From: Anton Studenov <astudenov@mirantis.com>
Date: Tue, 21 Mar 2017 22:32:45 +0300
Subject: [PATCH] Update deployment samples

* Updated samples of ExistingCloud deployment

Change-Id: Ief7892ae73a8b8a5a0c8f184addac127b0e7fd35
---
 samples/deployments/existing-keystone-v3.json | 28 +++++++------
 .../existing-with-given-endpoint.json         | 26 +++++++-----
 .../existing-with-predefined-users.json       | 42 ++++++++++---------
 samples/deployments/existing.json             | 24 ++++++-----
 4 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/samples/deployments/existing-keystone-v3.json b/samples/deployments/existing-keystone-v3.json
index 5c6ba04d2b..f483d97be7 100644
--- a/samples/deployments/existing-keystone-v3.json
+++ b/samples/deployments/existing-keystone-v3.json
@@ -1,15 +1,19 @@
 {
     "type": "ExistingCloud",
-    "auth_url": "http://example.net:5000/v3/",
-    "region_name": "RegionOne",
-    "endpoint_type": "public",
-    "admin": {
-        "username": "admin",
-        "password": "myadminpass",
-        "user_domain_name": "admin",
-        "project_name": "admin",
-        "project_domain_name": "admin"
-    },
-    "https_insecure": false,
-    "https_cacert": ""
+    "creds": {
+        "openstack": {
+            "auth_url": "http://example.net:5000/v3/",
+            "region_name": "RegionOne",
+            "endpoint_type": "public",
+            "admin": {
+                "username": "admin",
+                "password": "myadminpass",
+                "user_domain_name": "admin",
+                "project_name": "admin",
+                "project_domain_name": "admin"
+            },
+            "https_insecure": false,
+            "https_cacert": ""
+        }
+    }
 }
diff --git a/samples/deployments/existing-with-given-endpoint.json b/samples/deployments/existing-with-given-endpoint.json
index 0f48156ebd..0933a27436 100644
--- a/samples/deployments/existing-with-given-endpoint.json
+++ b/samples/deployments/existing-with-given-endpoint.json
@@ -1,14 +1,18 @@
 {
     "type": "ExistingCloud",
-    "auth_url": "http://example.net:5000/v2.0/",
-    "region_name": "RegionOne",
-    "endpoint_type": "public",
-    "endpoint": "http://<public-identity-url-ip>:<mgmt-port>/<version>/ example: http://172.16.0.2:35357/v2.0/",
-    "admin": {
-        "username": "admin",
-        "password": "pa55word",
-        "tenant_name": "demo"
-    },
-    "https_insecure": false,
-    "https_cacert": ""
+    "creds": {
+        "openstack": {
+            "auth_url": "http://example.net:5000/v2.0/",
+            "region_name": "RegionOne",
+            "endpoint_type": "public",
+            "endpoint": "http://<public-identity-url-ip>:<mgmt-port>/<version>/ example: http://172.16.0.2:35357/v2.0/",
+            "admin": {
+                "username": "admin",
+                "password": "pa55word",
+                "tenant_name": "demo"
+            },
+            "https_insecure": false,
+            "https_cacert": ""
+        }
+    }
 }
diff --git a/samples/deployments/existing-with-predefined-users.json b/samples/deployments/existing-with-predefined-users.json
index f1002b5d88..1b96143699 100644
--- a/samples/deployments/existing-with-predefined-users.json
+++ b/samples/deployments/existing-with-predefined-users.json
@@ -1,23 +1,27 @@
 {
     "type": "ExistingCloud",
-    "auth_url": "http://example.net:5000/v2.0/",
-    "region_name": "RegionOne",
-    "endpoint_type": "public",
-    "admin": {
-        "username": "admin",
-        "password": "pa55word",
-        "tenant_name": "demo"
-    },
-    "users": [
-        {
-            "username": "not_an_admin1",
-            "password": "password",
-            "tenant_name": "some_tenant"
-        },
-        {
-            "username": "not_an_admin2",
-            "password": "password2",
-            "tenant_name": "some_tenant2"
+    "creds": {
+        "openstack": {
+            "auth_url": "http://example.net:5000/v2.0/",
+            "region_name": "RegionOne",
+            "endpoint_type": "public",
+            "admin": {
+                "username": "admin",
+                "password": "pa55word",
+                "tenant_name": "demo"
+            },
+            "users": [
+                {
+                    "username": "not_an_admin1",
+                    "password": "password",
+                    "tenant_name": "some_tenant"
+                },
+                {
+                    "username": "not_an_admin2",
+                    "password": "password2",
+                    "tenant_name": "some_tenant2"
+                }
+            ]
         }
-    ]
+    }
 }
diff --git a/samples/deployments/existing.json b/samples/deployments/existing.json
index 5496688e38..53e12f0d47 100644
--- a/samples/deployments/existing.json
+++ b/samples/deployments/existing.json
@@ -1,13 +1,17 @@
 {
     "type": "ExistingCloud",
-    "auth_url": "http://example.net:5000/v2.0/",
-    "region_name": "RegionOne",
-    "endpoint_type": "public",
-    "admin": {
-        "username": "admin",
-        "password": "myadminpass",
-        "tenant_name": "demo"
-    },
-    "https_insecure": false,
-    "https_cacert": ""
+    "creds": {
+        "openstack": {
+            "auth_url": "http://example.net:5000/v2.0/",
+            "region_name": "RegionOne",
+            "endpoint_type": "public",
+            "admin": {
+                "username": "admin",
+                "password": "myadminpass",
+                "tenant_name": "demo"
+            },
+            "https_insecure": false,
+            "https_cacert": ""
+        }
+    }
 }