diff --git a/openstack/tempest/barbican-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/barbican-tempest/templates/etc/_tempest_extra_options.tpl index 20b16b075da..0c3fd230e33 100644 --- a/openstack/tempest/barbican-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/barbican-tempest/templates/etc/_tempest_extra_options.tpl @@ -49,14 +49,14 @@ security_compliance = True build_timeout=600 [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = internal shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} floating_network_name = FloatingIP-external-monsoon3-01 build_timeout=600 build_interval=20 -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} [network-feature-enabled] ipv6 = False @@ -69,8 +69,8 @@ driver = fake-hardware [compute] # image_ref and image_ref_alt will be changed to the image-id during init-script as the image-id can change over time. -image_ref = CHANGE_ME_IMAGE_REF -image_ref_alt = CHANGEMEIMAGEREFALT +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = internal v3_endpoint_type = internal region = {{ .Values.global.region }} @@ -114,7 +114,7 @@ v3_endpoint_type = internalURL region = {{ .Values.global.region }} [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} ssh_key_type = rsa [volume] diff --git a/openstack/tempest/barbican-tempest/templates/seed.yaml b/openstack/tempest/barbican-tempest/templates/seed.yaml new file mode 100644 index 00000000000..1267472f64b --- /dev/null +++ b/openstack/tempest/barbican-tempest/templates/seed.yaml @@ -0,0 +1,53 @@ +{{- $tc := .Values.tempest_common | default dict -}} +{{- $seed := $tc.seed | default dict -}} +{{- if $seed.enabled -}} +{{- $userCount := int (default 2 $seed.userCount) -}} +{{- $pw := required "Missing tempestAdminPassword value!" .Values.tempestAdminPassword -}} +{{- $userRoles := default (list "member" "key-manager:service-admin") $seed.userRoles -}} +{{- $adminRoles := default (list "admin" "key-manager:service-admin") $seed.adminRoles -}} +apiVersion: "openstack.stable.sap.cc/v1" +kind: "OpenstackSeed" +metadata: + name: {{ .Chart.Name }}-seed + labels: + component: barbican + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + requires: + - monsoon3/domain-tempest-seed + - neutron-tempest-seed + domains: + - name: tempest + projects: + - name: admin + description: Tempest admin project + role_assignments: + {{- range $role := $adminRoles }} + - user: admin + role: {{ $role }} + - user: admin@Default + role: {{ $role }} + {{- end }} + {{- range $i := until $userCount }} + - name: tempest{{ add1 $i }} + description: Tempest Test Project {{ add1 $i }} + role_assignments: + - user: admin@Default + role: key-manager:service-admin + {{- end }} + users: + {{- range $i := until $userCount }} + - name: tempestuser{{ add1 $i }} + description: Barbican Tempest Test User {{ add1 $i }} + password: {{ $pw | quote }} + role_assignments: + {{- range $role := $userRoles }} + - project: tempest{{ add1 $i }} + role: {{ $role }} + {{- end }} + - domain: tempest + role: key-manager:service-admin + {{- end }} +{{- end }} diff --git a/openstack/tempest/cinder-tempest-vmdk/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/cinder-tempest-vmdk/templates/etc/_tempest_extra_options.tpl index 4572402c650..1424700466a 100644 --- a/openstack/tempest/cinder-tempest-vmdk/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/cinder-tempest-vmdk/templates/etc/_tempest_extra_options.tpl @@ -46,7 +46,7 @@ trust = True security_compliance = True [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} @@ -61,8 +61,8 @@ max_microversion = 1.46 driver = fake-hardware [compute] -image_ref = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 -image_ref_alt = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = public v3_endpoint_type = public region = {{ .Values.global.region }} @@ -72,7 +72,7 @@ min_microversio = 2.1 max_microversion = latest fixed_network_name = {{ (index .Values (print .Chart.Name | replace "-" "_")).tempest.fixed_network_name }} build_timeout=600 -compute_volume_common_az = qa-de-1b +compute_volume_common_az = {{ required "Missing tempest_common.compute_volume_common_az!" .Values.tempest_common.compute_volume_common_az }} [compute-feature-enabled] resize = true @@ -89,7 +89,7 @@ attach_encrypted_volume = false build_timeout=600 [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} [volume] catalog_type = volumev3 diff --git a/openstack/tempest/cinder-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/cinder-tempest/templates/etc/_tempest_extra_options.tpl index 4d41b46206b..83ca7e02db6 100644 --- a/openstack/tempest/cinder-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/cinder-tempest/templates/etc/_tempest_extra_options.tpl @@ -46,7 +46,7 @@ trust = True security_compliance = True [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} @@ -64,8 +64,8 @@ driver = fake-hardware # image_ref and image_ref_alt will be changed to the image-id during init-script as the image-id can change over time. #image_ref = CHANGE_ME_IMAGE_REF #image_ref_alt = CHANGEMEIMAGEREFALT -image_ref = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 -image_ref_alt = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = public v3_endpoint_type = public region = {{ .Values.global.region }} @@ -75,7 +75,7 @@ min_microversio = 2.1 max_microversion = latest fixed_network_name = {{ (index .Values (print .Chart.Name | replace "-" "_")).tempest.fixed_network_name }} build_timeout=600 -compute_volume_common_az = qa-de-1b +compute_volume_common_az = {{ required "Missing tempest_common.compute_volume_common_az!" .Values.tempest_common.compute_volume_common_az }} [compute-feature-enabled] resize = true @@ -112,7 +112,7 @@ v3_endpoint_type = publicURL region = {{ .Values.global.region }} [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} [volume] catalog_type = volumev3 diff --git a/openstack/tempest/cinder-tempest/templates/seed.yaml b/openstack/tempest/cinder-tempest/templates/seed.yaml new file mode 100644 index 00000000000..ccdb493169f --- /dev/null +++ b/openstack/tempest/cinder-tempest/templates/seed.yaml @@ -0,0 +1,63 @@ +{{- $tc := .Values.tempest_common | default dict -}} +{{- $seed := $tc.seed | default dict -}} +{{- if $seed.enabled -}} +{{- $prefix := default "nova" $seed.accountPrefix -}} +{{- $userCount := int (default 18 $seed.userCount) -}} +{{- $adminCount := int (default 8 $seed.adminCount) -}} +{{- $pw := required "Missing tempestAdminPassword value!" .Values.tempestAdminPassword -}} +{{- $userRoles := default (list "member" "admin" "volume_admin" "resource_admin") $seed.userRoles -}} +{{- $adminRoles := default (list "member" "admin" "volume_admin" "cloud_volume_admin" "resource_admin") $seed.adminRoles -}} +apiVersion: "openstack.stable.sap.cc/v1" +kind: "OpenstackSeed" +metadata: + name: {{ .Chart.Name }}-seed + labels: + component: cinder + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + requires: + - monsoon3/domain-tempest-seed + domains: + - name: tempest + projects: + {{- range $i := until $adminCount }} + - name: {{ $prefix }}-tempest-admin{{ add1 $i }} + description: Cinder Tempest Admin Test Project {{ add1 $i }} + {{- end }} + {{- range $i := until $userCount }} + - name: {{ $prefix }}-tempest{{ add1 $i }} + description: Cinder Tempest Test Project {{ add1 $i }} + {{- end }} + users: + {{- range $i := until $adminCount }} + - name: {{ $prefix }}-tempestadmin{{ add1 $i }} + description: Cinder Tempest Administrator {{ add1 $i }} + password: {{ $pw | quote }} + role_assignments: + {{- range $j := until $adminCount }} + {{- range $role := $adminRoles }} + - project: {{ $prefix }}-tempest-admin{{ add1 $j }} + role: {{ $role }} + {{- end }} + {{- end }} + - domain: tempest + role: admin + - domain: tempest + role: resource_admin + - domain: tempest + role: admin + inherited: true + {{- end }} + {{- range $i := until $userCount }} + - name: {{ $prefix }}-tempestuser{{ add1 $i }} + description: Cinder Tempest Test User {{ add1 $i }} + password: {{ $pw | quote }} + role_assignments: + {{- range $role := $userRoles }} + - project: {{ $prefix }}-tempest{{ add1 $i }} + role: {{ $role }} + {{- end }} + {{- end }} +{{- end }} diff --git a/openstack/tempest/cvh-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/cvh-tempest/templates/etc/_tempest_extra_options.tpl index 42f4289715b..6e6f6d71e1d 100644 --- a/openstack/tempest/cvh-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/cvh-tempest/templates/etc/_tempest_extra_options.tpl @@ -49,14 +49,14 @@ security_compliance = True build_timeout=10800 [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} floating_network_name = FloatingIP-external-monsoon3-01 build_timeout=600 build_interval=20 -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} [network-feature-enabled] ipv6 = False @@ -93,7 +93,7 @@ snapshot = False shelve = False [validation] -image_ssh_user = cirros +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} image_alt_ssh_user = ccloud [volume] diff --git a/openstack/tempest/glance-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/glance-tempest/templates/etc/_tempest_extra_options.tpl index 3a4cd845379..06b410a3a71 100644 --- a/openstack/tempest/glance-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/glance-tempest/templates/etc/_tempest_extra_options.tpl @@ -46,9 +46,9 @@ trust = True security_compliance = True [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} @@ -65,8 +65,8 @@ driver = fake-hardware # image_ref and image_ref_alt will be changed to the image-id during init-script as the image-id can change over time. #image_ref = CHANGE_ME_IMAGE_REF #image_ref_alt = CHANGEMEIMAGEREFALT -image_ref = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 -image_ref_alt = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = public v3_endpoint_type = public region = {{ .Values.global.region }} @@ -86,7 +86,7 @@ vnc_server_header = WebSockify attach_encrypted_volume = false [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} ssh_key_type = rsa [volume] diff --git a/openstack/tempest/keystone-tempest/templates/seed.yaml b/openstack/tempest/keystone-tempest/templates/seed.yaml new file mode 100644 index 00000000000..0e27aa02730 --- /dev/null +++ b/openstack/tempest/keystone-tempest/templates/seed.yaml @@ -0,0 +1,50 @@ +{{- $tc := .Values.tempest_common | default dict -}} +{{- $seed := $tc.seed | default dict -}} +{{- if $seed.enabled -}} +{{- $userCount := int (default 2 $seed.userCount) -}} +{{- $pw := required "Missing tempestAdminPassword value!" .Values.tempestAdminPassword -}} +{{- $userRoles := default (list "member") $seed.userRoles -}} +{{- $adminRoles := default (list "admin") $seed.adminRoles -}} +apiVersion: "openstack.stable.sap.cc/v1" +kind: "OpenstackSeed" +metadata: + name: {{ .Chart.Name }}-seed + labels: + component: keystone + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + requires: + - monsoon3/domain-tempest-seed + domains: + - name: tempest + projects: + - name: admin + description: Tempest admin project + role_assignments: + {{- range $role := $adminRoles }} + - user: admin + role: {{ $role }} + - user: admin@Default + role: {{ $role }} + {{- end }} + {{- range $i := until $userCount }} + - name: tempest{{ add1 $i }} + description: Tempest Test Project {{ add1 $i }} + role_assignments: + - user: admin@Default + role: admin + {{- end }} + users: + {{- range $i := until $userCount }} + - name: tempestuser{{ add1 $i }} + description: Keystone Tempest Test User {{ add1 $i }} + password: {{ $pw | quote }} + role_assignments: + {{- range $role := $userRoles }} + - project: tempest{{ add1 $i }} + role: {{ $role }} + {{- end }} + {{- end }} +{{- end }} diff --git a/openstack/tempest/keystone-tempest/values.yaml b/openstack/tempest/keystone-tempest/values.yaml index d5807887096..1b0525fd376 100644 --- a/openstack/tempest/keystone-tempest/values.yaml +++ b/openstack/tempest/keystone-tempest/values.yaml @@ -7,7 +7,7 @@ run_pattern: keystone_tempest_plugin.tests.api|tempest.api.identity # Optional # Concurrency default is 1 -#concurrency: 8 +# concurrency: 8 owner-info: helm-chart-url: 'https://github.com/sapcc/helm-charts/tree/master/openstack/tempest/keystone-tempest' maintainers: diff --git a/openstack/tempest/kvm-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/kvm-tempest/templates/etc/_tempest_extra_options.tpl index 3eed0b052bf..131df888b5b 100644 --- a/openstack/tempest/kvm-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/kvm-tempest/templates/etc/_tempest_extra_options.tpl @@ -49,14 +49,14 @@ security_compliance = True build_timeout=10800 [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} floating_network_name = FloatingIP-external-monsoon3-01 build_timeout=600 build_interval=20 -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} [network-feature-enabled] ipv6 = False @@ -93,7 +93,7 @@ snapshot = False shelve = False [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} image_alt_ssh_user = ubuntu [volume] diff --git a/openstack/tempest/octavia-tempest/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/octavia-tempest/templates/etc/_tempest_extra_options.tpl index b7d1fe656d8..5bdaa845307 100644 --- a/openstack/tempest/octavia-tempest/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/octavia-tempest/templates/etc/_tempest_extra_options.tpl @@ -46,9 +46,9 @@ trust = True security_compliance = True [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} @@ -65,8 +65,8 @@ driver = fake-hardware # image_ref and image_ref_alt will be changed to the image-id during init-script as the image-id can change over time. #image_ref = CHANGE_ME_IMAGE_REF #image_ref_alt = CHANGEMEIMAGEREFALT -image_ref = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 -image_ref_alt = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = public v3_endpoint_type = public region = {{ .Values.global.region }} diff --git a/openstack/tempest/tempest-base/templates/etc/_tempest_extra_options.tpl b/openstack/tempest/tempest-base/templates/etc/_tempest_extra_options.tpl index 6b5502b6dcd..7b7d2f82ea1 100644 --- a/openstack/tempest/tempest-base/templates/etc/_tempest_extra_options.tpl +++ b/openstack/tempest/tempest-base/templates/etc/_tempest_extra_options.tpl @@ -50,14 +50,14 @@ security_compliance = True build_timeout=600 [network] -project_network_cidr = 10.199.0.0/16 +project_network_cidr = {{ .Values.tempest_common.project_network_cidr }} public_network_id = {{ .Values.tempest_common.public_network_id }} endpoint_type = public shared_physical_network= {{ .Values.tempest_common.shared_physical_network | default true }} floating_network_name = FloatingIP-external-monsoon3-01 build_timeout=600 build_interval=20 -subnet_id = a5703f23-ffcb-4ca7-9dfe-ab9861d91bf5 +subnet_id = {{ required "Missing tempest_common.subnet_id!" .Values.tempest_common.subnet_id }} [network-feature-enabled] ipv6 = False @@ -73,10 +73,8 @@ driver = fake-hardware [compute] # image_ref and image_ref_alt will be changed to the image-id during init-script as the image-id can change over time. -#image_ref = CHANGE_ME_IMAGE_REF -#image_ref_alt = CHANGEMEIMAGEREFALT -image_ref = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 -image_ref_alt = 84f9f266-3f11-4447-ae6c-f7940b2f5eb1 +image_ref = {{ required "Missing tempest_common.image_ref!" .Values.tempest_common.image_ref }} +image_ref_alt = {{ required "Missing tempest_common.image_ref_alt!" .Values.tempest_common.image_ref_alt }} endpoint_type = public v3_endpoint_type = public region = {{ .Values.global.region }} @@ -86,7 +84,7 @@ min_microversio = 2.1 max_microversion = latest fixed_network_name = {{ default "" (index .Values (print .Chart.Name | replace "-" "_")).tempest.fixed_network_name }} build_timeout=600 -compute_volume_common_az = qa-de-1b +compute_volume_common_az = {{ required "Missing tempest_common.compute_volume_common_az!" .Values.tempest_common.compute_volume_common_az }} [compute-feature-enabled] resize = True @@ -121,7 +119,7 @@ v3_endpoint_type = publicURL region = {{ .Values.global.region }} [validation] -image_ssh_user = ccloud +image_ssh_user = {{ required "Missing tempest_common.image_ssh_user!" .Values.tempest_common.image_ssh_user }} ssh_key_type = rsa [volume] @@ -153,6 +151,6 @@ keystone = True octavia = True [dns] -nameservers = 10.114.1.233,147.204.35.140,147.204.35.141 +nameservers = {{ required "Missing tempest_common.dns_nameservers!" .Values.tempest_common.dns_nameservers }} {{ end }}