diff options
| -rwxr-xr-x | ci/deploy/deploy.sh | 24 | ||||
| -rwxr-xr-x | ci/kolla-build-vm.sh | 13 | ||||
| -rwxr-xr-x | ci/kolla-build.sh | 16 |
3 files changed, 37 insertions, 16 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 4ea87b6b..ff74061e 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -118,7 +118,7 @@ do esac done -SECURELABDIR=${SECURELABDIR:-${WORKSPACE}/securedlab} +SECURELABDIR=${SECURELABDIR:-${WORKSPACE}/pharos} if [[ ! "$SECURELABDIR" = /* ]] || [ -z $LAB_NAME ] || [ -z $POD_NAME ] ; then echo """Please check @@ -184,14 +184,20 @@ BMDEPLOY_DAISY_SERVER_VM=$WORKSPACE/templates/physical_environment/vms/daisy.xml function update_dha_by_pdf() { local pdf_yaml=labs/$LAB_NAME/${POD_NAME}.yaml - local jinja2_template=installers/daisy/pod_config.yaml.j2 - local generate_config=utils/generate_config.py - if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${jinja2_template} ]; then + local pod_template=config/installers/daisy/pod_config.yaml.j2 + local generate_config=config/utils/generate_config.py + if [[ $DEPLOY_SCENARIO =~ (dpdk) ]]; then + local network_template=config/installers/daisy/network-dpdk.yaml.j2 + else + local network_template=config/installers/daisy/network.yaml.j2 + fi + if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${pod_template} ] || [ ! -f ${network_template} ] ; then + echo "Template files donot exist in ${SECURELABDIR}." return fi local tmpfile=$(mktemp XXXXXXXX.yml) - python ${generate_config} -j ${jinja2_template} -y ${pdf_yaml} > ${tmpfile} + python ${generate_config} -j ${pod_template} -y ${pdf_yaml} > ${tmpfile} if [ $? -ne 0 ]; then echo "Cannot generate config from POD Descriptor File, use original deploy.yml !" return @@ -207,6 +213,14 @@ function update_dha_by_pdf() fi cp ${tmpfile} ${DHA_CONF} echo "====== Update deploy.yml from POD Descriptor File ======" + + python ${generate_config} -j ${network_template} -y ${pdf_yaml} > ${tmpfile} + if [ $? -ne 0 ]; then + echo "Cannot generate network configuration from PDF and IDF!" + return + fi + cp ${tmpfile} ${NETWORK_CONF} + echo "====== Update $(basename ${NETWORK_CONF}) from POD Descriptor File ======" rm -f $tmpfile } diff --git a/ci/kolla-build-vm.sh b/ci/kolla-build-vm.sh index 63117242..011537ad 100755 --- a/ci/kolla-build-vm.sh +++ b/ci/kolla-build-vm.sh @@ -20,7 +20,12 @@ KOLLA_TAG= EXT_TAG= KOLLA_GIT_VERSION= KOLLA_IMAGE_VERSION= -WORK_DIR=/tmp + +SCRIPT_PATH=$(readlink -f $(dirname $0)) +WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd) + +WORK_DIR=$WORKSPACE + REGISTRY_SERVER_NAME=daisy-registry function usage @@ -45,7 +50,7 @@ sudo `basename $0` -l https://git.openstack.org/openstack/kolla -j daisy-docker-build-euphrates -t 4.0.2 -e .1 - -w /tmp + -w /path/to/the/working/dir xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx EOF } @@ -220,8 +225,8 @@ function cleanup_kolla_image { function start_registry_server { echo "Starting registry server" sudo docker run -d -p 5000:5000 --restart=always \ - -e REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/tmp/registry \ - -v $REGISTRY_VOLUME_DIR:/tmp/registry \ + -e REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY=/home/registry \ + -v $REGISTRY_VOLUME_DIR:/home/registry \ --name $REGISTRY_SERVER_NAME registry:2 } diff --git a/ci/kolla-build.sh b/ci/kolla-build.sh index 44b1c038..cca98db5 100755 --- a/ci/kolla-build.sh +++ b/ci/kolla-build.sh @@ -31,7 +31,10 @@ error_trap() exit $exitcode } -WORK_DIR=/tmp +SCRIPT_PATH=$(readlink -f $(dirname $0)) +WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd) + +WORK_DIR=$WORKSPACE while getopts "l:b:j:t:e:w:h" OPTION do #Only get what we need @@ -46,8 +49,6 @@ BUILD_OUTPUT_DIR=$WORK_DIR/kolla-build-output ############Builder VM operations################ -SCRIPT_PATH=$(readlink -f $(dirname $0)) -WORKSPACE=$(cd ${SCRIPT_PATH}/..; pwd) DEPLOY_PATH=$WORKSPACE/deploy # VM configurations @@ -64,7 +65,7 @@ PARAS_IMAGE=${PARAS_FROM_DEPLOY#* * * } # qcow2 image modifier location CREATE_QCOW2_PATH=$WORKSPACE/tools # temp storage for qcow2 image modifier -IMWORKDIR=${IMWORKDIR:-/tmp/workdir/daisy} +IMWORKDIR=${IMWORKDIR:-$WORKSPACE/img} # set extra ssh paramters SSH_PARAS="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" @@ -129,15 +130,16 @@ function build_kolla_image_in_daisy_vm() ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/ci/kolla-build-vm.sh $VM_PARAMS" rc=$? if [ $rc -ne 0 ]; then - echo "daisy install failed" + echo "image build failed" exit 1 else - echo "daisy install successfully" + echo "image build successfully" fi rm -rf $BUILD_OUTPUT_DIR - mkdir -p $BUILD_OUTPUT_DIR scp -r root@$DAISY_IP:$BUILD_OUTPUT_DIR $WORK_DIR + realuser=$(who am i | awk '{print $1}') + chown -R $realuser:$realuser $WORK_DIR } trap "error_trap" EXIT SIGTERM |