Skip to content
Snippets Groups Projects
Commit 969227df authored by Krish Moodbidri's avatar Krish Moodbidri
Browse files

rename variables for consistency in proxy deployment

parent 543c233d
No related branches found
No related tags found
2 merge requests!117This MR merges the feat-hpc-factory branch, which was focused on building and deploying proxy images for the COD cluster.,!101Refactor CI/CD pipeline to include workflow rules and retain only deploy jobs
...@@ -27,14 +27,14 @@ workflow: ...@@ -27,14 +27,14 @@ workflow:
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
deploy_ood_proxy_node: deploy_http_proxy_node:
stage: deploy stage: deploy
environment: environment:
name: knightly name: knightly
tags: tags:
- build - build
script: script:
- openstack image set --accept $PROXY_OOD_IMAGE_ID - openstack image set --accept $HTTP_PROXY_IMAGE_ID
- FAILED=false - FAILED=false
- | - |
cat > user_data.txt <<EOF cat > user_data.txt <<EOF
...@@ -42,8 +42,8 @@ deploy_ood_proxy_node: ...@@ -42,8 +42,8 @@ deploy_ood_proxy_node:
echo "$DEV_KEY" >> /root/.ssh/authorized_keys echo "$DEV_KEY" >> /root/.ssh/authorized_keys
EOF EOF
- > - >
export PROXY_OOD_INSTANCE_ID=$(openstack server create export HTTP_PROXY_INSTANCE_ID=$(openstack server create
-c id -f value --image $PROXY_OOD_IMAGE_ID -c id -f value --image $HTTP_PROXY_IMAGE_ID
--network $OOD_PROXY_NETWORK --network $OOD_PROXY_NETWORK
--security-group https-port --security-group https-port
--security-group http-port --security-group http-port
...@@ -51,13 +51,13 @@ deploy_ood_proxy_node: ...@@ -51,13 +51,13 @@ deploy_ood_proxy_node:
--user-data user_data.txt --user-data user_data.txt
--flavor $INSTANCE_FLAVOR --flavor $INSTANCE_FLAVOR
--wait --wait
$OOD_PROXY_INSTANCE_NAME) $HTTP_PROXY_INSTANCE_NAME)
# Create and assign a floating IP # Create and assign a floating IP to the HTTP Proxy instance
PROXY_OOD_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) HTTP_PROXY_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" echo "Created FLOATING_IP: $HTTP_PROXY_FLOATING_IP"
# Associate the floating IP with the ood proxy instance # Associate the floating IP with the HTTP Proxy instance
openstack server add floating ip $PROXY_OOD_INSTANCE_ID $PROXY_OOD_FLOATING_IP openstack server add floating ip $HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_FLOATING_IP
echo "Associated FLOATING_IP $PROXY_OOD_FLOATING_IP with PROXY_OOD_INSTANCE_ID $PROXY_OOD_INSTANCE_ID" echo "Associated FLOATING_IP $HTTP_PROXY_FLOATING_IP with HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_INSTANCE_ID"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
when: always when: always
...@@ -71,7 +71,7 @@ deploy_ssh_proxy_node: ...@@ -71,7 +71,7 @@ deploy_ssh_proxy_node:
tags: tags:
- build - build
script: script:
- openstack image set --accept $PROXY_SSH_IMAGE_ID - openstack image set --accept $SSH_PROXY_IMAGE_ID
- FAILED=false - FAILED=false
- | - |
cat > user_data.txt <<EOF cat > user_data.txt <<EOF
...@@ -79,22 +79,22 @@ deploy_ssh_proxy_node: ...@@ -79,22 +79,22 @@ deploy_ssh_proxy_node:
echo "$DEV_KEY" >> /root/.ssh/authorized_keys echo "$DEV_KEY" >> /root/.ssh/authorized_keys
EOF EOF
- > - >
export PROXY_SSH_INSTANCE_ID=$(openstack server create export SSH_PROXY_INSTANCE_ID=$(openstack server create
-c id -f value --image $PROXY_SSH_IMAGE_ID -c id -f value --image $SSH_PROXY_IMAGE_ID
--network $OOD_PROXY_NETWORK --network $OOD_PROXY_NETWORK
--security-group allow-ssh --security-group allow-ssh
--user-data user_data.txt --user-data user_data.txt
--flavor $INSTANCE_FLAVOR --flavor $INSTANCE_FLAVOR
--wait --wait
$SSH_PROXY_INSTANCE_NAME) $SSH_PROXY_INSTANCE_NAME)
# Create and assign a proxy ssh floating IP # Create and assign a floating IP to the SSH Proxy instance
PROXY_SSH_FLOATING_IP=$(openstack floating ip create $PKR_VAR_floating_ip_network -f value -c floating_ip_address) SSH_PROXY_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" echo "Created SSH_PROXY_FLOATING_IP: $SSH_PROXY_FLOATING_IP"
# Associate the floating IP with the ssh proxy instance # Associate the floating IP with the SSH Proxy instance
openstack server add floating ip $PROXY_SSH_INSTANCE_ID $PROXY_SSH_FLOATING_IP openstack server add floating ip $SSH_PROXY_INSTANCE_ID $SSH_PROXY_FLOATING_IP
echo "Associated FLOATING_IP $PROXY_SSH_FLOATING_IP with PROXY_SSH_INSTANCE_ID $PROXY_SSH_INSTANCE_ID" echo "Associated FLOATING_IP $SSH_PROXY_FLOATING_IP with SSH_PROXY_INSTANCE_ID $SSH_PROXY_INSTANCE_ID"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule" - if: $CI_PIPELINE_SOURCE == "schedule"
when: always when: always
- if: $CI_PIPELINE_SOURCE == "web" - if: $CI_PIPELINE_SOURCE == "web"
when: always when: always
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment