diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8915b12a2764268b4e129c6c7c7332db4b1e8c6f..44e6bfab14824d1ab276848be4d73dfeade1b818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -206,12 +206,12 @@ deploy_http_proxy_node: export cmd="openstack server create" cmd+=" -c id -f value --image $HTTP_PROXY_IMAGE_ID" cmd+=" --flavor $INSTANCE_FLAVOR" - cmd+=" --network $PROXY_NETWORK" for security_group in ${SECURITY_GROUP_LIST[@]}; do cmd+=" --security-group $security_group" done cmd+=" --user-data user_data.txt" + if [ -n "$PROXY_NETWORK" ];then cmd+=" --network $PROXY_NETWORK"; fi if [ -n "$HTTP_PROXY_PORT" ];then cmd+=" --port $HTTP_PROXY_PORT"; fi cmd+=" --wait $HTTP_PROXY_INSTANCE_NAME" - export HTTP_PROXY_INSTANCE_ID=$(bash -c "$cmd") @@ -259,12 +259,12 @@ deploy_ssh_proxy_node: export cmd="openstack server create" cmd+=" -c id -f value --image $SSH_PROXY_IMAGE_ID" cmd+=" --flavor $INSTANCE_FLAVOR" - cmd+=" --network $PROXY_NETWORK" for security_group in ${SECURITY_GROUP_LIST[@]}; do cmd+=" --security-group $security_group" done cmd+=" --user-data user_data.txt" + if [ -n "$PROXY_NETWORK" ];then cmd+=" --network $PROXY_NETWORK"; fi if [ -n "$SSH_PROXY_PORT" ];then cmd+=" --port $SSH_PROXY_PORT"; fi cmd+=" --wait $SSH_PROXY_INSTANCE_NAME" - export SSH_PROXY_INSTANCE_ID=$(bash -c "$cmd") @@ -313,12 +313,12 @@ deploy_login_node: export cmd="openstack server create" cmd+=" -c id -f value --image $LOGIN_IMAGE_ID" cmd+=" --flavor $INSTANCE_FLAVOR" - cmd+=" --network $INSTANCE_NETWORK" for security_group in ${SECURITY_GROUP_LIST[@]}; do cmd+=" --security-group $security_group" done cmd+=" --user-data user_data.txt" + if [ -n "$INSTANCE_NETWORK" ];then cmd+=" --network $INSTANCE_NETWORK"; fi if [ -n "$LOGIN_PORT" ];then cmd+=" --port $LOGIN_PORT"; fi cmd+=" --wait $LOGIN_INSTANCE_NAME" - export LOGIN_INSTANCE_ID=$(bash -c "$cmd")