Draft: adding compute build and deploy

.gitlab-ci.yml

@@ -171,29 +171,6 @@ build_ssh_proxy_image:
     - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
       when: always
 
-deploy_compute_node:
-  stage: deploy
-  environment:
-    name: $ENV
-  tags:
-    - build
-  script:
-    - openstack image set --accept $BUILT_COMPUTE_IMAGE_ID || true
-    - FAILED=false
-    - |
-      cat > user_data.txt <<EOF
-      #!/bin/bash
-      cat >> /etc/NetworkManager/conf.d/90-dns-none.conf<<EEOF
-      [main]
-      dns=none
-      EEOF
-      echo "$DEV_KEY" >> /root/.ssh/authorized_keys
-      EOF
-    - |
-
-  rules:
-    - if: $PIPELINE_TARGET == "deploy"
-      when: always
 
 deploy_compute_node:
   stage: deploy
@@ -202,48 +179,23 @@ deploy_compute_node:
   tags:
     - build
   script:
-    - openstack image set --accept $HTTP_PROXY_IMAGE_ID || true
+    - openstack image set --accept $BUILT_COMPUTE_IMAGE_ID || true
     - FAILED=false
     - |
       cat > user_data.txt <<EOF
-      #!/bin/bash
-      cat >> /etc/NetworkManager/conf.d/90-dns-none.conf<<EEOF
-      [main]
-      dns=none
-      EEOF
-      systemctl reload NetworkManager
       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}
-      cat >> ansible/hosts<<EEOF
-      [$ENV]
-      127.0.0.1
-      EEOF
-      ansible-playbook -c local -i ansible/hosts --extra-vars="$EXTRA_VARS" ansible/cluster.yml | tee -a /tmp/ansible.log
-      rm -rf /tmp/${CI_PROJECT_NAME}
       EOF
     - |
       export cmd="openstack server create"
-      cmd+=" -c id -f value --image $HTTP_PROXY_IMAGE_ID"
+      cmd+=" -c id -f value --image $BUILT_COMPUTE_IMAGE_ID"
       cmd+=" --flavor $INSTANCE_FLAVOR"
-      cmd+=" --network $PROXY_NETWORK"
+      cmd+=" --network $PKR_VAR_networks"
       cmd+=" --security-group webserver_sec_group"
       cmd+=" --security-group allow-ssh"
       cmd+=" --user-data user_data.txt"
-      if [ -n "$HTTP_PROXY_PORT" ];then cmd+=" --port $HTTP_PROXY_PORT"; fi
-      cmd+=" --wait $HTTP_PROXY_INSTANCE_NAME"
-    - export HTTP_PROXY_INSTANCE_ID=$(bash -c "$cmd")
-    - |
-      # Associate the floating IP(s) with the HTTP Proxy instance
-      for HTTP_PROXY_FLOATING_IP in ${HTTP_PROXY_FLOATING_IP_LIST[@]};
-      do
-        echo "Associating FLOATING_IP $HTTP_PROXY_FLOATING_IP with HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_INSTANCE_ID"
-        openstack server add floating ip $HTTP_PROXY_INSTANCE_ID $HTTP_PROXY_FLOATING_IP
-      done
+
   rules:
-    - if: $PIPELINE_TARGET == "deploy" && $HTTP_PROXY_IMAGE_ID
+    - if: $PIPELINE_TARGET == "deploy" && $BUILT_COMPUTE_IMAGE_ID
       when: always