starlingx
/
config
Code Issues Proposed changes

Move horizon static configs to Armada manifest 

Move all horizon static configurations from the overrides to the
Armada manifest.

This is being done so we have a consistent way of managing
containerized openstack configurations. Static configurations will
be located in the Armada manifest and dynamic configuration will be
located in the overrides files.

Story: 2003909
Task: 29635

Change-Id: I4abbc0eb158304774134e2d60f2b666c0d90bbd8
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-02-21 14:08:02 -05:00
parent 5442d321d1
commit c611917a0d
5 changed files with 64 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kubernetes/applications/stx-openstack/stx-openstack-helm/centos/build_srpm.data
View File

@ -1,3 +1,3 @@
SRC_DIR="stx-openstack-helm"
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
TIS_PATCH_VER=5
TIS_PATCH_VER=6

30
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest-no-tests.yaml
View File

@ -1872,9 +1872,39 @@ data:
labels:
release_group: osh-openstack-horizon
values:
network:
node_port:
enabled: 'true'
port: 31000
pod:
mounts:
horizon:
horizon:
# Branding directory mount
volumeMounts:
- mountPath: /opt/branding
name: horizon-branding
volumes:
- hostPath:
path: /opt/branding
type: Directory
name: horizon-branding
conf:
horizon:
local_settings:
config:
# Region Modes
ss_enabled: 'False'
dc_mode: 'False'
# Security
https_enabled: 'False'
lockout_period_sec: '300'
lockout_retries_num: '3'
# Optional Services
enable_magnum: 'False'
enable_murano: 'False'
# Turn off domain support as we aren't using
keystone_multidomain_support: 'False'
template: |
import os

30
kubernetes/applications/stx-openstack/stx-openstack-helm/stx-openstack-helm/manifests/manifest.yaml
View File

@ -1872,9 +1872,39 @@ data:
labels:
release_group: osh-openstack-horizon
values:
network:
node_port:
enabled: 'true'
port: 31000
pod:
mounts:
horizon:
horizon:
# Branding directory mount
volumeMounts:
- mountPath: /opt/branding
name: horizon-branding
volumes:
- hostPath:
path: /opt/branding
type: Directory
name: horizon-branding
conf:
horizon:
local_settings:
config:
# Region Modes
ss_enabled: 'False'
dc_mode: 'False'
# Security
https_enabled: 'False'
lockout_period_sec: '300'
lockout_retries_num: '3'
# Optional Services
enable_magnum: 'False'
enable_murano: 'False'
# Turn off domain support as we aren't using
keystone_multidomain_support: 'False'
template: |
import os

2
sysinv/sysinv/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=304
TIS_PATCH_VER=305

46
sysinv/sysinv/sysinv/sysinv/helm/horizon.py
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2018 Wind River Systems, Inc.
# Copyright (c) 2018-2019 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
@ -24,12 +24,6 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
overrides = {
common.HELM_NS_OPENSTACK: {
'images': self._get_images_overrides(),
'network': {
'node_port': {
'enabled': 'true',
'port': 31000
}
},
'conf': {
'horizon': {
'local_settings': {
@ -37,27 +31,6 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
}
}
},
'pod': {
'mounts': {
'horizon': {
'horizon': {
# Branding directory mount
'volumeMounts': [{
'name': 'horizon-branding',
'mountPath': '/opt/branding',
}],
'volumes': [{
'name': 'horizon-branding',
'hostPath':
{
'path': '/opt/branding',
'type': 'Directory'
},
}],
}
}
}
},
'endpoints': self._get_endpoints_overrides()
}
}
@ -92,28 +65,13 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
def _get_local_settings_config_overrides(self):
local_settings_config = {
# Region Modes
'ss_enabled': 'False',
'dc_mode': 'False',
# Security
'https_enabled': 'False',
'lockout_period_sec': '300',
'lockout_retries_num': '3',
'horizon_secret_key': self._get_or_generate_password(
self.SERVICE_NAME, common.HELM_NS_OPENSTACK,
'horizon_secret_key'),
# Optional Services
'enable_murano': 'False',
'enable_magnum': 'False',
# Turn off domain support as we aren't using it
'keystone_multidomain_support': 'False',
'system_region_name': self._region_name()
}
local_settings_config.update({'system_region_name': self._region_name()})
# Basic region config additions
if self._region_config():
openstack_host = 'controller' # TODO(tsmith) must evaluate region functionality