diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4409b58b1aebf34dbe58b1dcd892206c9a880d1b..20425d3dd0a99f1a62f2a1b6aa658fe8f4c534b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ variables: PKR_VAR_external_net: "b186e28a-505a-4bcd-bac2-ec01b3916a42" PKR_VAR_internal_net: "311c0dfc-2dd8-47e6-9ab7-224fad5feb10" PKR_VAR_floating_ip_network: "uab-campus" + PKR_VAR_instance_floating_ip_net: "b186e28a-505a-4bcd-bac2-ec01b3916a42" PKR_VAR_build_instance_name: "ohpc" PKR_VAR_build_image_name: "xdmod" PKR_VAR_ssh_username: "centos" diff --git a/xdmod/image.pkr.hcl b/xdmod/image.pkr.hcl index aa20882351f4479dc5a29f5e36e5dbc7f44cf128..48629ca84c43d8f49e01652b74736adc5809bfb5 100644 --- a/xdmod/image.pkr.hcl +++ b/xdmod/image.pkr.hcl @@ -2,6 +2,7 @@ source "openstack" "image" { flavor = "${var.flavor}" image_name = "${var.build_image_name}" floating_ip_network = "${var.floating_ip_network}" + instance_floating_ip_net = "${var.instance_floating_ip_net}" instance_name = "${var.build_instance_name}" networks = ["${var.external_net}", "${var.internal_net}"] reuse_ips = "false" diff --git a/xdmod/variables.pkr.hcl b/xdmod/variables.pkr.hcl index 12d6c4134de329580fc4a56ef4d9d99cd86b483e..161d26ebad915979b2f21acbdcc6b2f98621c534 100644 --- a/xdmod/variables.pkr.hcl +++ b/xdmod/variables.pkr.hcl @@ -15,6 +15,10 @@ variable "floating_ip_network" { type = string description = "Floating IP network to be use in openstack build instance" } +variable "instance_floating_ip_net" { + type = string + description = "Network to associate the floating IP with openstack build instance" +} variable "build_instance_name" { type = string description = "Name of the openstack build instance"