diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d209cdc20aa1f3827cf620d1520b5ec2758d7461..107b611b8cd57473e4ca76841d9b757c51363cf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -148,16 +148,23 @@ deploy_http_proxy_node: cat > user_data.txt <<EOF #!/bin/bash echo "$DEV_KEY" >> /root/.ssh/authorized_keys + ip route replace default via ${DEFAULT_GATEWAY_IP} dev eth0 git clone ${CI_REPOSITORY_URL} /tmp/${CI_PROJECT_NAME} cd /tmp/${CI_PROJECT_NAME} git checkout ${CI_COMMIT_REF_NAME} 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 + --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 @@ -189,16 +196,23 @@ deploy_ssh_proxy_node: cat > user_data.txt <<EOF #!/bin/bash echo "$DEV_KEY" >> /root/.ssh/authorized_keys + ip route replace default via ${DEFAULT_GATEWAY_IP} dev eth0 git clone ${CI_REPOSITORY_URL} /tmp/${CI_PROJECT_NAME} cd /tmp/${CI_PROJECT_NAME} git checkout ${CI_COMMIT_REF_NAME} 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 + --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