diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03241f7ad4d5021e7b33e903017c235ee6547c43..a620d09ec202b3aa298e3b449a694de6cb5801f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,6 +120,7 @@ build_base_image: elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then export PKR_VAR_image_name="base-${BUILD_DATE}" fi + - packer init openstack - packer validate openstack - packer build -machine-readable openstack | tee base_build.log - export BUILT_BASE_IMAGE_ID=$(grep 'Image:' base_build.log | awk '{print $4}') @@ -149,6 +150,7 @@ build_compute_image: 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 @@ -175,6 +177,7 @@ build_gpu_image: elif [ $CI_PIPELINE_SOURCE == 'schedule' ]; then export PKR_VAR_image_name="gpu-${BUILD_DATE}" fi + - packer init openstack-gpu - packer validate openstack-gpu - openstack server delete --wait $GPU_PLACEHOLDER_NAME - packer build -machine-readable openstack-gpu | tee gpu_build.log || FAILED=true @@ -206,6 +209,7 @@ build_ood_image: - 'sed -i -E "s/(user_register_app_key: ).*/\1\"${SELF_REG_APP_KEY}\"/" CRI_XCBC/group_vars/knightly' - 'sed -i -E "s/(celery_user_password: ).*/\1\"${CELERY_PASSWD}\"/" CRI_XCBC/group_vars/knightly' - 'sed -i -E "s|(ssh_pub_key: ).*|\1\"{{ lookup(''file'', ''${SSH_PUB_KEY}'') }}\"|" CRI_XCBC/group_vars/knightly' + - packer init openstack-ood - packer validate openstack-ood - | if [ $CI_PIPELINE_SOURCE == 'merge_request_event' ]; then diff --git a/openstack-compute/nodeimage.pkr.hcl b/openstack-compute/nodeimage.pkr.hcl index bf00471ea5cd36e523e4d34f8a9fa786d94fa749..15941bab1900a056d3d67bdba2db2bd5d94a31fb 100644 --- a/openstack-compute/nodeimage.pkr.hcl +++ b/openstack-compute/nodeimage.pkr.hcl @@ -1,3 +1,16 @@ +packer { + required_plugins { + openstack = { + version = "~> 1" + source = "github.com/hashicorp/openstack" + } + ansible = { + version = "~> 1" + source = "github.com/hashicorp/ansible" + } + } +} + locals { local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()) : ""}" } @@ -24,6 +37,7 @@ build { sources = ["source.openstack.image"] provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["compute"] playbook_file = "./ansible/compute.yml" @@ -34,6 +48,7 @@ build { } provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["compute"] ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"] diff --git a/openstack-gpu/nodeimage.pkr.hcl b/openstack-gpu/nodeimage.pkr.hcl index 034ead0c5a3e9a034cc2c9d9f9879c7c9efe33a2..0f375e1bc9399aa6291c55e076cffe3d06abf3e6 100644 --- a/openstack-gpu/nodeimage.pkr.hcl +++ b/openstack-gpu/nodeimage.pkr.hcl @@ -1,3 +1,16 @@ +packer { + required_plugins { + openstack = { + version = "~> 1" + source = "github.com/hashicorp/openstack" + } + ansible = { + version = "~> 1" + source = "github.com/hashicorp/ansible" + } + } +} + locals { local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("YYYYMMDDHHmm", timestamp()) : ""}" } @@ -24,6 +37,7 @@ build { sources = ["source.openstack.image"] provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["gpu"] playbook_file = "./ansible/gpu.yml" @@ -34,6 +48,7 @@ build { } provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["compute"] ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"] diff --git a/openstack-ood/nodeimage.pkr.hcl b/openstack-ood/nodeimage.pkr.hcl index 65caab7b0db909e752cd6fc21cacd4f228b69c4c..b31d7a1724bada0b8dbe1002b026d11571c294de 100644 --- a/openstack-ood/nodeimage.pkr.hcl +++ b/openstack-ood/nodeimage.pkr.hcl @@ -1,3 +1,16 @@ +packer { + required_plugins { + openstack = { + version = "~> 1" + source = "github.com/hashicorp/openstack" + } + ansible = { + version = "~> 1" + source = "github.com/hashicorp/ansible" + } + } +} + locals { local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()) : ""}" } @@ -24,6 +37,7 @@ build { sources = ["source.openstack.image"] provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["ood"] playbook_file = "./ansible/ood.yml" @@ -34,6 +48,7 @@ build { } provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["ood", "knightly"] ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"] diff --git a/openstack/nodeimage.pkr.hcl b/openstack/nodeimage.pkr.hcl index cc4316dc9e2d575bfc2382fb8bbb077371f0c459..e9666e9fd68065396c631cce139e91c30b2cc213 100644 --- a/openstack/nodeimage.pkr.hcl +++ b/openstack/nodeimage.pkr.hcl @@ -1,3 +1,16 @@ +packer { + required_plugins { + openstack = { + version = "~> 1" + source = "github.com/hashicorp/openstack" + } + ansible = { + version = "~> 1" + source = "github.com/hashicorp/ansible" + } + } +} + locals { local_image_name = "${var.image_name}${var.image_date_suffix ? formatdate("-YYYYMMDDHHmm", timestamp()) : ""}" } @@ -24,6 +37,7 @@ build { sources = ["source.openstack.image"] provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["base"] playbook_file = "./ansible/base.yml" @@ -34,6 +48,7 @@ build { } provisioner "ansible" { + use_proxy = false user = var.ssh_username groups = ["base"] ansible_env_vars = ["ANSIBLE_HOST_KEY_CHECKING=False"]