diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:34:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-01-21 18:34:06 +0000 |
| commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
| tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch | |
| parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
| parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) | |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch')
| -rw-r--r-- | patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch index 2315c5ad..48fd31db 100644 --- a/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch +++ b/patches/opnfv-fuel/upstream-backports/0005-CI-deploy-cache-Store-and-reuse-deploy-artifacts.patch @@ -63,9 +63,9 @@ index 0000000..80cd0f4 +--- a/iso/bootstrap_admin_node.sh ++++ b/iso/bootstrap_admin_node.sh +@@ -61,6 +61,8 @@ wget \ -+ + ASTUTE_YAML='/etc/fuel/astute.yaml' + BOOTSTRAP_NODE_CONFIG="/etc/fuel/bootstrap_admin_node.conf" ++ CUSTOM_REPOS="/root/default_deb_repos.yaml" ++OPNFV_CACHE_PATH="/var/cache/opnfv/bootstraps" ++OPNFV_CACHE_TAR="opnfv-bootstraps-cache.tar" + bs_build_log='/var/log/fuel-bootstrap-image-build.log' @@ -179,8 +179,7 @@ diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 5dd0263..3db4c0d 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py -@@ -24,6 +24,8 @@ from common import ( - delete, +@@ -24,5 +24,7 @@ from common import ( ) +from deploy_cache import DeployCache |