airship/treasuremap
Code Issues Proposed changes

Fixes for OSH and OSH infra manifests

Browse Source 
- Set correct release group prefix
 - Remove DNS and HTTPS from endpoints
 - Fix external interface for ovs/neutron
 - Enable all charts in full-site
 - Set versions to known working state

Change-Id: I5ed4cecc3f0034da448d10b79ccb0abf4efc2b86
This commit is contained in:
Kaspars Skels 2018-08-21 10:26:32 -05:00
parent dcf54d4cf7
commit b46fc4a652
38 changed files with 622 additions and 622 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
global/v4.0/software/charts/osh-infra/dependencies.yaml
View File

@ -21,7 +21,7 @@ data:
wait:
timeout: 600
labels:
release_group: osh-infra-helm-toolkit
release_group: airship-osh-infra-helm-toolkit
upgrade:
no_hooks: true
values: {}

4
global/v4.0/software/charts/osh-infra/osh-infra-ceph-config/ceph-config.yaml
View File

@ -99,7 +99,7 @@ data:
wait:
timeout: 900
labels:
release_group: osh-infra-ceph-config
release_group: airship-osh-infra-ceph-config
install:
no_hooks: false
upgrade:
@ -108,7 +108,7 @@ data:
delete:
- type: job
labels:
release_group: osh-infra-ceph-config
release_group: airship-osh-infra-ceph-config
values:
labels:
job:

4
global/v4.0/software/charts/osh-infra/osh-infra-dashboards/grafana.yaml
View File

@ -190,7 +190,7 @@ data:
wait:
timeout: 900
labels:
release_group: grafana
release_group: airship-grafana
install:
no_hooks: false
upgrade:
@ -199,7 +199,7 @@ data:
delete:
- type: job
labels:
release_group: grafana
release_group: airship-grafana
post:
create: []
values:

4
global/v4.0/software/charts/osh-infra/osh-infra-dashboards/kibana.yaml
View File

@ -79,7 +79,7 @@ data:
wait:
timeout: 900
labels:
release_group: kibana
release_group: airship-kibana
install:
no_hooks: false
upgrade:
@ -88,7 +88,7 @@ data:
delete:
- type: job
labels:
release_group: kibana
release_group: airship-kibana
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml
View File

@ -29,7 +29,7 @@ data:
wait:
timeout: 900
labels:
release_group: osh-infra-ingress-controller
release_group: airship-osh-infra-ingress-controller
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: osh-infra-ingress-controller
release_group: airship-osh-infra-ingress-controller
values:
labels:
server:

4
global/v4.0/software/charts/osh-infra/osh-infra-logging/elasticsearch.yaml
View File

@ -83,7 +83,7 @@ data:
wait:
timeout: 900
labels:
release_group: elasticsearch
release_group: airship-elasticsearch
install:
no_hooks: false
upgrade:
@ -92,7 +92,7 @@ data:
delete:
- type: job
labels:
release_group: elasticsearch
release_group: airship-elasticsearch
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-logging/fluent-logging.yaml
View File

@ -68,7 +68,7 @@ data:
wait:
timeout: 900
labels:
release_group: fluent-logging
release_group: airship-fluent-logging
install:
no_hooks: false
upgrade:
@ -77,7 +77,7 @@ data:
delete:
- type: job
labels:
release_group: fluent-logging
release_group: airship-fluent-logging
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-mariadb/mariadb.yaml
View File

@ -54,7 +54,7 @@ data:
wait:
timeout: 900
labels:
release_group: osh-infra-mariadb
release_group: airship-osh-infra-mariadb
install:
no_hooks: false
upgrade:
@ -63,7 +63,7 @@ data:
delete:
- type: job
labels:
release_group: osh-infra-mariadb
release_group: airship-osh-infra-mariadb
values:
labels:
server:

4
global/v4.0/software/charts/osh-infra/osh-infra-monitoring/nagios.yaml
View File

@ -81,7 +81,7 @@ data:
wait:
timeout: 900
labels:
release_group: nagios
release_group: airship-nagios
install:
no_hooks: false
upgrade:
@ -90,7 +90,7 @@ data:
delete:
- type: job
labels:
release_group: nagios
release_group: airship-nagios
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-alertmanager.yaml
View File

@ -39,7 +39,7 @@ data:
wait:
timeout: 900
labels:
release_group: prometheus-alertmanager
release_group: airship-prometheus-alertmanager
install:
no_hooks: false
upgrade:
@ -48,7 +48,7 @@ data:
delete:
- type: job
labels:
release_group: prometheus-alertmanager
release_group: airship-prometheus-alertmanager
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-kube-state-metrics.yaml
View File

@ -51,7 +51,7 @@ data:
wait:
timeout: 900
labels:
release_group: prometheus-kube-state-metrics
release_group: airship-prometheus-kube-state-metrics
install:
no_hooks: false
upgrade:
@ -60,7 +60,7 @@ data:
delete:
- type: job
labels:
release_group: prometheus-kube-state-metrics
release_group: airship-prometheus-kube-state-metrics
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus-node-exporter.yaml
View File

@ -39,7 +39,7 @@ data:
wait:
timeout: 900
labels:
release_group: prometheus-node-exporter
release_group: airship-prometheus-node-exporter
install:
no_hooks: false
upgrade:
@ -48,7 +48,7 @@ data:
delete:
- type: job
labels:
release_group: prometheus-node-exporter
release_group: airship-prometheus-node-exporter
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-monitoring/prometheus.yaml
View File

@ -45,7 +45,7 @@ data:
wait:
timeout: 900
labels:
release_group: prometheus
release_group: airship-prometheus
install:
no_hooks: false
upgrade:
@ -54,7 +54,7 @@ data:
delete:
- type: job
labels:
release_group: prometheus
release_group: airship-prometheus
create: []
post:
create: []

4
global/v4.0/software/charts/osh-infra/osh-infra-openstack-exporter/prometheus-openstack-exporter.yaml
View File

@ -72,7 +72,7 @@ data:
wait:
timeout: 900
labels:
release_group: prometheus-openstack-exporter
release_group: airship-prometheus-openstack-exporter
install:
no_hooks: false
upgrade:
@ -81,7 +81,7 @@ data:
delete:
- type: job
labels:
release_group: prometheus-openstack-exporter
release_group: airship-prometheus-openstack-exporter
values:
labels:
openstack_exporter:

2
global/v4.0/software/charts/osh/dependencies.yaml
View File

@ -21,7 +21,7 @@ data:
wait:
timeout: 600
labels:
release_group: osh-helm-toolkit
release_group: airship-osh-helm-toolkit
upgrade:
no_hooks: true
values: {}

4
global/v4.0/software/charts/osh/openstack-ceph-config/ceph-config.yaml
View File

@ -99,7 +99,7 @@ data:
wait:
timeout: 900
labels:
release_group: openstack-ceph-config
release_group: airship-openstack-ceph-config
install:
no_hooks: false
upgrade:
@ -108,7 +108,7 @@ data:
delete:
- type: job
labels:
release_group: openstack-ceph-config
release_group: airship-openstack-ceph-config
values:
labels:
job:

4
global/v4.0/software/charts/osh/openstack-cinder/cinder.yaml
View File

@ -175,7 +175,7 @@ data:
wait:
timeout: 900
labels:
release_group: cinder
release_group: airship-cinder
install:
no_hooks: false
upgrade:
@ -184,7 +184,7 @@ data:
delete:
- type: job
labels:
release_group: cinder
release_group: airship-cinder
post:
create: []
values:

8
global/v4.0/software/charts/osh/openstack-cinder/rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: cinder-rabbitmq
release_group: airship-cinder-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,18 +75,18 @@ data:
delete:
- type: job
labels:
release_group: cinder-rabbitmq
release_group: airship-cinder-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
prometheus_rabbitmq_exporter:
node_selector_key: openstack-control-plane
node_selector_value: enabled
node_selector_value: enabled
monitoring:
prometheus:
enabled: true

2
global/v4.0/software/charts/osh/openstack-compute-kit/libvirt.yaml
View File

@ -37,7 +37,7 @@ data:
delete:
- type: job
labels:
release_group: libvirt
release_group: airship-libvirt
values:
labels:
agent:

6
global/v4.0/software/charts/osh/openstack-compute-kit/neutron-rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: neutron-rabbitmq
release_group: airship-neutron-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,11 +75,11 @@ data:
delete:
- type: job
labels:
release_group: neutron-rabbitmq
release_group: airship-neutron-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane

6
global/v4.0/software/charts/osh/openstack-compute-kit/neutron.yaml
View File

@ -198,7 +198,7 @@ data:
delete:
- type: job
labels:
release_group: neutron
release_group: airship-neutron
post:
create: []
values:
@ -323,12 +323,12 @@ data:
type_drivers: vlan,flat,vxlan
tenant_network_types: vxlan
ml2_type_vlan:
network_vlan_ranges: bond1
network_vlan_ranges: bond0
openvswitch_agent:
agent:
tunnel_types: vxlan
ovs:
bridge_mappings: bond1:br-bond1
bridge_mappings: bond0:br-bond0
dependencies:
- osh-helm-toolkit
...

6
global/v4.0/software/charts/osh/openstack-compute-kit/nova-rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: nova-rabbitmq
release_group: airship-nova-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,11 +75,11 @@ data:
delete:
- type: job
labels:
release_group: nova-rabbitmq
release_group: airship-nova-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane

2
global/v4.0/software/charts/osh/openstack-compute-kit/nova.yaml
View File

@ -281,7 +281,7 @@ data:
delete:
- type: job
labels:
release_group: nova
release_group: airship-nova
post:
create: []
values:

6
global/v4.0/software/charts/osh/openstack-compute-kit/openvswitch.yaml
View File

@ -39,7 +39,7 @@ data:
wait:
timeout: 900
labels:
release_group: openvswitch
release_group: airship-openvswitch
install:
no_hooks: false
upgrade:
@ -48,14 +48,14 @@ data:
delete:
- type: job
labels:
release_group: openvswitch
release_group: airship-openvswitch
values:
labels:
ovs:
node_selector_key: openvswitch
node_selector_value: enabled
network:
external_bridge: br-bond1
external_bridge: br-bond0
interface:
external: 'EXTERNAL_INTERFACE'
dependencies:

4
global/v4.0/software/charts/osh/openstack-glance/glance.yaml
View File

@ -193,7 +193,7 @@ data:
wait:
timeout: 900
labels:
release_group: glance
release_group: airship-glance
install:
no_hooks: false
upgrade:
@ -202,7 +202,7 @@ data:
delete:
- type: job
labels:
release_group: glance
release_group: airship-glance
post:
create: []
values:

6
global/v4.0/software/charts/osh/openstack-glance/rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: glance-rabbitmq
release_group: airship-glance-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,11 +75,11 @@ data:
delete:
- type: job
labels:
release_group: glance-rabbitmq
release_group: airship-glance-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane

4
global/v4.0/software/charts/osh/openstack-heat/heat.yaml
View File

@ -188,7 +188,7 @@ data:
wait:
timeout: 900
labels:
release_group: heat
release_group: airship-heat
install:
no_hooks: false
upgrade:
@ -197,7 +197,7 @@ data:
delete:
- type: job
labels:
release_group: heat
release_group: airship-heat
post:
create: []
values:

6
global/v4.0/software/charts/osh/openstack-heat/rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: heat-rabbitmq
release_group: airship-heat-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,11 +75,11 @@ data:
delete:
- type: job
labels:
release_group: heat-rabbitmq
release_group: airship-heat-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane

4
global/v4.0/software/charts/osh/openstack-horizon/horizon.yaml
View File

@ -95,14 +95,14 @@ data:
wait:
timeout: 900
labels:
release_group: horizon
release_group: airship-horizon
upgrade:
no_hooks: false
pre:
delete:
- type: job
labels:
release_group: horizon
release_group: airship-horizon
post:
create: []
values:

4
global/v4.0/software/charts/osh/openstack-ingress-controller/ingress.yaml
View File

@ -29,7 +29,7 @@ data:
wait:
timeout: 900
labels:
release_group: openstack-ingress-controller
release_group: airship-openstack-ingress-controller
install:
no_hooks: false
upgrade:
@ -38,7 +38,7 @@ data:
delete:
- type: job
labels:
release_group: openstack-ingress-controller
release_group: airship-openstack-ingress-controller
values:
labels:
server:

4
global/v4.0/software/charts/osh/openstack-keystone/keystone.yaml
View File

@ -137,7 +137,7 @@ data:
wait:
timeout: 900
labels:
release_group: keystone
release_group: airship-keystone
install:
no_hooks: false
upgrade:
@ -146,7 +146,7 @@ data:
delete:
- type: job
labels:
release_group: keystone
release_group: airship-keystone
post:
create: []
values:

6
global/v4.0/software/charts/osh/openstack-keystone/rabbitmq.yaml
View File

@ -66,7 +66,7 @@ data:
wait:
timeout: 900
labels:
release_group: keystone-rabbitmq
release_group: airship-keystone-rabbitmq
install:
no_hooks: false
upgrade:
@ -75,11 +75,11 @@ data:
delete:
- type: job
labels:
release_group: keystone-rabbitmq
release_group: airship-keystone-rabbitmq
values:
pod:
replicas:
server: 1
server: 1
labels:
server:
node_selector_key: openstack-control-plane

4
global/v4.0/software/charts/osh/openstack-mariadb/mariadb.yaml
View File

@ -54,7 +54,7 @@ data:
wait:
timeout: 900
labels:
release_group: openstack-mariadb
release_group: airship-openstack-mariadb
install:
no_hooks: false
upgrade:
@ -63,7 +63,7 @@ data:
delete:
- type: job
labels:
release_group: openstack-mariadb
release_group: airship-openstack-mariadb
values:
labels:
server:

4
global/v4.0/software/charts/osh/openstack-memcached/memcached.yaml
View File

@ -37,7 +37,7 @@ data:
wait:
timeout: 900
labels:
release_group: openstack-memcached
release_group: airship-openstack-memcached
install:
no_hooks: false
upgrade:
@ -46,7 +46,7 @@ data:
delete:
- type: job
labels:
release_group: openstack-memcached
release_group: airship-openstack-memcached
values:
labels:
server:

4
global/v4.0/software/charts/osh/openstack-radosgw/radosgw.yaml
View File

@ -99,7 +99,7 @@ data:
wait:
timeout: 900
labels:
release_group: radosgw
release_group: airship-radosgw
install:
no_hooks: false
upgrade:
@ -108,7 +108,7 @@ data:
delete:
- type: job
labels:
release_group: radosgw
release_group: airship-radosgw
values:
labels:
job:

34
global/v4.0/software/config/versions.yaml
View File

@ -163,7 +163,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: prometheus-openstack-exporter
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 59d74756ef2fdd0279f59f199879cc985cfef47d
nagios:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -174,77 +174,77 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 5ae782ff52a2604fb1f392d77a018896f29dae49
barbican:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: barbican
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
cinder:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: cinder
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
glance:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: glance
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
heat:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: heat
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
horizon:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: horizon
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
ingress:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
location: https://git.openstack.org/openstack/openstack-helm
subpath: ingress
reference: c0c5199fb20335b3e8839163129372059a876ce8
reference: 332a3da0054e154c003256107a0907774531df79
keystone:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: keystone
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
libvirt:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: libvirt
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 82d99e8f7a7c892555d97adc08b01b8e8cc1ff81
mariadb:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: mariadb
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
memcached:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: memcached
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
neutron:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: neutron
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
nova:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: nova
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
openvswitch:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: openvswitch
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 20d863ce9d18203f2c6a1d679d0cec2bd4fa550d
rabbitmq:
type: git
location: https://git.openstack.org/openstack/openstack-helm
subpath: rabbitmq
reference: fbfcb51c31e21331ceb20b6108b739c5e2ad48f5
reference: 332a3da0054e154c003256107a0907774531df79
ucp:
armada:
type: git

1024
site/airship-seaworthy/software/config/endpoints.yaml
View File

File diff suppressed because it is too large Load Diff

36
site/airship-seaworthy/software/manifests/full-site.yaml
View File

@ -35,22 +35,22 @@ data:
- ucp-drydock
- ucp-promenade
- ucp-shipyard
# - osh-infra-ingress-controller
# - osh-infra-ceph-config
# - osh-infra-logging
# - osh-infra-monitoring
# - osh-infra-mariadb
# - osh-infra-dashboards
# - openstack-ingress-controller
# - openstack-ceph-config
# - openstack-mariadb
# - openstack-memcached
# - openstack-keystone
# - openstack-radosgw
# - openstack-glance
# - openstack-cinder
# - openstack-compute-kit
# - openstack-heat
# - osh-infra-prometheus-openstack-exporter
# - openstack-horizon
- osh-infra-ingress-controller
- osh-infra-ceph-config
- osh-infra-logging
- osh-infra-monitoring
- osh-infra-mariadb
- osh-infra-dashboards
- openstack-ingress-controller
- openstack-ceph-config
- openstack-mariadb
- openstack-memcached
- openstack-keystone
- openstack-radosgw
- openstack-glance
- openstack-cinder
- openstack-compute-kit
- openstack-heat
- osh-infra-prometheus-openstack-exporter
- openstack-horizon
...