Merge remote-tracking branch starlingx/master into HEAD
Change-Id: I000b28bf01976e7c44e06ddb661d9c526a10298c Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Scott Little
commit
6f44da454d
|
|
@ -1,3 +1,3 @@
|
|||
SRC_DIR="stx-openstack-helm"
|
||||
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd $PKG_BASE/../../../helm-charts/ceph-pools-audit"
|
||||
TIS_PATCH_VER=5
|
||||
TIS_PATCH_VER=6
|
||||
|
|
|
|||
|
|
@ -1084,6 +1084,11 @@ data:
|
|||
component: test
|
||||
values:
|
||||
conf:
|
||||
gnocchi:
|
||||
indexer:
|
||||
driver: mariadb
|
||||
keystone_authtoken:
|
||||
interface: internal
|
||||
apache: |
|
||||
Listen 0.0.0.0:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
|
||||
|
|
@ -1145,11 +1150,6 @@ data:
|
|||
anti:
|
||||
type:
|
||||
default: requiredDuringSchedulingIgnoredDuringExecution
|
||||
gnocchi:
|
||||
indexer:
|
||||
driver: mariadb
|
||||
keystone_authtoken:
|
||||
interface: internal
|
||||
dependencies:
|
||||
static:
|
||||
db_sync:
|
||||
|
|
@ -1775,9 +1775,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
|
||||
|
||||
|
|
|
|||
|
|
@ -1084,6 +1084,11 @@ data:
|
|||
component: test
|
||||
values:
|
||||
conf:
|
||||
gnocchi:
|
||||
indexer:
|
||||
driver: mariadb
|
||||
keystone_authtoken:
|
||||
interface: internal
|
||||
apache: |
|
||||
Listen 0.0.0.0:{{ tuple "metric" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
|
||||
|
||||
|
|
@ -1145,11 +1150,6 @@ data:
|
|||
anti:
|
||||
type:
|
||||
default: requiredDuringSchedulingIgnoredDuringExecution
|
||||
gnocchi:
|
||||
indexer:
|
||||
driver: mariadb
|
||||
keystone_authtoken:
|
||||
interface: internal
|
||||
dependencies:
|
||||
static:
|
||||
db_sync:
|
||||
|
|
@ -1775,9 +1775,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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
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
|
||||
#
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue