allow to set custom frontend for kvm-cluster

software/kvm/common.cfg

@@ -93,7 +93,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = 5ff1c3c0083ad7d331e9e2da7dc601cb
+md5sum = 0932888a12b301bebbfd2c11f7c73ccf
 download-only = true
 on-update = true
 
@@ -101,7 +101,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = 9dc4b77be3d350b41baaf57d147e07e2
+md5sum = 0d51e71a7967ead2f88e11cc797037a4
 download-only = true
 on-update = true
 

software/kvm/instance-kvm-cluster-input-schema.json

@@ -9,7 +9,7 @@
         "title": "Frontend Instance ID",
         "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
         "type": "string",
-        "default": "SOFTINST-11031"
+        "default": ""
       },
       "frontend-software-type": {
         "title": "Frontend Software Type",
@@ -26,6 +26,97 @@
       },
       "type": "object"
     },
+    "slave-frontend": {
+      "instance-guid": {
+        "title": "Main Frontend Instance ID",
+        "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",
+        "type": "string",
+        "default": ""
+      },
+      "frontend-software-type": {
+        "title": "Frontend Software Type",
+        "description": "Type of the frontend instance, like \"frontend\".",
+        "type": "string",
+        "default": "default"
+      },
+      "frontend-software-url": {
+        "title": "Frontend Software URL",
+        "description": "Software Release URL of the frontend instance, like \"http://example.com/path/to/software.cfg\".",
+        "type": "string",
+        "format": "uri",
+        "default": "http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg"
+      },
+      "slave-frontend-dict": {
+        "description": "kvm instances definition",
+        "patternProperties": {
+          ".*": {
+              "properties": {
+                "domain": {
+                  "title": "Name of the domain to be used",
+                  "description": "Name of the domain to be used (example: mydomain.com). Subdomains of this domain will be used for the slave instances (example: instance12345.mydomain.com).",
+                  "type": "string",
+                  "format": "uri",
+                  "default": ""
+                },
+                "url": {
+                  "title": "URL of backend to use.",
+                  "description": "URL of backend to use. This URL will be used to request frontend if parameter 'kvm-partition-name' is not set.",
+                  "format": "uri",
+                  "type": "string",
+                  "default": ""
+                },
+                "enable-cache": {
+                  "title": "Specify if cached will be used for this slave frontend.",
+                  "description": "Specify if slave frontend should use a squid to connect to backend.",
+                  "type": "boolean",
+                  "default": false
+                },
+                "type": {
+                  "title": "Specify if slave frontend will redirect to a zope backend.",
+                  "description": "If specified, Apache RewriteRule will use Zope's Virtual Host Daemon. Possible values: 'zope', 'default'.",
+                  "type": "string",
+                  "default": "default"
+                },
+                "zope-path": {
+                  "title": "Specify path to the VirtualHostRoot of the zope.",
+                  "description": "Only used if type is 'zope'. Will append the specified path to the VirtualHostRoot of the zope's VirtualHostMonster.",
+                  "type": "string",
+                  "default": ""
+                },
+                "https-only": {
+                  "title": "Specify if website should be accessed using https only.",
+                  "description": "Specify if website should be accessed using https only. If so, the frontend will redirect the user to https if accessed from http.",
+                  "type": "boolean",
+                  "default": false
+                },
+                "kvm-partition-name": {
+                  "title": "Reference name in 'kvm-partition-dict' to get IPv6 for slave frontend from.",
+                  "description": "Only work if 'use-nat' is true and 'service-port' is set. This will allow to get URL from defined nat-rules. Play the same as url.",
+                  "type": "string",
+                  "default": ""
+                },
+                "service-port": {
+                  "allOf": [{
+                    "$ref": "#/definitions/tcpv4port"
+                  }, {
+                    "title": "Specify the port of service to run in VM.",
+                    "description": "This will allow to get URL from defined nat-rules. The port should exist in nat-rules of KVM referenced by 'kvm-partition-name'"
+                  }]
+                },
+                "url-scheme": {
+                  "title": "Say If HTTP service to run into the Virtual Machine will use http or https.",
+                  "description": "Say If HTTP service to run into the Virtual Machine will use http or https. Possible values: http, https",
+                  "type": "string",
+                  "default": "http"
+                }
+              },
+            "type": "object"
+          }
+        },
+        "type": "object"
+      },
+      "type": "object"
+    },
     "kvm-partition-dict": {
       "description": "kvm instances definition",
       "patternProperties": {
@@ -121,7 +212,8 @@
               "nat-rules": {
                 "title": "List of rules for NAT of QEMU user mode network stack.",
                 "description": "List of rules for NAT of QEMU user mode network stack, as comma-separated list of ports. For each port specified, it will redirect port x of the VM (example: 80) to the port x + 10000 of the public IPv6 (example: 10080). Defaults to \"22 80 443\". Ignored if \"use-tap\" parameter is enabled.",
-                "type": "string"
+                "type": "array",
+                "default": [22, 80, 443]
               }
             },
           "type": "object"

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

 {% set publish_dict = {} -%}
 {% set frontend_dict = slapparameter_dict.get('frontend', {}) -%}
+{% set slave_frontend_dict = slapparameter_dict.get('slave-frontend', {}) -%}
+{% set slave_frontend_sr = slave_frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg') -%}
+{% set slave_frontend_stype = slave_frontend_dict.get('software-type', 'default') -%}
+{% set slave_frontend_iguid = slave_frontend_dict.get('instance-guid', '') -%}
+{% set kvm_instance_dict = {} -%}
 
 [request-common]
 recipe = slapos.cookbook:request
@@ -14,6 +19,7 @@ config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
 # Request kvm instances
 {% for instance_name, kvm_parameter_dict in slapparameter_dict.get('kvm-partition-dict', {'kvm-default': {}}).items() -%}
 {% set section = 'request-' ~ instance_name -%}
+{% set use_nat = kvm_parameter_dict.get('use-nat', True) -%}
 [{{ section }}]
 <= request-common
 software-type = kvm
@@ -35,7 +41,8 @@ config-cpu-count = {{ dumps(kvm_parameter_dict.get('cpu-count', 1)) }}
 
 {% set nat_rules_list = kvm_parameter_dict.get('nat-rules', [22, 80, 443]) -%}
 config-nat-rules = {{ nat_rules_list | join(' ') }}
-config-use-nat = {{ dumps(kvm_parameter_dict.get('use-nat', True)) }}
+config-publish-nat-url = True
+config-use-nat = {{ use_nat }}
 config-use-tap = {{ dumps(kvm_parameter_dict.get('use-tap', False)) }}
 config-virtual-hard-drive-url = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-url', '')) }}
 config-virtual-hard-drive-md5sum = {{ dumps(kvm_parameter_dict.get('virtual-hard-drive-md5sum', '')) }}
@@ -43,8 +50,59 @@ config-virtual-hard-drive-gzipped = {{ dumps(kvm_parameter_dict.get('virtual-har
 return = 
   backend-url
   url
+{% if use_nat -%}
+{%   for port in nat_rules_list -%}
+{{ '  ' }}nat-rule-url-{{ port }}
+{%   endfor -%}
+{% endif -%}
 {% do publish_dict.__setitem__(instance_name ~ '-backend-url', '${' ~ section ~ ':connection-backend-url}') -%}
 {% do publish_dict.__setitem__(instance_name ~ '-url', '${' ~ section ~ ':connection-url}') -%}
+{% do kvm_instance_dict.__setitem__(instance_name, (kvm_parameter_dict.get('use-nat', True), nat_rules_list)) -%}
+{% endfor %}
+
+
+#request custom kvm frontend
+{% for frontend_name, frontend_parameter_dict in slave_frontend_dict.get('slave-frontend-dict', {}).items() -%}
+{%   set name = frontend_name -%}
+{%   set url = frontend_parameter_dict.get('url', '') -%}
+{%   set error = '' -%}
+{%   if frontend_parameter_dict.get('kvm-partition-name', '') != '' -%}
+{%     set kvm_name = frontend_parameter_dict['kvm-partition-name'] -%}
+{%     set service_port = frontend_parameter_dict['service-port'] -%}
+{%     if kvm_name in kvm_instance_dict.keys()  and not kvm_instance_dict[kvm_name][0] -%}
+{%       set error = "You should set parameter use-nat to 'true' for '" ~ kvm_name ~ "', or provide url to use for frontend." -%}
+{%     elif kvm_name in kvm_instance_dict.keys() and service_port in kvm_instance_dict[kvm_name][1] -%}
+{%       set url = '${request-' ~ kvm_name ~ ':connection-nat-rule-url-' ~ service_port ~ '}' -%}
+{%       set url = frontend_parameter_dict.get('url-scheme', 'http') ~ '://' ~ url -%}
+{%     else -%}
+{%       set error = kvm_name ~ " and/or port " ~ service_port ~ " doesn't match any KVM name and/or related nat-rules in your request parameters." -%}
+{%     endif -%}
+{%   endif -%}
+{%   set section = 'request-' ~ name ~ '-slave-frontend' -%}
+[{{ section }}]
+<= request-common
+recipe = slapos.cookbook:request
+software-url = {{ slave_frontend_sr }}
+name = Frontend {{ name }}
+software-type = {{ slave_frontend_stype }}
+slave = true
+config-url = {{ url }}
+config-domain = {{ dumps(frontend_parameter_dict.get('domain', '')) }}
+config-enable_cache = {{ dumps(frontend_parameter_dict.get('enable-cache', False)) }}
+config-https-only = {{ dumps(frontend_parameter_dict.get('https-only', False)) }}
+{%  if frontend_parameter_dict.get('type', '') -%}
+config-type = {{ dumps(frontend_parameter_dict['type']) }}
+{%    if frontend_parameter_dict.get('path', '') -%}
+config-path = {{ dumps(frontend_parameter_dict['path']) }}
+{%    endif -%}
+{%  endif -%}
+return = 
+  site_url
+sla-instance_guid = {{ slave_frontend_iguid }}
+{%   do publish_dict.__setitem__(name ~ '-url', '${' ~ section ~ ':connection-site_url}') -%}
+{%   if error != '' -%}
+{%     do publish_dict.__setitem__('1_error', error) -%}
+{%   endif -%}
 {% endfor %}
 
 [publish]

software/kvm/instance-kvm.cfg.jinja2

@@ -229,13 +229,18 @@ curl_path = {{ curl_executable_location }}
 recipe = slapos.cookbook:publish
 backend-url = https://[${novnc-instance:ip}]:${novnc-instance:port}/vnc_auto.html?host=[${novnc-instance:ip}]&port=${novnc-instance:port}&encrypt=1&password=${kvm-instance:vnc-passwd}
 url = ${request-slave-frontend:connection-url}/vnc_auto.html?host=${request-slave-frontend:connection-domainname}&port=${request-slave-frontend:connection-port}&encrypt=1&path=${request-slave-frontend:connection-resource}&password=${kvm-instance:vnc-passwd}
+{% if slapparameter_dict.get('use-nat', 'True') == 'True' -%}
 # Publish NAT port mapping status
 # XXX: hardcoded value from [slap-parameter]
-{% set nat_rule_list = slapparameter_dict.get('nat-rules', '22 80 443') %}
-{% for port in nat_rule_list.split(' ') -%}
-  {% set external_port = 10000 + port|int() -%}
-  nat-rule-port-{{port}} = ${slap-network-information:global-ipv6} : {{external_port}}
-{% endfor -%}
+{%   set nat_rule_list = slapparameter_dict.get('nat-rules', '22 80 443') %}
+{%   for port in nat_rule_list.split(' ') -%}
+{%     set external_port = 10000 + port|int() -%}
+nat-rule-port-{{port}} = ${slap-network-information:global-ipv6} : {{external_port}}
+{%     if slapparameter_dict.get('publish-nat-url', False) -%}
+nat-rule-url-{{port}} = [${slap-network-information:global-ipv6}]:{{external_port}}
+{%     endif -%}
+{%   endfor -%}
+{% endif -%}
 
 
 [slap-parameter]