Add OpenSUSE Leap15 testing
There is currently no testing of the Leap 15 images in OSH. This addresses it by: - Using the values_overrides folder according to the multi-os spec, creating value override files there for changes that needs to happen on Leap 15 images. - Point to the right images using the previously created folder, to allow using those in CI easily. - Change CI to use previously created overrides. Depends-On: https://review.openstack.org/#/c/651501 Change-Id: I520d3676195c62b253a19397c86b0d0fbabee710
This commit is contained in:
parent
55f70be381
commit
a828d38316
1
cinder/.helmignore
Normal file
1
cinder/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
17
cinder/values_overrides/rocky-opensuse_15.yaml
Normal file
17
cinder/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
db_init: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
cinder_db_sync: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
db_drop: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
ks_user: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
ks_service: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
ks_endpoints: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
cinder_api: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
bootstrap: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
cinder_scheduler: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
cinder_volume: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
cinder_volume_usage_audit: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15
|
||||||
|
cinder_backup: docker.io/openstackhelm/cinder:rocky-opensuse_15
|
||||||
|
cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15
|
1
glance/.helmignore
Normal file
1
glance/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
13
glance/values_overrides/rocky-opensuse_15.yaml
Normal file
13
glance/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
glance_db_sync: "docker.io/openstackhelm/glance:rocky-opensuse_15"
|
||||||
|
glance_api: "docker.io/openstackhelm/glance:rocky-opensuse_15"
|
||||||
|
glance_registry: "docker.io/openstackhelm/glance:rocky-opensuse_15"
|
||||||
|
glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
|
1
heat/.helmignore
Normal file
1
heat/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
16
heat/values_overrides/rocky-opensuse_15.yaml
Normal file
16
heat/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_db_sync: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_api: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_cfn: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_engine: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
1
horizon/.helmignore
Normal file
1
horizon/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
24
horizon/values_overrides/opensuse_15.yaml
Normal file
24
horizon/values_overrides/opensuse_15.yaml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
---
|
||||||
|
conf:
|
||||||
|
software:
|
||||||
|
apache2:
|
||||||
|
binary: apache2ctl
|
||||||
|
start_parameters: -DFOREGROUND -k start
|
||||||
|
site_dir: /etc/apache2/vhosts.d
|
||||||
|
conf_dir: /etc/apache2/conf.d
|
||||||
|
a2enmod:
|
||||||
|
- rewrite
|
||||||
|
- version
|
||||||
|
horizon:
|
||||||
|
security: |
|
||||||
|
<Directory "/var/www">
|
||||||
|
Options Indexes FollowSymLinks
|
||||||
|
AllowOverride All
|
||||||
|
<IfModule !mod_access_compat.c>
|
||||||
|
Require all granted
|
||||||
|
</IfModule>
|
||||||
|
<IfModule mod_access_compat.c>
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
</IfModule>
|
||||||
|
</Directory>
|
7
horizon/values_overrides/rocky-opensuse_15.yaml
Normal file
7
horizon/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
db_init: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
db_drop: docker.io/openstackhelm/heat:rocky-opensuse_15
|
||||||
|
horizon_db_sync: docker.io/openstackhelm/horizon:rocky-opensuse_15
|
||||||
|
horizon: docker.io/openstackhelm/horizon:rocky-opensuse_15
|
1
keystone/.helmignore
Normal file
1
keystone/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
30
keystone/values_overrides/opensuse_15.yaml
Normal file
30
keystone/values_overrides/opensuse_15.yaml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
---
|
||||||
|
conf:
|
||||||
|
software:
|
||||||
|
apache2:
|
||||||
|
binary: apache2ctl
|
||||||
|
start_parameters: -DFOREGROUND -k start
|
||||||
|
site_dir: /etc/apache2/vhosts.d
|
||||||
|
conf_dir: /etc/apache2/conf.d
|
||||||
|
a2enmod:
|
||||||
|
- version
|
||||||
|
security: |
|
||||||
|
<Directory "/var/www">
|
||||||
|
Options Indexes FollowSymLinks
|
||||||
|
AllowOverride All
|
||||||
|
<IfModule !mod_access_compat.c>
|
||||||
|
Require all granted
|
||||||
|
</IfModule>
|
||||||
|
<IfModule mod_access_compat.c>
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
</IfModule>
|
||||||
|
</Directory>
|
||||||
|
pod:
|
||||||
|
security_context:
|
||||||
|
keystone:
|
||||||
|
pod:
|
||||||
|
runAsUser: 0
|
||||||
|
container:
|
||||||
|
keystone_api:
|
||||||
|
readOnlyRootFilesystem: false
|
16
keystone/values_overrides/rocky-opensuse_15.yaml
Normal file
16
keystone/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15"
|
||||||
|
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
|
1
neutron/.helmignore
Normal file
1
neutron/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
16
neutron/values_overrides/rocky-opensuse_15.yaml
Normal file
16
neutron/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_l3: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_metadata: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
||||||
|
neutron_server: "docker.io/openstackhelm/neutron:rocky-opensuse_15"
|
1
nova/.helmignore
Normal file
1
nova/.helmignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
values_overrides
|
22
nova/values_overrides/opensuse_15.yaml
Normal file
22
nova/values_overrides/opensuse_15.yaml
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
---
|
||||||
|
conf:
|
||||||
|
software:
|
||||||
|
apache2:
|
||||||
|
binary: apache2ctl
|
||||||
|
start_parameters: -DFOREGROUND -k start
|
||||||
|
site_dir: /etc/apache2/vhosts.d
|
||||||
|
conf_dir: /etc/apache2/conf.d
|
||||||
|
a2enmod:
|
||||||
|
- version
|
||||||
|
security: |
|
||||||
|
<Directory "/var/www">
|
||||||
|
Options Indexes FollowSymLinks
|
||||||
|
AllowOverride All
|
||||||
|
<IfModule !mod_access_compat.c>
|
||||||
|
Require all granted
|
||||||
|
</IfModule>
|
||||||
|
<IfModule mod_access_compat.c>
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
</IfModule>
|
||||||
|
</Directory>
|
27
nova/values_overrides/rocky-opensuse_15.yaml
Normal file
27
nova/values_overrides/rocky-opensuse_15.yaml
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
---
|
||||||
|
images:
|
||||||
|
tags:
|
||||||
|
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
nova_api: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_cell_setup: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
|
||||||
|
nova_compute: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
# nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
|
||||||
|
nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_conductor: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_consoleauth: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_db_sync: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_novncproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_placement: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_scheduler: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
#nova_service_cleaner: 'docker.io/port/ceph-config-helper:v1.10.3'
|
||||||
|
nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15"
|
||||||
|
nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
|
||||||
|
|
@ -24,6 +24,7 @@ make keystone
|
|||||||
helm upgrade --install keystone ./keystone \
|
helm upgrade --install keystone ./keystone \
|
||||||
--namespace=openstack \
|
--namespace=openstack \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
|
${OSH_VALUES_OVERRIDES_HELM_ARGS:=} \
|
||||||
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
||||||
|
|
||||||
#NOTE: Wait for deploy
|
#NOTE: Wait for deploy
|
||||||
|
@ -65,6 +65,13 @@
|
|||||||
- ./tools/deployment/component/common/memcached.sh
|
- ./tools/deployment/component/common/memcached.sh
|
||||||
- ./tools/deployment/component/common/rabbitmq.sh
|
- ./tools/deployment/component/common/rabbitmq.sh
|
||||||
- ./tools/deployment/component/keystone/keystone.sh
|
- ./tools/deployment/component/keystone/keystone.sh
|
||||||
|
- job:
|
||||||
|
name: openstack-helm-keystone-rocky-opensuse_15
|
||||||
|
parent: openstack-helm-keystone
|
||||||
|
vars:
|
||||||
|
values_overrides:
|
||||||
|
- ./keystone/values_overrides/opensuse_15.yaml
|
||||||
|
- ./keystone/values_overrides/rocky-opensuse_15.yaml
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: openstack-helm-keystone-ldap
|
name: openstack-helm-keystone-ldap
|
||||||
|
@ -26,6 +26,8 @@
|
|||||||
- openstack-helm-lint
|
- openstack-helm-lint
|
||||||
- openstack-helm-bandit
|
- openstack-helm-bandit
|
||||||
- openstack-helm-keystone
|
- openstack-helm-keystone
|
||||||
|
- openstack-helm-keystone-rocky-opensuse_15:
|
||||||
|
voting: false
|
||||||
- openstack-helm-keystone-ldap
|
- openstack-helm-keystone-ldap
|
||||||
- openstack-helm-glance
|
- openstack-helm-glance
|
||||||
- openstack-helm-heat
|
- openstack-helm-heat
|
||||||
|
Loading…
Reference in New Issue
Block a user