From ade33c21f2af1be50039620deec1d57af90691c1 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 22 Nov 2024 09:47:12 -0600
Subject: [PATCH 01/35] Update file .gitlab-ci.yml
---
.gitlab-ci.yml | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18e0edb..5a3722a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,6 +110,30 @@ workflow:
reports:
dotenv: image.env
+build_compute_image:
+ stage: build
+ needs: [build_base_image]
+ tags:
+ - build
+ script:
+ - *update_ansible_repo
+ - *get_ansible_files
+ - export PKR_VAR_source_image=${BUILT_BASE_IMAGE_ID}
+ - export REPO_HEAD=$(git rev-parse --short HEAD)
+ - export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}"
+ - export PKR_VAR_build_instance_name="compute-${REPO_HEAD}"
+ - export PKR_VAR_image_date_suffix=false
+ - |
+ if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
+ export PKR_VAR_image_name="compute-PR-${CI_MERGE_REQUEST_IID}"
+ elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
+ export PKR_VAR_image_name="compute-${BUILD_DATE}"
+ fi
+ - packer init openstack-compute
+ - packer validate openstack-compute
+ - packer build -machine-readable openstack-compute | tee compute_build.log
+
+
build_http_proxy_image:
stage: build
environment:
--
GitLab
From 07b65a0de39ebf5b3a4d8533f26e54dc0a821e3d Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Tue, 3 Dec 2024 10:32:25 -0600
Subject: [PATCH 02/35] compute node deploy
---
.gitlab-ci.yml | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5a3722a..65ebe23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -160,6 +160,42 @@ 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 $compute-${BUILD_DATE} || 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
+ - |
+
+ rules:
+ - if: $PIPELINE_TARGET == "deploy"
+ when: always
+
+
deploy_http_proxy_node:
stage: deploy
environment:
--
GitLab
From 45e3f50089563f4ba7ec5fe5b3c6a148df1ae08f Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Tue, 3 Dec 2024 14:01:36 -0600
Subject: [PATCH 03/35] fixed yaml syntax for build and added rule block
---
.gitlab-ci.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65ebe23..3de3f00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,6 +132,11 @@ build_compute_image:
- packer init openstack-compute
- packer validate openstack-compute
- packer build -machine-readable openstack-compute | tee compute_build.log
+ - |
+
+ rules:
+ - if: $PIPELINE_TARGET == "build"
+ when: always
build_http_proxy_image:
--
GitLab
From d2d3dd3a7583bcf69fde1c2bcdf570b665ff2572 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 09:16:30 -0600
Subject: [PATCH 04/35] removed needs condition from build_compute_image
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3de3f00..05c0734 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,7 +112,6 @@ workflow:
build_compute_image:
stage: build
- needs: [build_base_image]
tags:
- build
script:
--
GitLab
From c33a645861f0ebca71b2fb588c5bb8cfc9348a81 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 09:34:47 -0600
Subject: [PATCH 05/35] changed compute build structure
---
.gitlab-ci.yml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05c0734..f51049c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -117,21 +117,15 @@ build_compute_image:
script:
- *update_ansible_repo
- *get_ansible_files
- - export PKR_VAR_source_image=${BUILT_BASE_IMAGE_ID}
- - export REPO_HEAD=$(git rev-parse --short HEAD)
- export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- - export PKR_VAR_build_instance_name="compute-${REPO_HEAD}"
+ - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${COMPUTE_XCBC_HEAD}"
- export PKR_VAR_image_date_suffix=false
- |
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
- export PKR_VAR_image_name="compute-PR-${CI_MERGE_REQUEST_IID}"
+ export PKR_VAR_image_name="${BUILD_TARGET}-PR-${CI_MERGE_REQUEST_IID}"
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
- export PKR_VAR_image_name="compute-${BUILD_DATE}"
+ export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
- - packer init openstack-compute
- - packer validate openstack-compute
- - packer build -machine-readable openstack-compute | tee compute_build.log
- - |
rules:
- if: $PIPELINE_TARGET == "build"
--
GitLab
From eb244d34d35856b1dd9de9de5de2c463636863ad Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 10:08:24 -0600
Subject: [PATCH 06/35] test compute build
---
.gitlab-ci.yml | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f51049c..b336b44 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,7 +118,7 @@ build_compute_image:
- *update_ansible_repo
- *get_ansible_files
- export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${COMPUTE_XCBC_HEAD}"
+ - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${CRI_XCBC_HEAD}"
- export PKR_VAR_image_date_suffix=false
- |
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
@@ -126,7 +126,13 @@ build_compute_image:
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
-
+ # packer commands
+ - packer init openstack-compute
+ - packer validate openstack-compute
+ - packer build -machine-readable openstack-compute | tee compute_build.log
+ - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
+ - echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
+ - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
rules:
- if: $PIPELINE_TARGET == "build"
when: always
--
GitLab
From 52d1e3dc9677a14e0c1042197577ac69231809cb Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 12:58:51 -0600
Subject: [PATCH 07/35] changed compute built to be similar to proxy node
builds
---
.gitlab-ci.yml | 40 +++++++++++++++++++++++++++-------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b336b44..00d3c20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,15 +110,13 @@ workflow:
reports:
dotenv: image.env
-build_compute_image:
- stage: build
- tags:
- - build
+.build_compute_image_template: &build_compute_image_template
script:
- *update_ansible_repo
- *get_ansible_files
- - export PKR_VAR_flavor="${COMPUTE_BUILD_FLAVOR:-$PKR_VAR_flavor}"
- - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${CRI_XCBC_HEAD}"
+ # packer vars for job env
+ - export PKR_VAR_flavor="${PROXY_BUILD_FLAVOR:-$PKR_VAR_flavor}"
+ - export PKR_VAR_build_instance_name="${BUILD_TARGET}-${EXT_REPO_HEAD}"
- export PKR_VAR_image_date_suffix=false
- |
if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then
@@ -126,18 +124,34 @@ build_compute_image:
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
+ # Ansible var overrides
+ - |
# packer commands
- - packer init openstack-compute
- - packer validate openstack-compute
- - packer build -machine-readable openstack-compute | tee compute_build.log
- - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
+ - packer init openstack-proxy
+ - packer validate openstack-proxy
+ - packer build -machine-readable openstack-proxy | tee proxy_build.log
+ - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' proxy_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
- - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
+ # set image properties with repo state
+ - openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
+ artifacts:
+ reports:
+ dotenv: image.env
+
+
+build_compute_image:
+ stage: build
+ environment:
+ name: $ENV
+ tags:
+ - build
+ variables:
+ PROXY_ENABLE_VAR: "enable_compute"
+ <<: *build_compute_image_template
rules:
- - if: $PIPELINE_TARGET == "build"
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
when: always
-
build_http_proxy_image:
stage: build
environment:
--
GitLab
From 1dea07cb327323c748b58a55f9b11c1035a0f6c2 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:17:22 -0600
Subject: [PATCH 08/35] fixed packer commands for compute build
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00d3c20..5e82c95 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,10 +127,10 @@ workflow:
# Ansible var overrides
- |
# packer commands
- - packer init openstack-proxy
- - packer validate openstack-proxy
- - packer build -machine-readable openstack-proxy | tee proxy_build.log
- - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' proxy_build.log | awk '{print $4}')
+ - packer init openstack-compute
+ - packer validate openstack-compute
+ - packer build -machine-readable openstack-compute | tee compute_build.log
+ - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
# set image properties with repo state
- openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
--
GitLab
From 658aeb65ef2c0bfc4024da756592ea842e380b09 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:23:27 -0600
Subject: [PATCH 09/35] removed extra line
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e82c95..3e770f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -138,7 +138,6 @@ workflow:
reports:
dotenv: image.env
-
build_compute_image:
stage: build
environment:
--
GitLab
From cca2825728a7ede48af79336259b9d26ff0e6d21 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:23:49 -0600
Subject: [PATCH 10/35] removed extra line
---
.gitlab-ci.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e770f0..5abd357 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -212,7 +212,6 @@ deploy_compute_node:
- if: $PIPELINE_TARGET == "deploy"
when: always
-
deploy_http_proxy_node:
stage: deploy
environment:
--
GitLab
From 2929695df94cd2a514a25dc14a7c9cb46399b675 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:38:22 -0600
Subject: [PATCH 11/35] removed extra line
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5abd357..ebbfeef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -124,8 +124,6 @@ workflow:
elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
- # Ansible var overrides
- - |
# packer commands
- packer init openstack-compute
- packer validate openstack-compute
--
GitLab
From f7ba2e831e2877b0d2b7093e433d6e99fc7f6a85 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:41:44 -0600
Subject: [PATCH 12/35] added root_ssh_key for compute node build variable
---
openstack-compute/variables.pkr.hcl | 1 +
1 file changed, 1 insertion(+)
diff --git a/openstack-compute/variables.pkr.hcl b/openstack-compute/variables.pkr.hcl
index 20efd64..d368139 100644
--- a/openstack-compute/variables.pkr.hcl
+++ b/openstack-compute/variables.pkr.hcl
@@ -1,6 +1,7 @@
variable "root_ssh_key" {
type = string
description = "The root key to use for ssh"
+ default = ""
}
variable "image_name" {
--
GitLab
From c6ac2f98099bf5cd856131d759b69f35c9c506ef Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 13:47:57 -0600
Subject: [PATCH 13/35] set build target to compute
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ebbfeef..af25bc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,7 +146,7 @@ build_compute_image:
PROXY_ENABLE_VAR: "enable_compute"
<<: *build_compute_image_template
rules:
- - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute"
when: always
build_http_proxy_image:
--
GitLab
From 7cd67e96ad6b6f9f9b7f12f4776678dfa04ec8d3 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 14:07:13 -0600
Subject: [PATCH 14/35] changed network id
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af25bc5..63e179b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
PKR_VAR_security_groups: '["allow-ssh"]'
PKR_VAR_skip_create_image: "false"
PKR_VAR_ssh_username: "centos"
- PKR_VAR_networks: '["8cf2f12e-905d-46d9-bc70-b0897c65f75a"]'
+ PKR_VAR_networks: '["0295b9ca-ba14-4d08-8c57-78a4c07345eb"]'
GIT_AUTHOR_NAME: "Gitlab runner"
GIT_AUTHOR_EMAIL: "gitlab@runner"
INSTANCE_FLAVOR: "m1.medium-ruffner"
--
GitLab
From 5d3484ef4216d6128521aac8892d37302881def2 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 14:22:52 -0600
Subject: [PATCH 15/35] chnaged image set for compute to match that of proxy
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 63e179b..d821f5d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,8 +130,7 @@ workflow:
- packer build -machine-readable openstack-compute | tee compute_build.log
- export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
- # set image properties with repo state
- - openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
+ - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_PROXY_IMAGE_ID}
artifacts:
reports:
dotenv: image.env
--
GitLab
From 5cc0528edf31d092e6085cb2fae6ee0da205511f Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 14:27:34 -0600
Subject: [PATCH 16/35] fixed typo in BUILT_COMPUTE_IMAGE_ID
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d821f5d..8703f6d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -130,7 +130,7 @@ workflow:
- packer build -machine-readable openstack-compute | tee compute_build.log
- export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
- echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
- - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_PROXY_IMAGE_ID}
+ - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
artifacts:
reports:
dotenv: image.env
--
GitLab
From aa5071c3ef6e5bfd467c8802a09c82c72ad6b3bd Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 14:39:02 -0600
Subject: [PATCH 17/35] split playbook compute.ymp to build and deploy
---
ansible/compute.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/ansible/compute.yml b/ansible/compute.yml
index 2907d08..4009929 100644
--- a/ansible/compute.yml
+++ b/ansible/compute.yml
@@ -8,5 +8,3 @@
- { name: 'pam_slurm_adopt', tags: 'pam_slurm_adopt' }
- { name: 'install_nhc', tags: 'install_nhc'}
-- name: Setup node for use as a virtual cheaha node
- ansible.builtin.import_playbook: cheaha.yml
--
GitLab
From a48f47c31e17fcad611f442f970d484427bf6386 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Wed, 4 Dec 2024 14:53:03 -0600
Subject: [PATCH 18/35] added playbook file base.yml in compute node build
---
openstack-compute/nodeimage.pkr.hcl | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-compute/nodeimage.pkr.hcl
index 15941ba..0df7158 100644
--- a/openstack-compute/nodeimage.pkr.hcl
+++ b/openstack-compute/nodeimage.pkr.hcl
@@ -36,6 +36,17 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
+ provisioner "ansible" {
+ use_proxy = false
+ user = var.ssh_username
+ groups = ["base"]
+ playbook_file = "./ansible/base.yml"
+ roles_path = "./ansible/roles"
+ extra_arguments = [
+ "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
+ ]
+ }
+
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab
From 646aeb0eeb0e102682700ecaeb7c64165e3c7567 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Fri, 6 Dec 2024 19:01:35 -0500
Subject: [PATCH 19/35] feat: Remove unnecessary var def
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8703f6d..edb70c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -167,8 +167,6 @@ build_ssh_proxy_image:
name: $ENV
tags:
- build
- variables:
- PROXY_ENABLE_VAR: "enable_ssh_proxy"
<<: *build_proxy_image_template
rules:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
--
GitLab
From 921177ff171d0ffb690b60719645ffdc17920e56 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Fri, 6 Dec 2024 19:03:52 -0500
Subject: [PATCH 20/35] feat: Rearrange code for readability
---
.gitlab-ci.yml | 119 +++++++++++++++++++++++++------------------------
1 file changed, 60 insertions(+), 59 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edb70c9..340976d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,6 +110,30 @@ workflow:
reports:
dotenv: image.env
+build_http_proxy_image:
+ stage: build
+ environment:
+ name: $ENV
+ tags:
+ - build
+ variables:
+ PROXY_ENABLE_VAR: "enable_http_proxy"
+ <<: *build_proxy_image_template
+ rules:
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
+ when: always
+
+build_ssh_proxy_image:
+ stage: build
+ environment:
+ name: $ENV
+ tags:
+ - build
+ <<: *build_proxy_image_template
+ rules:
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
+ when: always
+
.build_compute_image_template: &build_compute_image_template
script:
- *update_ansible_repo
@@ -148,65 +172,6 @@ build_compute_image:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute"
when: always
-build_http_proxy_image:
- stage: build
- environment:
- name: $ENV
- tags:
- - build
- variables:
- PROXY_ENABLE_VAR: "enable_http_proxy"
- <<: *build_proxy_image_template
- rules:
- - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "http-proxy"
- when: always
-
-build_ssh_proxy_image:
- stage: build
- environment:
- name: $ENV
- tags:
- - build
- <<: *build_proxy_image_template
- rules:
- - 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 $compute-${BUILD_DATE} || 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
- - |
-
- rules:
- - if: $PIPELINE_TARGET == "deploy"
- when: always
-
deploy_http_proxy_node:
stage: deploy
environment:
@@ -307,3 +272,39 @@ deploy_ssh_proxy_node:
rules:
- if: $PIPELINE_TARGET == "deploy" && $SSH_PROXY_IMAGE_ID
when: always
+
+deploy_compute_node:
+ stage: deploy
+ environment:
+ name: $ENV
+ tags:
+ - build
+ script:
+ - openstack image set --accept $compute-${BUILD_DATE} || 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
+ - |
+
+ rules:
+ - if: $PIPELINE_TARGET == "deploy"
+ when: always
+
--
GitLab
From e5a79f65eaa8ba25e0ba4ba42b5de51f02204a6a Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:18:06 -0500
Subject: [PATCH 21/35] Change compute reference to login in build
---
.gitlab-ci.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 340976d..34fe32f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,7 @@ build_ssh_proxy_image:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "ssh-proxy"
when: always
-.build_compute_image_template: &build_compute_image_template
+.build_login_image_template: &build_login_image_template
script:
- *update_ansible_repo
- *get_ansible_files
@@ -151,15 +151,14 @@ build_ssh_proxy_image:
# packer commands
- packer init openstack-compute
- packer validate openstack-compute
- - packer build -machine-readable openstack-compute | tee compute_build.log
- - export BUILT_COMPUTE_IMAGE_ID=$(grep 'Image:' compute_build.log | awk '{print $4}')
- - echo BUILT_COMPUTE_IMAGE_ID=${BUILT_COMPUTE_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
- - openstack image set --property CRI_XCBC_prod=${CRI_XCBC_prod} --property CRI_XCBC_dev=${CRI_XCBC_dev} --property PACKER_IMAGE_HEAD=${PACKER_IMAGE_HEAD} ${BUILT_COMPUTE_IMAGE_ID}
+ - packer build -machine-readable openstack-compute | tee login_build.log
+ - export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
+ - echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
artifacts:
reports:
dotenv: image.env
-build_compute_image:
+build_login_image:
stage: build
environment:
name: $ENV
@@ -167,9 +166,9 @@ build_compute_image:
- build
variables:
PROXY_ENABLE_VAR: "enable_compute"
- <<: *build_compute_image_template
+ <<: *build_login_image_template
rules:
- - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "compute"
+ - if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "login"
when: always
deploy_http_proxy_node:
--
GitLab
From fe5673961dc2152a0bf265c0ab7ecb79be2b173e Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:19:17 -0500
Subject: [PATCH 22/35] Stick to template used in other builds for image
properties
---
.gitlab-ci.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34fe32f..59a7976 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -154,6 +154,8 @@ build_ssh_proxy_image:
- packer build -machine-readable openstack-compute | tee login_build.log
- export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
- echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
+ # set image properties with repo state
+ - openstack image set --property EXT_PR_SRC_REPO=${EXT_PR_SRC_REPO} --property EXT_PR_SRC_BRANCH_SHA=${EXT_PR_SRC_BRANCH_SHA} --property EXT_PR_TARGET_REPO=${EXT_PR_TARGET_REPO} --property EXT_PR_TARGET_BRANCH_SHA=${EXT_PR_TARGET_BRANCH_SHA} --property PACKER_IMAGE_HEAD=${CI_COMMIT_SHORT_SHA} ${BUILT_LOGIN_IMAGE_ID}
artifacts:
reports:
dotenv: image.env
--
GitLab
From 2cded838a80be769abfa5b96c2a06309fe3ebb82 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:19:47 -0500
Subject: [PATCH 23/35] Remove unncessary vars
---
.gitlab-ci.yml | 2 --
1 file changed, 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59a7976..e0d114d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -166,8 +166,6 @@ build_login_image:
name: $ENV
tags:
- build
- variables:
- PROXY_ENABLE_VAR: "enable_compute"
<<: *build_login_image_template
rules:
- if: $PIPELINE_TARGET == "build" && $BUILD_TARGET == "login"
--
GitLab
From 40eb1cc57c4fd7fedec869a4168277a7dbc7d8d6 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:37:04 -0500
Subject: [PATCH 24/35] Change compute references to login in deploy
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0d114d..ffa84d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -272,14 +272,14 @@ deploy_ssh_proxy_node:
- if: $PIPELINE_TARGET == "deploy" && $SSH_PROXY_IMAGE_ID
when: always
-deploy_compute_node:
+deploy_login_node:
stage: deploy
environment:
name: $ENV
tags:
- build
script:
- - openstack image set --accept $compute-${BUILD_DATE} || true
+ - openstack image set --accept $login-${BUILD_DATE} || true
- FAILED=false
- |
cat > user_data.txt <<EOF
--
GitLab
From 9970c91024d43e351efed9ed4638bc8929b3e77e Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Tue, 10 Dec 2024 16:39:41 -0500
Subject: [PATCH 25/35] Add missing code to create instance and associate FIP
---
.gitlab-ci.yml | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffa84d3..5b15e07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -302,8 +302,23 @@ deploy_login_node:
rm -rf /tmp/${CI_PROJECT_NAME}
EOF
- |
-
+ export cmd="openstack server create"
+ cmd+=" -c id -f value --image $LOGIN_IMAGE_ID"
+ cmd+=" --flavor $INSTANCE_FLAVOR"
+ cmd+=" --network $INSTANCE_NETWORK"
+ cmd+=" --security-group allow-ssh"
+ cmd+=" --user-data user_data.txt"
+ if [ -n "$LOGIN_PORT" ];then cmd+=" --port $LOGIN_PORT"; fi
+ cmd+=" --wait $LOGIN_INSTANCE_NAME"
+ - export LOGIN_INSTANCE_ID=$(bash -c "$cmd")
+ - |
+ # Associate the floating IP(s) with the SSH Proxy instance
+ for LOGIN_FLOATING_IP in ${LOGIN_FLOATING_IP_LIST[@]};
+ do
+ echo "Associating FLOATING_IP $LOGIN_FLOATING_IP with LOGIN_INSTANCE_ID $LOGIN_INSTANCE_ID"
+ openstack server add floating ip $LOGIN_INSTANCE_ID $LOGIN_FLOATING_IP
+ done
rules:
- - if: $PIPELINE_TARGET == "deploy"
+ - if: $PIPELINE_TARGET == "deploy" && $LOGIN_IMAGE_ID
when: always
--
GitLab
From 7d2c824f3c11c68f4facbcc14ddaa6b567dc05ad Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:25:41 -0500
Subject: [PATCH 26/35] Revert "changed network id"
This reverts commit 7cd67e96ad6b6f9f9b7f12f4776678dfa04ec8d3.
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5b15e07..43b39ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
PKR_VAR_security_groups: '["allow-ssh"]'
PKR_VAR_skip_create_image: "false"
PKR_VAR_ssh_username: "centos"
- PKR_VAR_networks: '["0295b9ca-ba14-4d08-8c57-78a4c07345eb"]'
+ PKR_VAR_networks: '["8cf2f12e-905d-46d9-bc70-b0897c65f75a"]'
GIT_AUTHOR_NAME: "Gitlab runner"
GIT_AUTHOR_EMAIL: "gitlab@runner"
INSTANCE_FLAVOR: "m1.medium-ruffner"
--
GitLab
From 327768b45c88e32a5620d8d6ca6766de08a8567d Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 27/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-compute/nodeimage.pkr.hcl | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-compute/nodeimage.pkr.hcl
index 0df7158..15941ba 100644
--- a/openstack-compute/nodeimage.pkr.hcl
+++ b/openstack-compute/nodeimage.pkr.hcl
@@ -36,17 +36,6 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
- provisioner "ansible" {
- use_proxy = false
- user = var.ssh_username
- groups = ["base"]
- playbook_file = "./ansible/base.yml"
- roles_path = "./ansible/roles"
- extra_arguments = [
- "--extra-vars", "root_ssh_key='${var.root_ssh_key}'"
- ]
- }
-
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab
From a1067bbc8536e4653c39821ef811f343eb2714c4 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:52:54 -0500
Subject: [PATCH 28/35] Rename packer template for compute to login
Because compute and login nodes are basically the same except login node
does not need slurmd and we don't use compute image anywhere. So use it
to build login image and change its references in CI script
---
.gitlab-ci.yml | 6 +++---
{openstack-compute => openstack-login}/README.md | 0
{openstack-compute => openstack-login}/nodeimage.pkr.hcl | 0
{openstack-compute => openstack-login}/variables.pkr.hcl | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename {openstack-compute => openstack-login}/README.md (100%)
rename {openstack-compute => openstack-login}/nodeimage.pkr.hcl (100%)
rename {openstack-compute => openstack-login}/variables.pkr.hcl (100%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43b39ae..29ec2e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,9 +149,9 @@ build_ssh_proxy_image:
export PKR_VAR_image_name="${BUILD_TARGET}-${BUILD_DATE}"
fi
# packer commands
- - packer init openstack-compute
- - packer validate openstack-compute
- - packer build -machine-readable openstack-compute | tee login_build.log
+ - packer init openstack-login
+ - packer validate openstack-login
+ - packer build -machine-readable openstack-login | tee login_build.log
- export BUILT_LOGIN_IMAGE_ID=$(grep 'Image:' login_build.log | awk '{print $4}')
- echo BUILT_LOGIN_IMAGE_ID=${BUILT_LOGIN_IMAGE_ID} | tee -a $CI_PROJECT_DIR/image.env
# set image properties with repo state
diff --git a/openstack-compute/README.md b/openstack-login/README.md
similarity index 100%
rename from openstack-compute/README.md
rename to openstack-login/README.md
diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
similarity index 100%
rename from openstack-compute/nodeimage.pkr.hcl
rename to openstack-login/nodeimage.pkr.hcl
diff --git a/openstack-compute/variables.pkr.hcl b/openstack-login/variables.pkr.hcl
similarity index 100%
rename from openstack-compute/variables.pkr.hcl
rename to openstack-login/variables.pkr.hcl
--
GitLab
From ff573c3566190ae1e47eb255170a6a5a63b4c222 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 12:55:50 -0500
Subject: [PATCH 29/35] Install prerequisite packages
---
openstack-login/nodeimage.pkr.hcl | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 15941ba..008b768 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -36,6 +36,14 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
+ provisioner "shell" {
+ inline = [
+ "sudo yum install -y libselinux-python3 python3 python3-pip tmux vim git bash-completion curl wget unzip",
+ "sudo python3 -m pip install --upgrade pip",
+ "sudo pip3 install s3cmd==2.3.0 ansible==4.10.0 python-openstackclient==5.8.0"
+ ]
+ }
+
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab
From 9035282c5226f1f841c7651b3a1679057ed0fe53 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 30/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-login/nodeimage.pkr.hcl | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 008b768..057cc3e 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -35,15 +35,6 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
-
- provisioner "shell" {
- inline = [
- "sudo yum install -y libselinux-python3 python3 python3-pip tmux vim git bash-completion curl wget unzip",
- "sudo python3 -m pip install --upgrade pip",
- "sudo pip3 install s3cmd==2.3.0 ansible==4.10.0 python-openstackclient==5.8.0"
- ]
- }
-
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab
From 40bec120f58862093ae8905d84d70724e471419e Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 31/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-login/nodeimage.pkr.hcl | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 057cc3e..dad64e1 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -35,6 +35,10 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
+<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+=======
+
+>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab
From 4ba5234bf008ba76bf22218abc49701e28ac4e78 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 32/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-login/nodeimage.pkr.hcl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index dad64e1..cb9e4ac 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -38,6 +38,9 @@ build {
<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
=======
+<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
+=======
>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
provisioner "ansible" {
use_proxy = false
--
GitLab
From 09b85188036fba43d82424de0342c5611f4c22d0 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 33/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-login/nodeimage.pkr.hcl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index cb9e4ac..ca590b8 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -39,6 +39,9 @@ build {
=======
<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
+=======
>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
=======
>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
--
GitLab
From e00578c7f94a78478b95bcf0fa01590044d9e869 Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 11 Dec 2024 08:30:02 -0500
Subject: [PATCH 34/35] Avoid building base instead use base img as src img
This will save time during image build. If you need base image build it
separtely and use the new image as src for build.
---
openstack-login/nodeimage.pkr.hcl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index ca590b8..81dfa7e 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -40,6 +40,9 @@ build {
<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
+>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
+=======
>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
=======
>>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
--
GitLab
From 2e1a5c0880b344dea79411e70031a2523ad6fd44 Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Fri, 13 Dec 2024 11:50:23 -0600
Subject: [PATCH 35/35] removed merge conflict in nodeimage.pkr.hcl
---
openstack-login/nodeimage.pkr.hcl | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 81dfa7e..057cc3e 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -35,19 +35,6 @@ source "openstack" "image" {
build {
sources = ["source.openstack.image"]
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-=======
-
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
provisioner "ansible" {
use_proxy = false
user = var.ssh_username
--
GitLab