airship/treasuremap
Code Issues Proposed changes

Merge "Add airskiff_suse site"

Browse Source
This commit is contained in:
Zuul 2019-09-10 20:36:24 +00:00 committed by Gerrit Code Review
commit 4664740afc
21 changed files with 479 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
.zuul.yaml
View File

@ -20,18 +20,20 @@
jobs:
- treasuremap-seaworthy-site-lint
- treasuremap-seaworthy-virt-site-lint
- treasuremap-airskiff-site-lint
- treasuremap-airskiff-ubuntu-site-lint
- treasuremap-airskiff-suse-site-lint
- treasuremap-airsloop-site-lint
- treasuremap-aiab-site-lint
- treasuremap-airskiff-deployment-ubuntu
- treasuremap-airskiff-deployment-suse
gate:
jobs:
- treasuremap-seaworthy-site-lint
- treasuremap-seaworthy-virt-site-lint
- treasuremap-airskiff-site-lint
- treasuremap-airskiff-ubuntu-site-lint
- treasuremap-airskiff-suse-site-lint
- treasuremap-airsloop-site-lint
- treasuremap-aiab-site-lint
- treasuremap-airskiff-deployment-ubuntu
post:
jobs:
- treasuremap-upload-git-mirror
@ -90,7 +92,7 @@
- ^site/aiab/.*$
- job:
name: treasuremap-airskiff-site-lint
name: treasuremap-airskiff-ubuntu-site-lint
description: |
Lint the airskiff site using Pegleg.
parent: treasuremap-site-lint
@ -104,6 +106,21 @@
- ^site/airsloop/.*$
- ^site/aiab/.*$
- job:
name: treasuremap-airskiff-suse-site-lint
description: |
Lint the airskiff-suse site using Pegleg.
parent: treasuremap-site-lint
vars:
site: airskiff-suse
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^site/seaworthy/.*$
- ^site/seaworthy-virt/.*$
- ^site/airsloop/.*$
- ^site/aiab/.*$
- job:
name: treasuremap-airsloop-site-lint
description: |
@ -148,6 +165,29 @@
- tools/gate/playbooks/airskiff-reduce-site.yaml
run: tools/gate/playbooks/airskiff-deploy-gate.yaml
post-run: tools/gate/playbooks/debug-report.yaml
vars:
site: airskiff
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^site/seaworthy/.*$
- ^site/airsloop/.*$
- ^site/aiab/.*$
- job:
name: treasuremap-airskiff-deployment-suse
nodeset: treasuremap-single-node
description: |
Deploy Memcached using Airskiff-suse and latest Treasuremap changes.
voting: false
timeout: 9600
pre-run:
- tools/gate/playbooks/git-config.yaml
- tools/gate/playbooks/airskiff-reduce-site.yaml
run: tools/gate/playbooks/airskiff-deploy-gate.yaml
vars:
site: airskiff-suse
post-run: tools/gate/playbooks/debug-report.yaml
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$

13
site/airskiff-suse/deployment/deployment-configuration.yaml Normal file
View File

@ -0,0 +1,13 @@
---
schema: shipyard/DeploymentConfiguration/v1
metadata:
schema: metadata/Document/v1
name: deployment-configuration
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
armada:
manifest: full-site
...

12
site/airskiff-suse/site-definition.yaml Normal file
View File

@ -0,0 +1,12 @@
---
schema: pegleg/SiteDefinition/v1
metadata:
schema: metadata/Document/v1
layeringDefinition:
abstract: false
layer: site
name: airskiff-suse
storagePolicy: cleartext
data:
site_type: skiff
...

21
site/airskiff-suse/software/charts/osh/openstack-compute-kit/chart-group.yaml Normal file
View File

@ -0,0 +1,21 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-compute-kit
replacement: true
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: openstack-compute-kit-chart-group-global
actions:
- method: replace
path: .chart_group
storagePolicy: cleartext
data:
chart_group:
- libvirt
- openvswitch
- neutron-suse
- nova-suse

23
site/airskiff-suse/software/charts/osh/openstack-compute-kit/neutron.yaml Normal file
View File

@ -0,0 +1,23 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: neutron-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: neutron-type
component: neutron
actions:
- method: merge
path: .
storagePolicy: cleartext
data:
values:
# Required for Rocky, the version openSUSE neutron image used here is based on.
conf:
paste:
app:neutronversions:
paste.app_factory: neutron.pecan_wsgi.app:versions_factory
...

45
site/airskiff-suse/software/charts/osh/openstack-compute-kit/nova.yaml Normal file
View File

@ -0,0 +1,45 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: nova-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: nova-type
component: nova
actions:
- method: merge
path: .
storagePolicy: cleartext
data:
values:
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>
nova:
libvirt:
virt_type: qemu
cpu_mode: host-model
DEFAULT:
mkisofs_cmd: mkisofs
...

19
site/airskiff-suse/software/charts/osh/openstack-keystone/chart-group.yaml Normal file
View File

@ -0,0 +1,19 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: openstack-keystone
replacement: true
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: openstack-keystone-chart-group-global
component: keystone
actions:
- method: replace
path: .chart_group
storagePolicy: cleartext
data:
chart_group:
- keystone-suse

47
site/airskiff-suse/software/charts/osh/openstack-keystone/keystone.yaml Normal file
View File

@ -0,0 +1,47 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: keystone-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: keystone-global
component: keystone
actions:
- method: merge
path: .
storagePolicy: cleartext
data:
values:
pod:
security_context:
keystone:
pod:
runAsUser: 0
container:
keystone_api:
readOnlyRootFilesystem: false
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>
...

21
site/airskiff-suse/software/charts/ucp/keystone/chart-group.yaml Normal file
View File

@ -0,0 +1,21 @@
---
schema: armada/ChartGroup/v1
metadata:
schema: metadata/Document/v1
name: ucp-keystone
replacement: true
labels:
name: ucp-keystone-chart-group-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: ucp-keystone-chart-group-global
actions:
- method: replace
path: .chart_group
storagePolicy: cleartext
data:
chart_group:
- ucp-keystone-memcached
- ucp-keystone-suse

51
site/airskiff-suse/software/charts/ucp/keystone/keystone.yaml Normal file
View File

@ -0,0 +1,51 @@
---
schema: armada/Chart/v1
metadata:
schema: metadata/Document/v1
name: ucp-keystone-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: ucp-keystone-type
component: keystone
actions:
- method: merge
path: .
storagePolicy: cleartext
data:
wait:
timeout: 600
test:
timeout: 600
values:
pod:
security_context:
keystone:
pod:
runAsUser: 0
container:
keystone_api:
readOnlyRootFilesystem: false
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>
...

13
site/airskiff-suse/software/config/common-software-config.yaml Normal file
View File

@ -0,0 +1,13 @@
---
schema: pegleg/CommonSoftwareConfig/v1
metadata:
schema: metadata/Document/v1
name: common-software-config
layeringDefinition:
abstract: false
layer: site
storagePolicy: cleartext
data:
osh:
region_name: RegionOne
...

159
site/airskiff-suse/software/config/versions.yaml Normal file
View File

@ -0,0 +1,159 @@
---
schema: pegleg/SoftwareVersions/v1
metadata:
labels:
name: software-versions-airskiff-suse
layeringDefinition:
abstract: false
layer: site
parentSelector:
name: software-versions-global
actions:
- method: merge
path: .
name: software-versions
replacement: true
schema: metadata/Document/v1
storagePolicy: cleartext
data:
images:
osh:
glance:
glance_db_sync: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
glance_api: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
glance_registry: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
keystone:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
heat:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_db_sync: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_api: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_cfn: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_engine: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ingress:
ingress_module_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
ingress_routed_vip: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
libvirt:
libvirt: "docker.io/openstackhelm/libvirt:latest-opensuse_15"
mariadb:
prometheus_mysql_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
neutron:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_l3: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_metadata: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_server: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
neutron_sriov_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819-sriov-1804"
neutron_sriov_agent_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819-sriov-1804"
nova:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
nova_api: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_cell_setup: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
nova_compute: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_conductor: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_consoleauth: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_db_sync: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_novncproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_placement: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_scheduler: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
openvswitch:
openvswitch_db_server: "docker.io/openstackhelm/openvswitch:latest-opensuse_15"
openvswitch_vswitchd: "docker.io/openstackhelm/openvswitch:latest-opensuse_15"
rabbitmq:
prometheus_rabbitmq_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
rabbitmq_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ucp:
armada:
api: "quay.io/airshipit/armada:master-opensuse_15"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
barbican:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
scripted_test: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
barbican_db_sync: "docker.io/openstackhelm/barbican:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
barbican_api: "docker.io/openstackhelm/barbican:rocky-opensuse_15-20190819"
deckhand:
deckhand: "quay.io/airshipit/deckhand:master-opensuse_15"
db_sync: "quay.io/airshipit/deckhand:master-opensuse_15"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ingress:
ingress_module_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
ingress_routed_vip: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
keystone:
bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
mariadb:
prometheus_mysql_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
rabbitmq:
prometheus_rabbitmq_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
rabbitmq_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
shipyard:
shipyard: "quay.io/airshipit/shipyard:master-opensuse_15"
shipyard_db_sync: "quay.io/airshipit/shipyard:master-opensuse_15"
airflow: "quay.io/airshipit/airflow:master-opensuse_15"
airflow_db_sync: "quay.io/airshipit/airflow:master-opensuse_15"
ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
...

2
site/airskiff/software/config/versions.yaml
View File

@ -5,7 +5,7 @@ metadata:
replacement: true
name: software-versions
labels:
name: software-versions-airskiff-ubuntu
name: software-versions-airskiff
layeringDefinition:
abstract: false
layer: site

2
tools/gate/playbooks/airskiff-deploy-gate.yaml
View File

@ -47,6 +47,7 @@
shell: |
mkdir ~/.kube
cp -rp /home/zuul/.kube/config ~/.kube/config
export PL_SITE="{{ site }}"
./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
args:
chdir: "{{ zuul.project.src_dir }}"
@ -54,6 +55,7 @@
- name: Deploy Software using Airship
shell: |
export PL_SITE="{{ site }}"
./tools/deployment/airskiff/developer/100-deploy-osh.sh
args:
chdir: "{{ zuul.project.src_dir }}"

2
type/skiff/charts/osh/openstack-compute-kit/libvirt.yaml
View File

@ -13,7 +13,7 @@ metadata:
name: libvirt-global
component: libvirt
actions:
- method: replace
- method: merge
path: .values
storagePolicy: cleartext
data:

1
type/skiff/charts/osh/openstack-compute-kit/neutron.yaml
View File

@ -6,6 +6,7 @@ metadata:
replacement: true
labels:
name: neutron-type
component: neutron
layeringDefinition:
abstract: false
layer: type

1
type/skiff/charts/osh/openstack-compute-kit/nova.yaml
View File

@ -5,6 +5,7 @@ metadata:
name: nova
labels:
name: nova-type
component: nova
layeringDefinition:
abstract: false
layer: type

1
type/skiff/charts/osh/openstack-glance/glance.yaml
View File

@ -6,6 +6,7 @@ metadata:
replacement: true
labels:
name: glance-type
component: glance
layeringDefinition:
abstract: false
layer: type

1
type/skiff/charts/osh/openstack-keystone/keystone.yaml
View File

@ -6,6 +6,7 @@ metadata:
replacement: true
labels:
name: keystone-type
component: keystone
layeringDefinition:
abstract: false
layer: type

2
type/skiff/charts/ucp/core/mariadb.yaml
View File

@ -18,6 +18,8 @@ metadata:
data:
wait:
timeout: 1800
test:
timeout: 600
values:
pod:
replicas:

1
type/skiff/charts/ucp/keystone/keystone.yaml
View File

@ -6,6 +6,7 @@ metadata:
replacement: true
labels:
name: ucp-keystone-type
component: keystone
layeringDefinition:
abstract: false
layer: type