kvm: use free port in monitor-httpd-port

software/kvm/buildout.hash.cfg

@@ -15,23 +15,23 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = b6204319cca4264b3c351d4dd1f2b5d0
+md5sum = abd8493f35e153a5984ed22c8fe49792
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
-md5sum = 4ae98a072354efbdd7440d800cc675c8
+md5sum = 900faa43cd9bb599aa7be0cdc64531bf
 
 [template-kvm-cluster]
 filename = instance-kvm-cluster.cfg.jinja2.in
-md5sum = 15415f63741dc8c478512f9e410bb0ae
+md5sum = be9b1a7e4b87c90b5b8599e7f7214add
 
 [template-kvm-resilient]
 filename = instance-kvm-resilient.cfg.jinja2
-md5sum = 839fc16c112d3b87e2dbd2e382e326de
+md5sum = 7804576ecfe84871dce3a5e604330fda
 
 [template-kvm-import]
 filename = instance-kvm-import.cfg.jinja2.in
-md5sum = a463a5e3cd2287d275d6943c2a11b7e4
+md5sum = 69f3994e3a422db099692e384267697a
 
 [template-kvm-import-script]
 filename = template/kvm-import.sh.jinja2
@@ -39,7 +39,7 @@ md5sum = cd0008f1689dfca9b77370bc4d275b70
 
 [template-kvm-export]
 filename = instance-kvm-export.cfg.jinja2
-md5sum = 34d1b7cc8ca62bfdfce759a1dfbbaccd
+md5sum = d9cbae97c02f2df23c1a2a69dc7c9c0f
 
 [template-kvm-export-script]
 filename = template/kvm-export.sh.jinja2

software/kvm/instance-kvm-cluster.cfg.jinja2.in

@@ -300,8 +300,14 @@ recipe = slapos.cookbook:publish-early
 -init =
   monitor-password monitor-htpasswd:passwd
 
+[kvm-monitor-port]
+recipe = slapos.cookbook:free_port
+minimum = 8060
+maximum = 8080
+ip = {{ partition_ipv6 }}
+
 [monitor-instance-parameter]
-monitor-httpd-port = 8060
+monitor-httpd-port = ${kvm-monitor-port:port}
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 username = admin
 password = ${publish-early:monitor-password}

software/kvm/instance-kvm-export.cfg.jinja2

@@ -45,8 +45,14 @@ context =
 monitor-base-url = ${monitor-publish:monitor-base-url}
 monitor-setup-url = ${monitor-publish:monitor-setup-url}
 
+[kvm-monitor-port]
+recipe = slapos.cookbook:free_port
+minimum = 8026
+maximum = 8046
+ip = {{ partition_ipv6 }}
+
 [monitor-instance-parameter]
-monitor-httpd-port = 8026
+monitor-httpd-port = ${kvm-monitor-port:port}
 monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 {% if slapparameter_dict.get('monitor-username', '') -%}

software/kvm/instance-kvm-import.cfg.jinja2.in

@@ -27,8 +27,14 @@ monitor-url = ${monitor-publish-parameters:monitor-url}
 monitor-user = ${monitor-publish-parameters:monitor-user}
 monitor-password = ${monitor-publish-parameters:monitor-password}
 
+[kvm-monitor-port]
+recipe = slapos.cookbook:free_port
+minimum = 8276
+maximum = 8296
+ip = {{ partition_ipv6 }}
+
 [monitor-instance-parameter]
-monitor-httpd-port = 8276
+monitor-httpd-port = ${kvm-monitor-port:port}
 monitor-title = {{ slapparameter_dict.get('name', 'Kvm Resilient clone') }}
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', '') }}
 {%   if slapparameter_dict.get('monitor-username', '') -%}

software/kvm/instance-kvm-resilient.cfg.jinja2

@@ -43,9 +43,15 @@ recipe = slapos.cookbook:publish-early
 -init =
   monitor-password monitor-htpasswd:passwd
 
+[kvm-monitor-port]
+recipe = slapos.cookbook:free_port
+minimum = 8160
+maximum = 8180
+ip = {{ partition_ipv6 }}
+
 # XXX Monitoring Main Instane
 [monitor-instance-parameter]
-monitor-httpd-port = 8160
+monitor-httpd-port = ${kvm-monitor-port:port}
 password = ${publish-early:monitor-password}
 cors-domains = {{ monitor_parameter.get('monitor-cors-domains', '') }}
 

software/kvm/instance-kvm.cfg.jinja2

@@ -830,8 +830,14 @@ config-host = ${httpd:host}
 config-port = ${httpd:port}
 {% endif %}
 
+[kvm-monitor-port]
+recipe = slapos.cookbook:free_port
+minimum = 8026
+maximum = 8046
+ip = {{ partition_ipv6 }}
+
 [monitor-instance-parameter]
-monitor-httpd-port = 8026
+monitor-httpd-port = ${kvm-monitor-port:port}
 monitor-title = {{ slapparameter_dict.get('name', 'KVM Standalone') }}
 cors-domains = {{ slapparameter_dict.get('monitor-cors-domains', 'monitor.app.officejs.com') }}
 {% if slapparameter_dict.get('monitor-username', '') -%}

software/kvm/instance.cfg.in

@@ -69,6 +69,7 @@ extra-context =
   raw template_content ${template-content:target}
   raw template_httpd_cfg ${template-httpd:output}
   raw template_monitor ${monitor2-template:output}
+  key partition_ipv6 slap-configuration:ipv6-random
 
 [dynamic-template-kvm]
 <= jinja2-template-base
@@ -105,6 +106,7 @@ extra-context =
   raw template_nginx ${template-nginx:target}
   raw websockify_executable_location ${buildout:directory}/bin/websockify
   raw wipe_disk_wrapper ${buildout:directory}/bin/securedelete
+  key partition_ipv6 slap-configuration:ipv6-random
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
@@ -121,6 +123,7 @@ context =
     key slapparameter_dict slap-configuration:configuration
     raw curl_executable_location ${curl:location}/bin/curl
     raw template_monitor ${monitor2-template:output}
+    key partition_ipv6 slap-configuration:ipv6-random
 template-parts-destination = ${template-parts:target}
 template-replicated-destination = ${template-replicated:target}
 import-list = file parts :template-parts-destination
@@ -139,6 +142,7 @@ context =
     key pbsready_export_template template-pbsready-export:output
     raw gzip_binary ${gzip:location}/bin/gzip
     key slapparameter_dict slap-configuration:configuration
+    key partition_ipv6 slap-configuration:ipv6-random
 
 [dynamic-template-kvm-import]
 recipe = slapos.recipe.template:jinja2
@@ -154,6 +158,7 @@ context =
     key slapparameter_dict slap-configuration:configuration
     raw zcat_binary ${gzip:location}/bin/zcat
     raw gzip_binary ${gzip:location}/bin/gzip
+    key partition_ipv6 slap-configuration:ipv6-random
 
 [dynamic-template-nbd]
 <= jinja2-template-base