cell0's should be deleted only when cell0 is enabled

cell0's should be deleted only when cell0 is enabled

Change-Id: I74865eff1e49a61d63bb08e8a4d12f7e75e4521f
This commit is contained in:
Serguei Bezverkhi 2017-05-28 07:31:11 -04:00
parent 796cbc4d94
commit 13f2656473
6 changed files with 17 additions and 6 deletions

View File

@ -8,6 +8,7 @@ dependencies:
- name: nova-cell0-delete-db-job
repository: file://../../microservice/nova-cell0-delete-db-job
version: 0.7.0-1
condition: global.kolla.nova.all.cell_enabled
- name: nova-delete-keystone-service-job
repository: file://../../microservice/nova-delete-keystone-service-job
version: 0.7.0-1

View File

@ -3,6 +3,9 @@ global:
all:
kubernetes_entrypoint: true
nova:
all:
placement_api_enabled: true
cell_enabled: true
delete_db:
job:
dependencies:

View File

@ -2,6 +2,8 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
VERSION=0.7.0-1
function delete_and_cleanup {
### Removing previous deployment
@ -9,7 +11,7 @@ helm ls | grep $1 | awk {'print $1'} | xargs helm delete --purge
$DIR/tools/wait_for_pods_termination.sh kolla
### Cleaning service leftovers
helm install kolla/$1-cleanup --namespace=kolla --name $1-cleanup
helm install kolla/$1-cleanup --namespace kolla --name $1-cleanup --version $VERSION
$DIR/tools/wait_for_pods.sh kolla
### Checking for leftovers

View File

@ -1,4 +1,4 @@
HELM_VERSION="2.3.0"
HELM_VERSION="2.4.2"
HELM_TEMPLATE_URL="https://github.com/technosophos/helm-template/releases/download/2.2.2%2B1/helm-template-linux-2.2.2.1.tgz"
HELM_URL="http://storage.googleapis.com/kubernetes-helm/helm-v$HELM_VERSION-linux-amd64.tar.gz"

View File

@ -16,11 +16,12 @@ if [ "x$PIPELINE" == "xperiodic" ]; then
fi
case "$BRANCH" in
"3" )
"3" )
sed -i 's/2\.0\.2/3.0.2/g' helm/all_values.yaml
sed -i 's/2\.0\.2/3.0.2/g' tests/conf/ceph-all-in-one/kolla_config
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-control/values.yaml
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-compute/values.yaml
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-cleanup/values.yaml
;;
"4" )
sed -i 's/2\.0\.2/4.0.0/g' helm/all_values.yaml
@ -30,10 +31,10 @@ case "$BRANCH" in
echo Version: $BRANCH is not implemented yet.
exit 1
;;
"*" )
echo Still on 2.0.0 images
"2" )
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-control/values.yaml
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-compute/values.yaml
sed -i 's/cell_enabled.*/cell_enabled: false/g' helm/service/nova-cleanup/values.yaml
;;
esac

View File

@ -13,7 +13,11 @@ repo_gpgcheck=1
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg
https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOEF
yum install -y docker kubeadm kubelet kubectl kubernetes-cni ebtables
#
# NOTE(sbezverk) docker-1.12.6-28.git1398f24.el7.centos.x86_64 breaks several gate jobs.
# Version pinning needs to be removed after docker fixes it.
#
yum install -y docker-1.12.6-16.el7.centos kubeadm kubelet kubectl kubernetes-cni ebtables
sed -i 's/10.96.0.10/172.16.128.10/g' /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
EOF
else