Merge "[Cinder] Set quotas for internal cinder project"

Author: MOS CI

charts/openstack/cinder/templates/bin/_bootstrap.sh.tpl

@@ -73,16 +73,35 @@ openstack volume type show {{ $name }} || \
 {{- /* Check volume type and properties were added */}}
 openstack volume type list --long
 
-# Set volumes quote to unlim for cinder service project to have a chance to create
-# volumes, images etc inside it.
 SERVICE_DOMAIN_ID=$(openstack --os-cloud admin-system domain show {{ .Values.endpoints.identity.auth.cinder.project_domain_name }} -f value -c id)
 SERVICE_PROJECT_ID=$(openstack --os-cloud admin-system project show {{ .Values.endpoints.identity.auth.cinder.project_name }} --domain ${SERVICE_DOMAIN_ID} -f value -c id)
 
+INTERNAL_PROJECT_DOMAIN_ID=$(openstack --os-cloud admin-system domain show {{ .Values.conf.cinder.DEFAULT.internal_project_domain_name }} -f value -c id)
+INTERNAL_PROJECT_ID=$(openstack --os-cloud admin-system project show {{ .Values.conf.cinder.DEFAULT.internal_project_name }} --domain ${INTERNAL_PROJECT_DOMAIN_ID} -f value -c id)
+
 # NOTE(vsaienko): unless is fixed PRODX-23599 in Yogga release, command: openstack --os-cloud admin quota set --volumes -1 507d9f0509524609bff4c0159432739a doesn't work.
 VOLUME_V3_ENDPOINT=$(openstack --os-cloud admin catalog show volumev3 |grep internal | awk '{print $4}')
 if [[ -n $VOLUME_V3_ENDPOINT ]]; then
     TOKEN=$(openstack token issue -f value -c id)
+# Set volumes quote to unlim for cinder service project to have a chance to create
+# volumes, images etc inside it.
     curl -X PUT ${VOLUME_V3_ENDPOINT}/os-quota-sets/${SERVICE_PROJECT_ID} -H "Accept: application/json" -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -d '{"quota_set": {"tenant_id": "'${SERVICE_PROJECT_ID}'", "volumes": -1}}'
+# Set cinder quotes for internal project
+    curl -X PUT ${VOLUME_V3_ENDPOINT}/os-quota-sets/${INTERNAL_PROJECT_ID} \
+        -H "Accept: application/json" \
+        -H "Content-Type: application/json" \
+        -H "X-Auth-Token: $TOKEN" \
+        -d '{
+            "quota_set": {
+                "tenant_id": "'${INTERNAL_PROJECT_ID}'",
+                "volumes": {{ .Values.bootstrap.quotas.Default.internal_cinder.volumes }},
+                "snapshots": {{ .Values.bootstrap.quotas.Default.internal_cinder.snapshots }},
+                "groups": {{ .Values.bootstrap.quotas.Default.internal_cinder.groups }},
+                "gigabytes": {{ .Values.bootstrap.quotas.Default.internal_cinder.gigabytes }},
+                "backups": {{ .Values.bootstrap.quotas.Default.internal_cinder.backups }},
+                "backup_gigabytes": {{ .Values.bootstrap.quotas.Default.internal_cinder.backup_gigabytes }}
+            }
+        }'
 fi
 
 {{- end }}

charts/openstack/cinder/templates/bin/_create-internal-tenant-id.py.tpl

@@ -69,7 +69,7 @@ def log_info(func):
     return wrapper
 
 
-PROJECT_DOMAIN_ID = get_env_var("PROJECT_DOMAIN_ID", 'Default')
+INTERNAL_PROJECT_DOMAIN_NAME = get_env_var("INTERNAL_PROJECT_DOMAIN_NAME")
 INTERNAL_PROJECT_NAME =  get_env_var("INTERNAL_PROJECT_NAME")
 INTERNAL_USER_NAME = get_env_var("INTERNAL_USER_NAME")
 
@@ -106,10 +106,10 @@ def find_user(name, domain_id):
 
 # Project domain
 project_domain_def = {
-    "name": PROJECT_DOMAIN_ID,
+    "name": INTERNAL_PROJECT_DOMAIN_NAME,
 }
 
-project_domain = osc.identity.find_domain(PROJECT_DOMAIN_ID)
+project_domain = osc.identity.find_domain(INTERNAL_PROJECT_DOMAIN_NAME)
 
 user_project_def = {
     "name": INTERNAL_PROJECT_NAME,

charts/openstack/cinder/templates/job-create-internal-tenant.yaml

@@ -100,6 +100,8 @@ spec:
               value: {{ .Values.conf.cinder.DEFAULT.internal_project_name | quote }}
             - name: INTERNAL_USER_NAME
               value: {{ .Values.conf.cinder.DEFAULT.internal_user_name | quote }}
+            - name: INTERNAL_PROJECT_DOMAIN_NAME
+              value: {{ .Values.conf.cinder.DEFAULT.internal_project_domain_name | quote }}
             - name: CINDER_NAMESPACE
               value: {{ $envAll.Release.Namespace | quote }}
 

charts/openstack/cinder/values.yaml

@@ -611,6 +611,15 @@ bootstrap:
     name:
       group:
       volume_backend_name:
+  quotas:
+    Default:
+      internal_cinder:
+        volumes: -1
+        snapshots: -1
+        groups: -1
+        gigabytes: -1
+        backups: -1
+        backup_gigabytes: -1
 
 network:
   api:
@@ -1007,6 +1016,7 @@ conf:
       # Internal tenant id
       internal_project_name: internal_cinder
       internal_user_name: internal_cinder
+      internal_project_domain_name: Default
       # NOTE: tgtadm target helper has problems with WWN in multinode environments
       # see bug PRODX-34069 and https://bugs.launchpad.net/cinder/+bug/1917750
       # We use lioadm as target helper for LVM backend