Merge branch 'main' into feat/topology-aware-scheduling

Author: wtripp180901

ansible/roles/proxy/tasks/main.yml

@@ -1,9 +1,10 @@
 - name: Validate http_proxy definition
   ansible.builtin.assert:
-    that: proxy_http_proxy != '' # this is default if squid not active
+    that: proxy_http_proxy != ''
     fail_msg: >-
       Variable proxy_http_proxy cannot be the empty string for hosts in the
-      proxy group. See environment/common/inventory/group_vars/all/proxy.yml.
+      proxy group. See environments/common/inventory/group_vars/all/proxy.yml
+      for convenience variables to set this.
 - name: Define configuration in /etc/environment
   tags: proxy
   lineinfile:

environments/common/inventory/group_vars/all/proxy.yml

@@ -20,12 +20,12 @@ proxy_remove: false
 
 # full http proxy string - override if the above don't provide enough control:
 proxy_http_proxy: >-
-  {% if groups['squid'] | length > 0 %}
+  {%- if proxy_http_address != '' -%}
   http://
   {%- if proxy_basic_password -%}
   {{ proxy_basic_user }}:{{ proxy_basic_password }}@
   {%- endif -%}
   {{ proxy_http_address }}:{{ proxy_http_port }}
-  {% else %}
-  
-  {% endif %}
+  {%- else %}
+
+  {%- endif %}

packer/openstack.pkr.hcl

@@ -102,6 +102,12 @@ variable "floating_ip_network" {
   default = null
 }
 
+variable "floating_ip" {
+  type = string
+  description = "ID of pre-existing FIP to attach. Note floating_ip_network is not required when using this"
+  default = null
+}
+
 variable "manifest_output_path" {
   type = string
   default = "packer-manifest.json"
@@ -162,6 +168,7 @@ source "openstack" "openhpc" {
   }
   networks = var.networks
   floating_ip_network = var.floating_ip_network
+  floating_ip = var.floating_ip
   security_groups = var.security_groups
 
   # Input image: