openstack/rally-openstack
Code Issues Proposed changes

Merge "Simplify deployment config format"

Browse Source
This commit is contained in:
Jenkins 2017-08-23 20:51:07 +00:00 committed by Gerrit Code Review
commit 6615873983
10 changed files with 107 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
devstack/lib/rally
View File

@ -49,16 +49,13 @@ if [[ "$IDENTITY_API_VERSION" == 2.0 ]]
then then
cat >$1 <<EOF cat >$1 <<EOF
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "$OS_AUTH_URL",
"openstack": { "region_name": "$REGION_NAME",
"auth_url": "$OS_AUTH_URL", "admin": {
"region_name": "$REGION_NAME", "username": "admin",
"admin": { "password": "$ADMIN_PASSWORD",
"username": "admin", "tenant_name": "admin",
"password": "$ADMIN_PASSWORD",
"tenant_name": "admin",
}
} }
} }
} }
@ -68,18 +65,15 @@ if [[ "$IDENTITY_API_VERSION" == 3 ]]
then then
cat >$1 <<EOF cat >$1 <<EOF
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "$OS_AUTH_URL",
"openstack": { "region_name": "$REGION_NAME",
"auth_url": "$OS_AUTH_URL", "admin": {
"region_name": "$REGION_NAME", "username": "admin",
"admin": { "password": "$ADMIN_PASSWORD",
"username": "admin", "project_name": "admin",
"password": "$ADMIN_PASSWORD", "user_domain_name": "Default",
"project_name": "admin", "project_domain_name": "Default"
"user_domain_name": "Default",
"project_domain_name": "Default"
}
} }
} }
} }

31
samples/deployments/existing-keystone-v3-osprofiler.json
View File

@ -1,20 +1,17 @@
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "http://example.net:5000/v3/",
"openstack": { "region_name": "RegionOne",
"auth_url": "http://example.net:5000/v3/", "endpoint_type": "public",
"region_name": "RegionOne", "admin": {
"endpoint_type": "public", "username": "admin",
"admin": { "password": "myadminpass",
"username": "admin", "user_domain_name": "admin",
"password": "myadminpass", "project_name": "admin",
"user_domain_name": "admin", "project_domain_name": "admin"
"project_name": "admin", },
"project_domain_name": "admin" "https_insecure": false,
}, "https_cacert": "",
"https_insecure": false, "profiler_hmac_key": "SECRET_KEY"
"https_cacert": "",
"profiler_hmac_key": "SECRET_KEY"
}
} }
} }

29
samples/deployments/existing-keystone-v3.json
View File

@ -1,19 +1,16 @@
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "http://example.net:5000/v3/",
"openstack": { "region_name": "RegionOne",
"auth_url": "http://example.net:5000/v3/", "endpoint_type": "public",
"region_name": "RegionOne", "admin": {
"endpoint_type": "public", "username": "admin",
"admin": { "password": "myadminpass",
"username": "admin", "user_domain_name": "admin",
"password": "myadminpass", "project_name": "admin",
"user_domain_name": "admin", "project_domain_name": "admin"
"project_name": "admin", },
"project_domain_name": "admin" "https_insecure": false,
}, "https_cacert": ""
"https_insecure": false,
"https_cacert": ""
}
} }
} }

27
samples/deployments/existing-with-given-endpoint.json
View File

@ -1,18 +1,15 @@
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "http://example.net:5000/v2.0/",
"openstack": { "region_name": "RegionOne",
"auth_url": "http://example.net:5000/v2.0/", "endpoint_type": "public",
"region_name": "RegionOne", "endpoint": "http://<public-identity-url-ip>:<mgmt-port>/<version>/ example: http://172.16.0.2:35357/v2.0/",
"endpoint_type": "public", "admin": {
"endpoint": "http://<public-identity-url-ip>:<mgmt-port>/<version>/ example: http://172.16.0.2:35357/v2.0/", "username": "admin",
"admin": { "password": "pa55word",
"username": "admin", "tenant_name": "demo"
"password": "pa55word", },
"tenant_name": "demo" "https_insecure": false,
}, "https_cacert": ""
"https_insecure": false,
"https_cacert": ""
}
} }
} }

43
samples/deployments/existing-with-predefined-users.json
View File

@ -1,27 +1,24 @@
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "http://example.net:5000/v2.0/",
"openstack": { "region_name": "RegionOne",
"auth_url": "http://example.net:5000/v2.0/", "endpoint_type": "public",
"region_name": "RegionOne", "admin": {
"endpoint_type": "public", "username": "admin",
"admin": { "password": "pa55word",
"username": "admin", "tenant_name": "demo"
"password": "pa55word", },
"tenant_name": "demo" "users": [
{
"username": "not_an_admin1",
"password": "password",
"tenant_name": "some_tenant"
}, },
"users": [ {
{ "username": "not_an_admin2",
"username": "not_an_admin1", "password": "password2",
"password": "password", "tenant_name": "some_tenant2"
"tenant_name": "some_tenant" }
}, ]
{
"username": "not_an_admin2",
"password": "password2",
"tenant_name": "some_tenant2"
}
]
}
} }
} }

25
samples/deployments/existing.json
View File

@ -1,17 +1,14 @@
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "auth_url": "http://example.net:5000/v2.0/",
"openstack": { "region_name": "RegionOne",
"auth_url": "http://example.net:5000/v2.0/", "endpoint_type": "public",
"region_name": "RegionOne", "admin": {
"endpoint_type": "public", "username": "admin",
"admin": { "password": "myadminpass",
"username": "admin", "tenant_name": "demo"
"password": "myadminpass", },
"tenant_name": "demo" "https_insecure": false,
}, "https_cacert": ""
"https_insecure": false,
"https_cacert": ""
}
} }
} }

7
tests/check_samples/test_task_samples.py
View File

@ -70,8 +70,7 @@ class TestTaskSamples(unittest.TestCase):
user_ctx.setup() user_ctx.setup()
self.addCleanup(user_ctx.cleanup) self.addCleanup(user_ctx.cleanup)
config = deployment["config"] os_creds = deployment["config"]["creds"]["openstack"]
os_creds = config["creds"]["openstack"]
user = copy.copy(os_creds["admin"]) user = copy.copy(os_creds["admin"])
user["username"] = ctx["users"][0]["credential"].username user["username"] = ctx["users"][0]["credential"].username
@ -81,12 +80,12 @@ class TestTaskSamples(unittest.TestCase):
user["project_name"] = ctx["users"][0]["credential"].tenant_name user["project_name"] = ctx["users"][0]["credential"].tenant_name
else: else:
user["tenant_name"] = ctx["users"][0]["credential"].tenant_name user["tenant_name"] = ctx["users"][0]["credential"].tenant_name
config["creds"]["openstack"]["users"] = [user] os_creds["users"] = [user]
rally("deployment destroy MAIN", write_report=False) rally("deployment destroy MAIN", write_report=False)
deployment_cfg = os.path.join(rally.tmp_dir, "new_deployment.json") deployment_cfg = os.path.join(rally.tmp_dir, "new_deployment.json")
with open(deployment_cfg, "w") as f: with open(deployment_cfg, "w") as f:
f.write(json.dumps(config)) f.write(json.dumps({"openstack": os_creds}))
rally("deployment create --name MAIN --filename %s" % deployment_cfg, rally("deployment create --name MAIN --filename %s" % deployment_cfg,
write_report=False) write_report=False)

2
tests/ci/osresources.py
View File

@ -516,7 +516,7 @@ def main():
out = subprocess.check_output(["rally", "deployment", "config", out = subprocess.check_output(["rally", "deployment", "config",
"--deployment", "devstack"]) "--deployment", "devstack"])
config = json.loads(out if six.PY2 else out.decode("utf-8")) config = json.loads(out if six.PY2 else out.decode("utf-8"))
config = config["creds"]["openstack"] config = config["openstack"]
config.update(config.pop("admin")) config.update(config.pop("admin"))
if "users" in config: if "users" in config:
del config["users"] del config["users"]

35
tests/ci/rally_gate_functions.sh
View File

@ -73,25 +73,22 @@ function setUp () {
echo ' echo '
{ {
"type": "ExistingCloud", "openstack": {
"creds": { "users": [
"openstack": { {"username": "rally-test-user-1",
"users": [ "password": "rally-test-password-1",
{"username": "rally-test-user-1", "project_name": "rally-test-project-1",
"password": "rally-test-password-1", "user_domain_name": "Default",
"project_name": "rally-test-project-1", "project_domain_name": "Default"
"user_domain_name": "Default", },
"project_domain_name": "Default" {"username": "rally-test-user-2",
}, "password": "rally-test-password-2",
{"username": "rally-test-user-2", "project_name": "rally-test-project-2",
"password": "rally-test-password-2", "user_domain_name": "Default",
"project_name": "rally-test-project-2", "project_domain_name": "Default"
"user_domain_name": "Default", }],
"project_domain_name": "Default" "auth_url": "'$OS_AUTH_URL'",
}], "region_name": "RegionOne"
"auth_url": "'$OS_AUTH_URL'",
"region_name": "RegionOne"
}
} }
} }
' > $DEPLOYMENT_CONFIG_FILE ' > $DEPLOYMENT_CONFIG_FILE

2
tests/ci/rally_self_job.sh
View File

@ -32,7 +32,7 @@ sed -i.bak "s|#connection =.*|connection = \"$DBCONNSTRING\"|" $TMP_RALLY_CONF
rally-manage --config-file $TMP_RALLY_CONF db create rally-manage --config-file $TMP_RALLY_CONF db create
# Create self deployment # Create self deployment
echo '{"type": "ExistingCloud", "creds": {}}' > $TMP_RALLY_DEPLOYMENT echo '{}' > $TMP_RALLY_DEPLOYMENT
$RALLY -d deployment create --file=$TMP_RALLY_DEPLOYMENT --name=self $RALLY -d deployment create --file=$TMP_RALLY_DEPLOYMENT --name=self
# Run task # Run task