From f245a84a15a4934ae1a2f764f93ec698d88d813f Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Wed, 1 Apr 2015 20:50:39 +0800 Subject: [PATCH] configure ssl in deployment config This patch enable ssl settings in deployment config and deprecate those in rally.conf. Before those are totally removed from rally.conf, rally will read those if no ssl settings in deployment config. This is for back-compatibility. Closes-Bug: #1430695 Change-Id: Idacbd99fae9de0c107d8bdaefb134663738ca497 --- samples/deployments/existing-keystone-v3.json | 4 +++- samples/deployments/existing-with-given-endpoint.json | 4 +++- samples/deployments/existing.json | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/samples/deployments/existing-keystone-v3.json b/samples/deployments/existing-keystone-v3.json index c5d97a08..6d7bcfc3 100644 --- a/samples/deployments/existing-keystone-v3.json +++ b/samples/deployments/existing-keystone-v3.json @@ -9,5 +9,7 @@ "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 89af49e1..1b058fa0 100644 --- a/samples/deployments/existing-with-given-endpoint.json +++ b/samples/deployments/existing-with-given-endpoint.json @@ -8,5 +8,7 @@ "username": "admin", "password": "pa55word", "tenant_name": "demo" - } + }, + "https_insecure": False, + "https_cacert": "", } diff --git a/samples/deployments/existing.json b/samples/deployments/existing.json index b445f62a..532bf5af 100644 --- a/samples/deployments/existing.json +++ b/samples/deployments/existing.json @@ -7,5 +7,7 @@ "username": "admin", "password": "myadminpass", "tenant_name": "demo" - } + }, + "https_insecure": False, + "https_cacert": "", }