From 45a463adb37eea8a661f93eb91a7e05c1a43a78d Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 5 Sep 2016 21:02:27 +0100 Subject: [PATCH] Change default deploy artifacts container name Since we've started storing deployment plans in swift, there is a collision with this name, because the "overcloud" plan will by default get deleted when deleting a stack, which is a regression if you're a user of one of these scripts, because previously you only had to re-run them e.g if your puppet modules changed, not every deploy. Change-Id: I30e280f25173ccf388c24c20704d6fd51d5caa2a Closes-Bug: #1620384 --- scripts/upload-puppet-modules | 4 ++-- scripts/upload-swift-artifacts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upload-puppet-modules b/scripts/upload-puppet-modules index 99d92309d..2e1fc5d90 100755 --- a/scripts/upload-puppet-modules +++ b/scripts/upload-puppet-modules @@ -35,7 +35,7 @@ function show_options { echo " -h, --help -- print this help." echo " -d -- Puppet modules directory. Required." echo " -c -- Swift container to use." - echo " Default: overcloud" + echo " Default: overcloud-artifacts" echo " --environment -- Generate this heat " echo " Default: $HOME/.tripleo/environments/puppet-modules-url.yaml" echo " --seconds -- Number of seconds for temp URL." @@ -59,7 +59,7 @@ eval set -- "$TEMP" ENVIRONMENT_FILE="$HOME/.tripleo/environments/puppet-modules-url.yaml" MODULES_DIRECTORY= -CONTAINER_NAME=overcloud +CONTAINER_NAME=overcloud-artifacts SECONDS=31536000 while true ; do diff --git a/scripts/upload-swift-artifacts b/scripts/upload-swift-artifacts index 8dcab8265..8bf2bfc6b 100755 --- a/scripts/upload-swift-artifacts +++ b/scripts/upload-swift-artifacts @@ -30,7 +30,7 @@ function show_options { echo " -h, --help -- print this help." echo " -f -- File(s) to upload." echo " -c -- Swift container to use." - echo " Default: overcloud" + echo " Default: overcloud-artifacts" echo " --environment -- Generate this heat " echo " Default: $HOME/.tripleo/environments/deployment-artifacts.yaml" echo " --seconds -- Number of seconds for temp URLs." @@ -54,7 +54,7 @@ eval set -- "$TEMP" ENVIRONMENT_FILE="$HOME/.tripleo/environments/deployment-artifacts.yaml" FILES= -CONTAINER_NAME=overcloud +CONTAINER_NAME=overcloud-artifacts SECONDS=31536000 while true ; do