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:
parent
5442d321d1
commit
c611917a0d
|
@ -1,3 +1,3 @@
|
||||||
SRC_DIR="stx-openstack-helm"
|
SRC_DIR="stx-openstack-helm"
|
||||||
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
|
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd"
|
||||||
TIS_PATCH_VER=5
|
TIS_PATCH_VER=6
|
||||||
|
|
|
@ -1872,9 +1872,39 @@ data:
|
||||||
labels:
|
labels:
|
||||||
release_group: osh-openstack-horizon
|
release_group: osh-openstack-horizon
|
||||||
values:
|
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:
|
conf:
|
||||||
horizon:
|
horizon:
|
||||||
local_settings:
|
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: |
|
template: |
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
|
@ -1872,9 +1872,39 @@ data:
|
||||||
labels:
|
labels:
|
||||||
release_group: osh-openstack-horizon
|
release_group: osh-openstack-horizon
|
||||||
values:
|
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:
|
conf:
|
||||||
horizon:
|
horizon:
|
||||||
local_settings:
|
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: |
|
template: |
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,2 @@
|
||||||
SRC_DIR="sysinv"
|
SRC_DIR="sysinv"
|
||||||
TIS_PATCH_VER=304
|
TIS_PATCH_VER=305
|
||||||
|
|
|
@ -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
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
@ -24,12 +24,6 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
|
||||||
overrides = {
|
overrides = {
|
||||||
common.HELM_NS_OPENSTACK: {
|
common.HELM_NS_OPENSTACK: {
|
||||||
'images': self._get_images_overrides(),
|
'images': self._get_images_overrides(),
|
||||||
'network': {
|
|
||||||
'node_port': {
|
|
||||||
'enabled': 'true',
|
|
||||||
'port': 31000
|
|
||||||
}
|
|
||||||
},
|
|
||||||
'conf': {
|
'conf': {
|
||||||
'horizon': {
|
'horizon': {
|
||||||
'local_settings': {
|
'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()
|
'endpoints': self._get_endpoints_overrides()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -92,28 +65,13 @@ class HorizonHelm(openstack.OpenstackBaseHelm):
|
||||||
|
|
||||||
def _get_local_settings_config_overrides(self):
|
def _get_local_settings_config_overrides(self):
|
||||||
local_settings_config = {
|
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(
|
'horizon_secret_key': self._get_or_generate_password(
|
||||||
self.SERVICE_NAME, common.HELM_NS_OPENSTACK,
|
self.SERVICE_NAME, common.HELM_NS_OPENSTACK,
|
||||||
'horizon_secret_key'),
|
'horizon_secret_key'),
|
||||||
|
|
||||||
# Optional Services
|
'system_region_name': self._region_name()
|
||||||
'enable_murano': 'False',
|
|
||||||
'enable_magnum': 'False',
|
|
||||||
|
|
||||||
# Turn off domain support as we aren't using it
|
|
||||||
'keystone_multidomain_support': 'False',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
local_settings_config.update({'system_region_name': self._region_name()})
|
|
||||||
|
|
||||||
# Basic region config additions
|
# Basic region config additions
|
||||||
if self._region_config():
|
if self._region_config():
|
||||||
openstack_host = 'controller' # TODO(tsmith) must evaluate region functionality
|
openstack_host = 'controller' # TODO(tsmith) must evaluate region functionality
|
||||||
|
|
Loading…
Reference in New Issue