starlingx/config
Code Issues Proposed changes

Updates to the existing Ingress overrides

Browse Source 
For integration purposes, set the replicas based on the number of
controllers present in the install base.

Change-Id: I75ed25ecc886ae9796047cdfe7a7883800f0f60c
Story: 2003909
Task: 27086
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2018-10-10 23:13:36 -04:00 committed by Bob Church
parent 8cea1aef3d
commit 9a707a3402
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sysinv/sysinv/sysinv/sysinv/helm/ingress.py
View File

@ -8,12 +8,12 @@ from sysinv.common import constants
from sysinv.common import exception from sysinv.common import exception
from sysinv.openstack.common import log as logging from sysinv.openstack.common import log as logging
from . import common from . import common
from . import openstack from . import base
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class IngressHelm(openstack.OpenstackBaseHelm): class IngressHelm(base.BaseHelm):
"""Class to encapsulate helm operations for the ingress chart""" """Class to encapsulate helm operations for the ingress chart"""
CHART = constants.HELM_CHART_INGRESS CHART = constants.HELM_CHART_INGRESS
@ -29,6 +29,11 @@ class IngressHelm(openstack.OpenstackBaseHelm):
# Currently have conflicts with ports 80 and 8080, use 8081 for now # Currently have conflicts with ports 80 and 8080, use 8081 for now
overrides = { overrides = {
common.HELM_NS_KUBE_SYSTEM: { common.HELM_NS_KUBE_SYSTEM: {
'pod': {
'replicas': {
'error_page': self._num_controllers()
}
},
'deployment': { 'deployment': {
'mode': 'cluster', 'mode': 'cluster',
'type': 'DaemonSet' 'type': 'DaemonSet'
@ -47,6 +52,12 @@ class IngressHelm(openstack.OpenstackBaseHelm):
} }
}, },
common.HELM_NS_OPENSTACK: { common.HELM_NS_OPENSTACK: {
'pod': {
'replicas': {
'ingress': self._num_controllers(),
'error_page': self._num_controllers()
}
}
} }
} }