Merge "Move cinder static config to Armada manifest"
This commit is contained in:
commit
9a1f58b5b7
|
@ -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
|
|
@ -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
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SRC_DIR="sysinv"
|
||||
TIS_PATCH_VER=298
|
||||
TIS_PATCH_VER=299
|
||||
|
|
|
@ -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(),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue