diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d178eed6f1efff3235167ba4287ca0b68bf85830..d3549bf5573639587cbeb529739cae5e1275b5d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,14 +27,14 @@ workflow: - if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "schedule" -deploy_ood_proxy_node: +deploy_http_proxy_node: stage: deploy environment: name: knightly tags: - build script: - - openstack image set --accept $PROXY_OOD_IMAGE_ID + - openstack image set --accept $HTTP_PROXY_IMAGE_ID - FAILED=false - | cat > user_data.txt <<EOF @@ -42,8 +42,8 @@ deploy_ood_proxy_node: echo "$DEV_KEY" >> /root/.ssh/authorized_keys EOF - > - export PROXY_OOD_INSTANCE_ID=$(openstack server create - -c id -f value --image $PROXY_OOD_IMAGE_ID + export HTTP_PROXY_INSTANCE_ID=$(openstack server create + -c id -f value --image $HTTP_PROXY_IMAGE_ID --network $OOD_PROXY_NETWORK --security-group https-port --security-group http-port @@ -51,13 +51,13 @@ deploy_ood_proxy_node: --user-data user_data.txt --flavor $INSTANCE_FLAVOR --wait - $OOD_PROXY_INSTANCE_NAME) - # Create and assign a floating IP - PROXY_OOD_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) - echo "Created FLOATING_IP: $PROXY_OOD_FLOATING_IP" - # Associate the floating IP with the ood proxy instance - openstack server add floating ip $PROXY_OOD_INSTANCE_ID $PROXY_OOD_FLOATING_IP - echo "Associated FLOATING_IP $PROXY_OOD_FLOATING_IP with PROXY_OOD_INSTANCE_ID $PROXY_OOD_INSTANCE_ID" + $HTTP_PROXY_INSTANCE_NAME) + # Create and assign a floating IP to the HTTP Proxy instance + HTTP_PROXY_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) + echo "Created FLOATING_IP: $HTTP_PROXY_FLOATING_IP" + # Associate the floating IP with the HTTP Proxy instance + openstack server add floating ip $HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_FLOATING_IP + echo "Associated FLOATING_IP $HTTP_PROXY_FLOATING_IP with HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_INSTANCE_ID" rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: always @@ -71,7 +71,7 @@ deploy_ssh_proxy_node: tags: - build script: - - openstack image set --accept $PROXY_SSH_IMAGE_ID + - openstack image set --accept $SSH_PROXY_IMAGE_ID - FAILED=false - | cat > user_data.txt <<EOF @@ -79,22 +79,22 @@ deploy_ssh_proxy_node: echo "$DEV_KEY" >> /root/.ssh/authorized_keys EOF - > - export PROXY_SSH_INSTANCE_ID=$(openstack server create - -c id -f value --image $PROXY_SSH_IMAGE_ID + export SSH_PROXY_INSTANCE_ID=$(openstack server create + -c id -f value --image $SSH_PROXY_IMAGE_ID --network $OOD_PROXY_NETWORK --security-group allow-ssh --user-data user_data.txt --flavor $INSTANCE_FLAVOR --wait $SSH_PROXY_INSTANCE_NAME) - # Create and assign a proxy ssh floating IP - PROXY_SSH_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) - echo "Created PROXY_SSH_FLOATING_IP: $PROXY_SSH_FLOATING_IP" - # Associate the floating IP with the ssh proxy instance - openstack server add floating ip $PROXY_SSH_INSTANCE_ID $PROXY_SSH_FLOATING_IP - echo "Associated FLOATING_IP $PROXY_SSH_FLOATING_IP with PROXY_SSH_INSTANCE_ID $PROXY_SSH_INSTANCE_ID" + # Create and assign a floating IP to the SSH Proxy instance + SSH_PROXY_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) + echo "Created SSH_PROXY_FLOATING_IP: $SSH_PROXY_FLOATING_IP" + # Associate the floating IP with the SSH Proxy instance + openstack server add floating ip $SSH_PROXY_INSTANCE_ID $SSH_PROXY_FLOATING_IP + echo "Associated FLOATING_IP $SSH_PROXY_FLOATING_IP with SSH_PROXY_INSTANCE_ID $SSH_PROXY_INSTANCE_ID" rules: - if: $CI_PIPELINE_SOURCE == "schedule" when: always - if: $CI_PIPELINE_SOURCE == "web" - when: always + when: always \ No newline at end of file