starlingx
/
config
Code Issues Proposed changes

Move cinder static config to Armada manifest 

Move cinder static configuration from the overrides to the Armada
manifest.

Story: 2003909
Task:  29419

Change-Id: I5e213eb4dff5c3e1f2ef1edd588e60fb11501125
Signed-off-by: Kristine Bujold <kristine.bujold@windriver.com>
This commit is contained in:
Kristine Bujold 2019-02-08 16:40:00 -05:00
parent 0a79f57d80
commit ed58a22e03
4 changed files with 4 additions and 4 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=2
TIS_PATCH_VER=3

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

@ -451,6 +451,7 @@ data:
cinder:
DEFAULT:
backup_driver: cinder.backup.drivers.swift
storage: rbd
source:
type: tar
location: http://172.17.0.1/helm_charts/cinder-0.1.0.tgz

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

@ -1,2 +1,2 @@
SRC_DIR="sysinv"
TIS_PATCH_VER=298
TIS_PATCH_VER=299

3
sysinv/sysinv/sysinv/sysinv/helm/cinder.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
#
@ -41,7 +41,6 @@ class CinderHelm(openstack.OpenstackBaseHelm):
'ceph': self._get_conf_ceph_overrides(),
'backends': self._get_conf_backends_overrides(),
},
'storage': 'rbd',
'endpoints': self._get_endpoints_overrides(),
}
}