diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b626cd1a8e61809b5aadf41afcf2a9ed7500d1fb..5d0c81bb20d1b9652b0a3274a95b4292c013edcb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,10 +155,17 @@ deploy_http_proxy_node: ansible-playbook -c local -i 127.0.0.1, ansible/cheaha.yml | tee -a /tmp/ansible.log rm -rf /tmp/${CI_PROJECT_NAME} EOF + - > + export HTTP_PROXY_INSTANCE_PORT=$(openstack port create + -c id -f value --network $INTERNALNET + --fixed-ip subnet=$INTERNALNET_SN,ip-address=$INTERNALNET_IP + --disable-port-security + ${HTTP_PROXY_INSTANCE_NAME}_internal_port) - > export HTTP_PROXY_INSTANCE_ID=$(openstack server create -c id -f value --image $HTTP_PROXY_IMAGE_ID --network $PROXY_NETWORK + --port $HTTP_PROXY_INSTANCE_PORT --security-group webserver_sec_group --security-group allow-ssh --user-data user_data.txt @@ -196,10 +203,17 @@ deploy_ssh_proxy_node: ansible-playbook -c local -i 127.0.0.1, ansible/cheaha.yml | tee -a /tmp/ansible.log rm -rf /tmp/${CI_PROJECT_NAME} EOF + - > + export SSH_PROXY_INSTANCE_PORT=$(openstack port create + -c id -f value --network $INTERNALNET + --fixed-ip subnet=$INTERNALNET_SN,ip-address=$INTERNALNET_IP + --disable-port-security + ${SSH_PROXY_INSTANCE_NAME}_internal_port) - > export SSH_PROXY_INSTANCE_ID=$(openstack server create -c id -f value --image $SSH_PROXY_IMAGE_ID --network $PROXY_NETWORK + --port $SSH_PROXY_INSTANCE_PORT --security-group allow-ssh --user-data user_data.txt --flavor $INSTANCE_FLAVOR