airship
/
promenade
Code Issues Proposed changes

Updating HTK commit ID for etcd backup/restore 

Include fix [0] return code when remote rgw fails.
Moving set -x in backup/restore.tpl below the source
of the framework code to reduce debug output.

[0] https://review.opendev.org/#/c/738665/

Change-Id: If9b7b317dff439ecb293d9837cac256884c53c6a
This commit is contained in:
anthony.bellino 2020-07-08 17:37:54 +00:00
parent ec1b75ebea
commit cb4ae15eb1
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/etcd/templates/bin/_etcdbackup.tpl
View File

@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/}}
set -x
BACKUP_DIR={{ .Values.backup.host_backup_path }}
BACKUP_LOG={{ .Values.backup.backup_log_file | quote }}
NUM_TO_KEEP={{ .Values.backup.no_backup_keep | quote }}
@ -33,6 +33,7 @@ export REMOTE_DAYS_TO_KEEP=$REMOTE_BACKUP_DAYS_TO_KEEP
export ARCHIVE_DIR=${BACKUP_DIR}/db/${DB_NAMESPACE}/${DB_NAME}/archive
dump_databases_to_directory() {
set -x
TMP_DIR=$1
LOG_FILE=${2:-BACKUP_LOG}

3
charts/etcd/templates/bin/_etcdrestore.tpl
View File

@ -11,7 +11,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
set -x
# Capture the user's command line arguments
ARGS=("$@")
@ -38,6 +38,7 @@ get_databases() {
}
restore_single_db() {
set -x
SINGLE_DB_NAME=$1
TMP_DIR=$2
ANCHOR_POD=$SINGLE_DB_NAME

4
examples/basic/armada-resources.yaml
View File

@ -112,7 +112,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1
@ -136,7 +136,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1

4
examples/complete/armada-resources.yaml
View File

@ -153,7 +153,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1
@ -178,7 +178,7 @@ data:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1

4
examples/containerd/armada-resources.yaml
View File

@ -112,7 +112,7 @@ data:
type: git
location: https://opendev.org/openstack/openstack-helm-infra.git
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1
@ -136,7 +136,7 @@ data:
type: git
location: https://opendev.org/openstack/openstack-helm-infra.git
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1

4
examples/gate/armada-resources.yaml
View File

@ -112,7 +112,7 @@ data:
type: git
location: https://opendev.org/openstack/openstack-helm-infra.git
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1
@ -136,7 +136,7 @@ data:
type: git
location: https://opendev.org/openstack/openstack-helm-infra.git
subpath: helm-toolkit
reference: 1da7a5b0f8b66f2012e664de4ee7240627385210
reference: 1508324ce7f683da93c5344343e3da031fac816d
dependencies: []
---
schema: armada/Chart/v1

2
tools/helm_tk.sh
View File

@ -20,7 +20,7 @@ HELM=${1}
HELM_PIDFILE=${2}
SERVE_DIR=$(mktemp -d)
HTK_STABLE_COMMIT=${HTK_COMMIT:-"1da7a5b0f8b66f2012e664de4ee7240627385210"}
HTK_STABLE_COMMIT=${HTK_COMMIT:-"1508324ce7f683da93c5344343e3da031fac816d"}
${HELM} init --client-only