Browse Source

Add airskiff_suse site

Added airskiff_suse site that deploys the ucp and openstack containers on openSUSE
images. Also renamed the previous airskiff site repo to airskiff-ubuntu. Added new
gates for airskiff-suse lint and deployment.

Change-Id: I5672e8db556ef02c3d74a598d2772fbebccf6f77
changes/06/678106/7
James Gu 3 weeks ago
parent
commit
f3a4cebcb4

+ 44
- 4
.zuul.yaml View File

@@ -20,18 +20,20 @@
20 20
       jobs:
21 21
         - treasuremap-seaworthy-site-lint
22 22
         - treasuremap-seaworthy-virt-site-lint
23
-        - treasuremap-airskiff-site-lint
23
+        - treasuremap-airskiff-ubuntu-site-lint
24
+        - treasuremap-airskiff-suse-site-lint
24 25
         - treasuremap-airsloop-site-lint
25 26
         - treasuremap-aiab-site-lint
26 27
         - treasuremap-airskiff-deployment-ubuntu
28
+        - treasuremap-airskiff-deployment-suse
27 29
     gate:
28 30
       jobs:
29 31
         - treasuremap-seaworthy-site-lint
30 32
         - treasuremap-seaworthy-virt-site-lint
31
-        - treasuremap-airskiff-site-lint
33
+        - treasuremap-airskiff-ubuntu-site-lint
34
+        - treasuremap-airskiff-suse-site-lint
32 35
         - treasuremap-airsloop-site-lint
33 36
         - treasuremap-aiab-site-lint
34
-        - treasuremap-airskiff-deployment-ubuntu
35 37
     post:
36 38
       jobs:
37 39
         - treasuremap-upload-git-mirror
@@ -90,7 +92,7 @@
90 92
       - ^site/aiab/.*$
91 93
 
92 94
 - job:
93
-    name: treasuremap-airskiff-site-lint
95
+    name: treasuremap-airskiff-ubuntu-site-lint
94 96
     description: |
95 97
       Lint the airskiff site using Pegleg.
96 98
     parent: treasuremap-site-lint
@@ -104,6 +106,21 @@
104 106
       - ^site/airsloop/.*$
105 107
       - ^site/aiab/.*$
106 108
 
109
+- job:
110
+    name: treasuremap-airskiff-suse-site-lint
111
+    description: |
112
+      Lint the airskiff-suse site using Pegleg.
113
+    parent: treasuremap-site-lint
114
+    vars:
115
+      site: airskiff-suse
116
+    irrelevant-files:
117
+      - ^.*\.rst$
118
+      - ^doc/.*$
119
+      - ^site/seaworthy/.*$
120
+      - ^site/seaworthy-virt/.*$
121
+      - ^site/airsloop/.*$
122
+      - ^site/aiab/.*$
123
+
107 124
 - job:
108 125
     name: treasuremap-airsloop-site-lint
109 126
     description: |
@@ -148,6 +165,29 @@
148 165
       - tools/gate/playbooks/airskiff-reduce-site.yaml
149 166
     run: tools/gate/playbooks/airskiff-deploy-gate.yaml
150 167
     post-run: tools/gate/playbooks/debug-report.yaml
168
+    vars:
169
+       site: airskiff
170
+    irrelevant-files:
171
+      - ^.*\.rst$
172
+      - ^doc/.*$
173
+      - ^site/seaworthy/.*$
174
+      - ^site/airsloop/.*$
175
+      - ^site/aiab/.*$
176
+
177
+- job:
178
+    name: treasuremap-airskiff-deployment-suse
179
+    nodeset: treasuremap-single-node
180
+    description: |
181
+      Deploy Memcached using Airskiff-suse and latest Treasuremap changes.
182
+    voting: false
183
+    timeout: 9600
184
+    pre-run:
185
+      - tools/gate/playbooks/git-config.yaml
186
+      - tools/gate/playbooks/airskiff-reduce-site.yaml
187
+    run: tools/gate/playbooks/airskiff-deploy-gate.yaml
188
+    vars:
189
+      site: airskiff-suse
190
+    post-run: tools/gate/playbooks/debug-report.yaml
151 191
     irrelevant-files:
152 192
       - ^.*\.rst$
153 193
       - ^doc/.*$

+ 13
- 0
site/airskiff-suse/deployment/deployment-configuration.yaml View File

@@ -0,0 +1,13 @@
1
+---
2
+schema: shipyard/DeploymentConfiguration/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: deployment-configuration
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data:
11
+  armada:
12
+    manifest: full-site
13
+...

+ 12
- 0
site/airskiff-suse/site-definition.yaml View File

@@ -0,0 +1,12 @@
1
+---
2
+schema: pegleg/SiteDefinition/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  layeringDefinition:
6
+    abstract: false
7
+    layer: site
8
+  name: airskiff-suse
9
+  storagePolicy: cleartext
10
+data:
11
+  site_type: skiff
12
+...

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

@@ -0,0 +1,21 @@
1
+---
2
+schema: armada/ChartGroup/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: openstack-compute-kit
6
+  replacement: true
7
+  layeringDefinition:
8
+    abstract: false
9
+    layer: site
10
+    parentSelector:
11
+      name: openstack-compute-kit-chart-group-global
12
+    actions:
13
+      - method: replace
14
+        path: .chart_group
15
+  storagePolicy: cleartext
16
+data:
17
+  chart_group:
18
+    - libvirt
19
+    - openvswitch
20
+    - neutron-suse
21
+    - nova-suse

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

@@ -0,0 +1,23 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: neutron-suse
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+    parentSelector:
10
+      name: neutron-type
11
+      component: neutron
12
+    actions:
13
+      - method: merge
14
+        path: .
15
+  storagePolicy: cleartext
16
+data:
17
+  values:
18
+    # Required for Rocky, the version openSUSE neutron image used here is based on.
19
+    conf:
20
+      paste:
21
+        app:neutronversions:
22
+          paste.app_factory: neutron.pecan_wsgi.app:versions_factory
23
+...

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

@@ -0,0 +1,45 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: nova-suse
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+    parentSelector:
10
+      name: nova-type
11
+      component: nova
12
+    actions:
13
+      - method: merge
14
+        path: .
15
+  storagePolicy: cleartext
16
+data:
17
+  values:
18
+    conf:
19
+      software:
20
+        apache2:
21
+          binary: apache2ctl
22
+          start_parameters: -DFOREGROUND -k start
23
+          site_dir: /etc/apache2/vhosts.d
24
+          conf_dir: /etc/apache2/conf.d
25
+          a2enmod:
26
+            - version
27
+      security: |
28
+        <Directory "/var/www">
29
+          Options Indexes FollowSymLinks
30
+          AllowOverride All
31
+          <IfModule !mod_access_compat.c>
32
+            Require all granted
33
+          </IfModule>
34
+          <IfModule mod_access_compat.c>
35
+            Order allow,deny
36
+            Allow from all
37
+          </IfModule>
38
+        </Directory>
39
+      nova:
40
+        libvirt:
41
+          virt_type: qemu
42
+          cpu_mode: host-model
43
+        DEFAULT:
44
+          mkisofs_cmd: mkisofs
45
+...

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

@@ -0,0 +1,19 @@
1
+---
2
+schema: armada/ChartGroup/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: openstack-keystone
6
+  replacement: true
7
+  layeringDefinition:
8
+    abstract: false
9
+    layer: site
10
+    parentSelector:
11
+      name: openstack-keystone-chart-group-global
12
+      component: keystone
13
+    actions:
14
+      - method: replace
15
+        path: .chart_group
16
+  storagePolicy: cleartext
17
+data:
18
+  chart_group:
19
+    - keystone-suse

+ 47
- 0
site/airskiff-suse/software/charts/osh/openstack-keystone/keystone.yaml View File

@@ -0,0 +1,47 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: keystone-suse
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+    parentSelector:
10
+      name: keystone-global
11
+      component: keystone
12
+    actions:
13
+      - method: merge
14
+        path: .
15
+  storagePolicy: cleartext
16
+data:
17
+  values:
18
+    pod:
19
+      security_context:
20
+        keystone:
21
+          pod:
22
+            runAsUser: 0
23
+          container:
24
+            keystone_api:
25
+              readOnlyRootFilesystem: false
26
+    conf:
27
+      software:
28
+        apache2:
29
+          binary: apache2ctl
30
+          start_parameters: -DFOREGROUND -k start
31
+          site_dir: /etc/apache2/vhosts.d
32
+          conf_dir: /etc/apache2/conf.d
33
+          a2enmod:
34
+            - version
35
+      security: |
36
+        <Directory "/var/www">
37
+          Options Indexes FollowSymLinks
38
+          AllowOverride All
39
+          <IfModule !mod_access_compat.c>
40
+            Require all granted
41
+          </IfModule>
42
+          <IfModule mod_access_compat.c>
43
+            Order allow,deny
44
+            Allow from all
45
+          </IfModule>
46
+        </Directory>
47
+...

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

@@ -0,0 +1,21 @@
1
+---
2
+schema: armada/ChartGroup/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp-keystone
6
+  replacement: true
7
+  labels:
8
+    name: ucp-keystone-chart-group-suse
9
+  layeringDefinition:
10
+    abstract: false
11
+    layer: site
12
+    parentSelector:
13
+      name: ucp-keystone-chart-group-global
14
+    actions:
15
+      - method: replace
16
+        path: .chart_group
17
+  storagePolicy: cleartext
18
+data:
19
+  chart_group:
20
+    - ucp-keystone-memcached
21
+    - ucp-keystone-suse

+ 51
- 0
site/airskiff-suse/software/charts/ucp/keystone/keystone.yaml View File

@@ -0,0 +1,51 @@
1
+---
2
+schema: armada/Chart/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: ucp-keystone-suse
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+    parentSelector:
10
+      name: ucp-keystone-type
11
+      component: keystone
12
+    actions:
13
+      - method: merge
14
+        path: .
15
+  storagePolicy: cleartext
16
+data:
17
+  wait:
18
+    timeout: 600
19
+  test:
20
+    timeout: 600
21
+  values:
22
+    pod:
23
+      security_context:
24
+        keystone:
25
+          pod:
26
+            runAsUser: 0
27
+          container:
28
+            keystone_api:
29
+              readOnlyRootFilesystem: false
30
+    conf:
31
+      software:
32
+        apache2:
33
+          binary: apache2ctl
34
+          start_parameters: -DFOREGROUND -k start
35
+          site_dir: /etc/apache2/vhosts.d
36
+          conf_dir: /etc/apache2/conf.d
37
+          a2enmod:
38
+            - version
39
+      security: |
40
+        <Directory "/var/www">
41
+          Options Indexes FollowSymLinks
42
+          AllowOverride All
43
+          <IfModule !mod_access_compat.c>
44
+            Require all granted
45
+          </IfModule>
46
+          <IfModule mod_access_compat.c>
47
+            Order allow,deny
48
+            Allow from all
49
+          </IfModule>
50
+        </Directory>
51
+...

+ 13
- 0
site/airskiff-suse/software/config/common-software-config.yaml View File

@@ -0,0 +1,13 @@
1
+---
2
+schema: pegleg/CommonSoftwareConfig/v1
3
+metadata:
4
+  schema: metadata/Document/v1
5
+  name: common-software-config
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+  storagePolicy: cleartext
10
+data:
11
+  osh:
12
+    region_name: RegionOne
13
+...

+ 159
- 0
site/airskiff-suse/software/config/versions.yaml View File

@@ -0,0 +1,159 @@
1
+---
2
+schema: pegleg/SoftwareVersions/v1
3
+metadata:
4
+  labels:
5
+    name: software-versions-airskiff-suse
6
+  layeringDefinition:
7
+    abstract: false
8
+    layer: site
9
+    parentSelector:
10
+      name: software-versions-global
11
+    actions:
12
+      - method: merge
13
+        path: .
14
+  name: software-versions
15
+  replacement: true
16
+  schema: metadata/Document/v1
17
+  storagePolicy: cleartext
18
+data:
19
+  images:
20
+    osh:
21
+      glance:
22
+        glance_db_sync: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
23
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
24
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
25
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
26
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
27
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
28
+        glance_api: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
29
+        glance_registry: "docker.io/openstackhelm/glance:rocky-opensuse_15-20190819"
30
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
31
+        glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
32
+      keystone:
33
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
34
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
35
+        keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
36
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
37
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
38
+        keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
39
+        keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
40
+        keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
41
+        keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
42
+        keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
43
+        keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
44
+      heat:
45
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
46
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
47
+        heat_db_sync: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
48
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
49
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
50
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
51
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
52
+        heat_api: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
53
+        heat_cfn: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
54
+        heat_cloudwatch: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
55
+        heat_engine: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
56
+        heat_engine_cleaner: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
57
+        heat_purge_deleted: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
58
+      ingress:
59
+        ingress_module_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
60
+        ingress_routed_vip: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
61
+      libvirt:
62
+        libvirt: "docker.io/openstackhelm/libvirt:latest-opensuse_15"
63
+      mariadb:
64
+        prometheus_mysql_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
65
+      neutron:
66
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
67
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
68
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
69
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
70
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
71
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
72
+        neutron_db_sync: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
73
+        neutron_dhcp: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
74
+        neutron_l3: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
75
+        neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
76
+        neutron_metadata: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
77
+        neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
78
+        neutron_server: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
79
+        neutron_sriov_agent: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819-sriov-1804"
80
+        neutron_sriov_agent_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819-sriov-1804"
81
+      nova:
82
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
83
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
84
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
85
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
86
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
87
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
88
+        nova_api: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
89
+        nova_cell_setup: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
90
+        nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
91
+        nova_compute: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
92
+        nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
93
+        nova_conductor: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
94
+        nova_consoleauth: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
95
+        nova_db_sync: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
96
+        nova_novncproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
97
+        nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
98
+        nova_placement: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
99
+        nova_scheduler: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
100
+        nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
101
+        nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15-20190819"
102
+        nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
103
+      openvswitch:
104
+        openvswitch_db_server: "docker.io/openstackhelm/openvswitch:latest-opensuse_15"
105
+        openvswitch_vswitchd: "docker.io/openstackhelm/openvswitch:latest-opensuse_15"
106
+      rabbitmq:
107
+        prometheus_rabbitmq_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
108
+        rabbitmq_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
109
+    ucp:
110
+      armada:
111
+        api: "quay.io/airshipit/armada:master-opensuse_15"
112
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
113
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
114
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
115
+      barbican:
116
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
117
+        scripted_test: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
118
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
119
+        barbican_db_sync: "docker.io/openstackhelm/barbican:rocky-opensuse_15-20190819"
120
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
121
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
122
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
123
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
124
+        barbican_api: "docker.io/openstackhelm/barbican:rocky-opensuse_15-20190819"
125
+      deckhand:
126
+        deckhand: "quay.io/airshipit/deckhand:master-opensuse_15"
127
+        db_sync: "quay.io/airshipit/deckhand:master-opensuse_15"
128
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
129
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
130
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
131
+      ingress:
132
+        ingress_module_init: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
133
+        ingress_routed_vip: "docker.io/openstackhelm/neutron:rocky-opensuse_15-20190819"
134
+      keystone:
135
+        bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
136
+        db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
137
+        keystone_db_sync: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
138
+        db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
139
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
140
+        keystone_fernet_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
141
+        keystone_fernet_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
142
+        keystone_credential_setup: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
143
+        keystone_credential_rotate: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
144
+        keystone_api: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
145
+        keystone_domain_manage: "docker.io/openstackhelm/keystone:rocky-opensuse_15-20190819"
146
+      mariadb:
147
+        prometheus_mysql_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
148
+      rabbitmq:
149
+        prometheus_rabbitmq_exporter_helm_tests: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
150
+        rabbitmq_init: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
151
+      shipyard:
152
+        shipyard: "quay.io/airshipit/shipyard:master-opensuse_15"
153
+        shipyard_db_sync: "quay.io/airshipit/shipyard:master-opensuse_15"
154
+        airflow: "quay.io/airshipit/airflow:master-opensuse_15"
155
+        airflow_db_sync: "quay.io/airshipit/airflow:master-opensuse_15"
156
+        ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
157
+        ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
158
+        ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15-20190819"
159
+...

+ 1
- 1
site/airskiff/software/config/versions.yaml View File

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

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

@@ -54,6 +54,7 @@
54 54
       shell: |
55 55
         mkdir ~/.kube
56 56
         cp -rp /home/zuul/.kube/config ~/.kube/config
57
+        export PL_SITE="{{ site }}"
57 58
         ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
58 59
       args:
59 60
         chdir: "{{ zuul.project.src_dir }}"
@@ -61,6 +62,7 @@
61 62
 
62 63
     - name: Deploy Software using Airship
63 64
       shell: |
65
+        export PL_SITE="{{ site }}"
64 66
         ./tools/deployment/airskiff/developer/100-deploy-osh.sh
65 67
       args:
66 68
         chdir: "{{ zuul.project.src_dir }}"

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

@@ -13,7 +13,7 @@ metadata:
13 13
       name: libvirt-global
14 14
       component: libvirt
15 15
     actions:
16
-      - method: replace
16
+      - method: merge
17 17
         path: .values
18 18
   storagePolicy: cleartext
19 19
 data:

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

@@ -6,6 +6,7 @@ metadata:
6 6
   replacement: true
7 7
   labels:
8 8
     name: neutron-type
9
+    component: neutron
9 10
   layeringDefinition:
10 11
     abstract: false
11 12
     layer: type

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

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

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

@@ -6,6 +6,7 @@ metadata:
6 6
   replacement: true
7 7
   labels:
8 8
     name: glance-type
9
+    component: glance
9 10
   layeringDefinition:
10 11
     abstract: false
11 12
     layer: type

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

@@ -6,6 +6,7 @@ metadata:
6 6
   replacement: true
7 7
   labels:
8 8
     name: keystone-type
9
+    component: keystone
9 10
   layeringDefinition:
10 11
     abstract: false
11 12
     layer: type

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

@@ -18,6 +18,8 @@ metadata:
18 18
 data:
19 19
   wait:
20 20
     timeout: 1800
21
+  test:
22
+    timeout: 600
21 23
   values:
22 24
     pod:
23 25
       replicas:

+ 1
- 0
type/skiff/charts/ucp/keystone/keystone.yaml View File

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

Loading…
Cancel
Save