openstack
/
charm-trilio-wlm
Code Issues Proposed changes

Update for Trilio 4.0 release 

Update trilio-pkg-source for 4.0 RC testing.

Update create_trust and create_license workloadmgr cli calls to
be compatible with 4.0 RC.

Change-Id: I714f2a120b6cb390dca1774e3abcd5f4cafcfeea
This commit is contained in:
James Page 2020-05-20 11:09:27 +01:00
parent eb193c80f9
commit b9c3faf495
3 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.yaml
View File

@ -26,7 +26,7 @@ options:
a later version of OpenStack will trigger a software upgrade.
triliovault-pkg-source:
type: string
default: "deb [trusted=yes] https://apt.fury.io/triliovault-python3/ /"
default: "deb [trusted=yes] https://apt.fury.io/triliodata-4-0/ /"
description: Repository address of triliovault packages
backup-target-type:
type: string

16
src/lib/charm/openstack/trilio_wlm.py
View File

@ -249,11 +249,13 @@ class TrilioWLMCharm(charms_openstack.charm.HAOpenStackCharm):
identity_service.service_host(),
identity_service.service_port(),
),
"--os-domain-id",
"--os-user-domain-name",
"admin_domain",
"--os-project-domain-id",
identity_service.admin_domain_id(),
"--os-tenant-id",
"--os-project-id",
identity_service.admin_project_id(),
"--os-tenant-name",
"--os-project-name",
"admin",
"--os-region-name",
hookenv.config("region"),
@ -290,11 +292,13 @@ class TrilioWLMCharm(charms_openstack.charm.HAOpenStackCharm):
identity_service.service_host(),
identity_service.service_port(),
),
"--os-domain-id",
"--os-user-domain-name",
"service_domain",
"--os-project-domain-id",
identity_service.service_domain_id(),
"--os-tenant-id",
"--os-project-id",
identity_service.service_tenant_id(),
"--os-tenant-name",
"--os-project-name",
identity_service.service_tenant(),
"--os-region-name",
hookenv.config("region"),

16
unit_tests/test_lib_charm_openstack_trilio_wlm.py
View File

@ -87,11 +87,13 @@ class TestTrilioWLMCharmTrustActions(Helper):
"test-ca-password",
"--os-auth-url",
"http://localhost:5000/v3",
"--os-domain-id",
"--os-user-domain-name",
"admin_domain",
"--os-project-domain-id",
"8e7b72adde7f4a15a4f23620a1d0cfd1",
"--os-tenant-id",
"--os-project-id",
"56446f91358b40d3858276fe9680f5d8",
"--os-tenant-name",
"--os-project-name",
"admin",
"--os-region-name",
"TestRegionA",
@ -143,11 +145,13 @@ class TestTrilioWLMCharmLicenseActions(Helper):
"testingpassword",
"--os-auth-url",
"http://localhost:5000/v3",
"--os-domain-id",
"--os-user-domain-name",
"service_domain",
"--os-project-domain-id",
"8e7b72adde7f4a15a4f23620a1d0cfd1",
"--os-tenant-id",
"--os-project-id",
"56446f91358b40d3858276fe9680f5d8",
"--os-tenant-name",
"--os-project-name",
"admin",
"--os-region-name",
"TestRegionA",