diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8ece565bf5cf6bf86dd1e38d1ea3140cbb14f37..108f72a6570c2f9f9dcb6dcdd1fac03279bb5c3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,18 +40,20 @@ deploy_ood_proxy_node: - openstack image set --accept $PROXY_OOD_IMAGE_ID - FAILED=false - | - cat > user_data.txt << + cat > user_data.txt <<EOF + #!/bin/bash echo "$DEV_KEY" >> /root/.ssh/authorized_keys + EOF - | - export NEW_INSTANCE_ID=$(openstack server create - -c id -f value --image $PROXY_OOD_IMAGE_ID - --network $OOD_PROXY_NETWORK - --security-group ood-https-ports - --security-group node-exporter - --security-group allow-ssh - --user-data user_data.txt - --flavor $INSTANCE_FLAVOR - --wait + export NEW_INSTANCE_ID=$(openstack server create \ + -c id -f value --image $PROXY_OOD_IMAGE_ID \ + --network $OOD_PROXY_NETWORK \ + --security-group ood-https-ports \ + --security-group node-exporter \ + --security-group allow-ssh \ + --user-data user_data.txt \ + --flavor $INSTANCE_FLAVOR \ + --wait \ $OOD_PROXY_INSTANCE_NAME) - openstack server add floating ip $OOD_PROXY_INSTANCE_NAME $FLOATING_IP rules: @@ -72,18 +74,20 @@ deploy_ssh_proxy_node: - openstack image set --accept $PROXY_SSH_IMAGE_ID - FAILED=false - | - cat > user_data.txt << + cat > user_data.txt <<EOF + #!/bin/bash echo "$DEV_KEY" >> /root/.ssh/authorized_keys + EOF - | - export NEW_INSTANCE_ID=$(openstack server create - -c id -f value --image $PROXY_SSH_IMAGE_ID - --network $OOD_PROXY_NETWORK - --security-group ood-https-ports - --security-group node-exporter - --security-group allow-ssh - --user-data user_data.txt - --flavor $INSTANCE_FLAVOR - --wait + export NEW_INSTANCE_ID=$(openstack server create \ + -c id -f value --image $PROXY_SSH_IMAGE_ID \ + --network $OOD_PROXY_NETWORK \ + --security-group ood-https-ports \ + --security-group node-exporter \ + --security-group allow-ssh \ + --user-data user_data.txt \ + --flavor $INSTANCE_FLAVOR \ + --wait \ $SSH_PROXY_INSTANCE_NAME) - openstack server add floating ip $SSH_PROXY_INSTANCE_NAME $FLOATING_IP rules: