diff --git a/openstack/octavia/ci/test-values.yaml b/openstack/octavia/ci/test-values.yaml index cb02f7c80f8..42c970d4095 100644 --- a/openstack/octavia/ci/test-values.yaml +++ b/openstack/octavia/ci/test-values.yaml @@ -13,6 +13,10 @@ global: imageVersion: train +early_lbaas_cpbmu_access_project_ids: + - project-a + - project-b + mariadb: root_password: topSecret users: diff --git a/openstack/octavia/templates/etc/_policy.json.tpl b/openstack/octavia/templates/etc/_policy.json.tpl index ac75c6da6d7..d55721bf1d1 100644 --- a/openstack/octavia/templates/etc/_policy.json.tpl +++ b/openstack/octavia/templates/etc/_policy.json.tpl @@ -101,5 +101,6 @@ "os_load-balancer_api:amphora:get_stats": "rule:context_is_admin", "os_load-balancer_api:provider-flavor:get_all": "rule:context_is_admin", - "os_load-balancer_api:provider-availability-zone:get_all": "rule:context_is_admin" + "os_load-balancer_api:provider-availability-zone:get_all": "rule:context_is_admin", + "os_load-balancer_api:member:put_cross_pool_members": "{{- if .Values.early_lbaas_cpbmu_access_project_ids }}{{ range $i, $projectID := .Values.early_lbaas_cpbmu_access_project_ids }}{{ if $i }} or {{ end }}project_id:{{ $projectID }}{{ end }}{{- else }}!{{- end }}" } diff --git a/openstack/octavia/values.yaml b/openstack/octavia/values.yaml index 7f05c712b07..d70a4f10968 100644 --- a/openstack/octavia/values.yaml +++ b/openstack/octavia/values.yaml @@ -13,6 +13,9 @@ owner-info: api_port_internal: 9876 api_backdoor: false +# Project IDs allowed to use the early LBaaS CPBMU API. +early_lbaas_cpbmu_access_project_ids: [] + rbac: enabled: true