Browse Source

Fixes related to recent version uplifts

- Revert buggy nagios version (storage leak)
 - Pull latest/fixed version of armada/tiller
 - Fix external network overrides for Neutron/OVS

Change-Id: Id76c0e6f643928564c8418c59a5517ab0f7ce43b
changes/94/611994/8
Kaspars Skels 3 years ago
parent
commit
bd84989801
  1. 12
      global/software/charts/osh/openstack-compute-kit/neutron.yaml
  2. 13
      global/software/charts/osh/openstack-compute-kit/openvswitch.yaml
  3. 10
      global/software/config/versions.yaml
  4. 2
      tools/files/heat-public-net-deployment.yaml

12
global/software/charts/osh/openstack-compute-kit/neutron.yaml

@ -183,7 +183,7 @@ metadata:
name: common-addresses
path: .neutron.external_iface
dest:
path: .values.network.interface.external
path: .values.network.auto_bridge_add.br-ex
pattern: 'EXTERNAL_INTERFACE'
data:
@ -234,9 +234,10 @@ data:
node_selector_key: openstack-control-plane
node_selector_value: enabled
network:
auto_bridge_add:
br-ex: 'EXTERNAL_INTERFACE'
interface:
tunnel: 'TUNNEL_DEVICE'
external: 'EXTERNAL_INTERFACE'
conf:
logging:
loggers:
@ -322,12 +323,7 @@ data:
type_drivers: vlan,flat,vxlan
tenant_network_types: vxlan
ml2_type_vlan:
network_vlan_ranges: bond0
openvswitch_agent:
agent:
tunnel_types: vxlan
ovs:
bridge_mappings: bond0:br-bond0
network_vlan_ranges: external
dependencies:
- osh-helm-toolkit
...

13
global/software/charts/osh/openstack-compute-kit/openvswitch.yaml

@ -24,15 +24,6 @@ metadata:
path: .images.osh.openvswitch
dest:
path: .values.images.tags
# External Interface
# kskels fixme: Fix proper override for external bridge
# - src:
# schema: pegleg/CommonAddresses/v1
# name: common-addresses
# path: .openvswitch.external_iface
# dest:
# path: .values.network.interface.external
# pattern: 'EXTERNAL_INTERFACE'
data:
chart_name: openvswitch
release: openvswitch
@ -55,10 +46,6 @@ data:
ovs:
node_selector_key: openvswitch
node_selector_value: enabled
network:
auto_bridge_add:
# kskels fixme: set external bridge properly
br-bond0: bond0
dependencies:
- osh-helm-toolkit
...

10
global/software/config/versions.yaml

@ -207,7 +207,7 @@ data:
type: git
nagios:
location: https://git.openstack.org/openstack/openstack-helm-infra
reference: 27ea2a53a69d8c2820e2f4343c47ca093270392b
reference: 922d7d3d26b15d1d25e40ba1528337002ae15b0c
subpath: nagios
type: git
prometheus:
@ -238,7 +238,7 @@ data:
ucp:
armada:
location: https://git.openstack.org/openstack/airship-armada
reference: e1179a8ba8f2136037200d77cc7ade2dd1b5cafe
reference: 8666342f8ad96203ada8233ba7225a73f603d22d
subpath: charts/armada
type: git
armada-htk:
@ -438,7 +438,7 @@ data:
type: git
tiller:
location: https://git.openstack.org/openstack/airship-armada
reference: e1179a8ba8f2136037200d77cc7ade2dd1b5cafe
reference: 8666342f8ad96203ada8233ba7225a73f603d22d
subpath: charts/tiller
type: git
tiller-htk:
@ -689,7 +689,7 @@ data:
apache_proxy: docker.io/httpd:2.4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
image_repo_sync: docker.io/docker:17.07.0
nagios: quay.io/attcomdev/nagios:98ca738ce770b375b2bcffe1267969d7c3709893
nagios: quay.io/attcomdev/nagios:46d4812f74a7cfc1f57fa9fffbc808facfc1bec1
prometheus:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
helm_tests: docker.io/openstackhelm/heat:ocata
@ -716,7 +716,7 @@ data:
prometheus_openstack_exporter: quay.io/attcomdev/prometheus-openstack-exporter:bcce8711f24137d6b9018aa5f780c111784e6d65
ucp:
armada:
api: quay.io/airshipit/armada:e1179a8ba8f2136037200d77cc7ade2dd1b5cafe
api: quay.io/airshipit/armada:8666342f8ad96203ada8233ba7225a73f603d22d
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
image_repo_sync: docker.io/docker:17.07.0

2
tools/files/heat-public-net-deployment.yaml

@ -11,7 +11,7 @@ parameters:
physical_network_interface:
type: string
default: bond0
default: external
physical_network_vlan:
type: string

Loading…
Cancel
Save