Merge branch 'kvm-cluster'

software/kvm/common.cfg

@@ -50,6 +50,7 @@ eggs =
   erp5.util
   cns.recipe.symlink
   collective.recipe.template
+  plone.recipe.command
 
 [http-proxy]
 # https://github.com/nodejitsu/node-http-proxy
@@ -86,7 +87,7 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
-md5sum = ba30f71c132c600d7d5a884d2090b36b
+md5sum = c5fd8ed5878901233d39d006093a6b17
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
@@ -94,7 +95,7 @@ mode = 0644
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm.cfg.jinja2
 mode = 644
-md5sum = ba2be2e288c662b1566550132c0ca6a7
+md5sum = 42763900fce72f13bf23341774e5d097
 download-only = true
 on-update = true
 
@@ -102,7 +103,7 @@ on-update = true
 recipe = hexagonit.recipe.download
 url = ${:_profile_base_location_}/instance-kvm-cluster.cfg.jinja2.in
 mode = 644
-md5sum = c0c839198bd4450885de865570b6f406
+md5sum = c20056662fe3aa0fa6ff7ae9a950f325
 download-only = true
 on-update = true
 
@@ -176,6 +177,15 @@ md5sum = 91f05377aff35ffbac7f2687e90b5dcc
 download-only = true
 on-update = true
 
+[template-content]
+recipe = hexagonit.recipe.download
+url = ${:_profile_base_location_}/template/template-content.in
+mode = 644
+filename = template-content.in
+md5sum = 47d492dafe5cb314bdc49bf013d21ead
+download-only = true
+on-update = true
+
 [template-httpd]
 recipe = slapos.recipe.template:jinja2
 filename = template-httpd.cfg

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

@@ -104,7 +104,7 @@
                 "service-port": {
                   "title": "Port of service into the VM (require: kvm-name).",
                   "description": "This will allow to get URL from defined nat-rules. The port should exist in nat-rules of KVM you have referenced by 'kvm-partition-name'",
-                  "type": "number"
+                  "type": "integer"
                 },
                 "url-scheme": {
                   "title": "Scheme of HTTP service into the VM (require: kvm-name).",
@@ -122,6 +122,11 @@
       },
       "type": "object"
     },
+    "authorized-key": {
+      "title": "Public keys for virtual machines.",
+      "description": "Set the list of public keys to add in your virtual machine. The public key file will be available in the VM via url http://10.0.2.100/authorized_keys if you keep the NAT interface enabled",
+      "type": "array"
+    },
     "kvm-partition-dict": {
       "title": "kvm instances definition",
       "description": "kvm instances definition",
@@ -149,7 +154,7 @@
               "type": "integer",
               "default": 10,
               "minimum": 1,
-              "maximum": 80
+              "maximum": 1000
             },
             "disk-type": {
               "title": "Disk type",
@@ -248,7 +253,7 @@
               "description": "Specify the size of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",
               "type": "integer",
               "minimum": 10,
-              "maximum": 100,
+              "maximum": 1000,
               "default": 20
             },
             "external-disk-format": {

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

@@ -30,6 +30,10 @@ config-frontend-instance-name = {{ instance_name ~ ' VNC Frontend' }}
 config-frontend-software-type = {{ dumps(frontend_dict.get('software-type', 'frontend')) }}
 config-frontend-software-url = {{ dumps(frontend_dict.get('software-url', 'http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.92:/software/kvm/software.cfg')) }}
 config-frontend-instance-guid = {{ dumps(frontend_dict.get('instance-guid', '')) }}
+config-name = {{ instance_name }}
+{% if slapparameter_dict.get('authorized-key', []) -%}
+config-authorized-key = {{ slapparameter_dict.get('authorized-key') | join('##') }}
+{% endif -%}
 config-nbd-port = {{ dumps(kvm_parameter_dict.get('nbd-port', 1024)) }}
 config-nbd-host = {{ dumps(kvm_parameter_dict.get('nbd-host', '')) }}
 config-nbd2-port = {{ dumps(kvm_parameter_dict.get('nbd-port2', 1024)) }}

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

@@ -19,7 +19,7 @@
       "type": "integer",
       "default": 10,
       "minimum": 1,
-      "maximum": 80
+      "maximum": 1000
     },
     "disk-type": {
       "title": "Disk type",
@@ -100,15 +100,14 @@
       "description": "Specify the number of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",
       "type": "integer",
       "minimum": 0,
-      "maximum": 4,
       "default": 0
     },
     "external-disk-size": {
       "title": "Number of additional disk to create for virtual machine, in Gigabytes",
       "description": "Specify the number of additional disk to create for virtual machine in data folder of SlapOS Node. Requires instance_storage_home to be configured on SlapOS Node.",
       "type": "integer",
-      "minimum": 10,
-      "maximum": 100,
+      "minimum": 5,
+      "maximum": 1000,
       "default": 20
     },
     "external-disk-format": {
@@ -136,6 +135,11 @@
       "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"
     },
+    "authorized-key": {
+      "title": "Public keys to get from all virtual machines.",
+      "description": "Set the public keys to add in your virtual machine. Keys are separated with '##'. The public key file will be available in the VM via url http://10.0.2.100/authorized_keys if you keep the NAT interface enabled",
+      "type": "string"
+    },
     "frontend-instance-guid": {
       "title": "Frontend Instance ID",
       "description": "Unique identifier of the frontend instance, like \"SOFTINST-11031\".",

software/kvm/instance-kvm.cfg.jinja2

+{% set enable_http = slapparameter_dict.get('enable-http-server', 'False') -%}
 #############################
 #
 # Instanciate kvm
@@ -18,7 +19,8 @@ parts =
 {% if slapparameter_dict.get('enable-http-server', 'False') == 'True' %}
   httpd
   httpd-promise
-
+  publish-host-config
+  
 extends = 
   {{ template_httpd_cfg }}
 {% endif -%}
@@ -272,13 +274,26 @@ nat-rule-url-{{port}} = [${slap-network-information:global-ipv6}]:{{external_por
 {% if slapparameter_dict.get('use-tap', 'False') == 'True' -%}
 tap-ipv4 = ${slap-network-information:tap-ipv4}
 {% endif -%}
+
+{% set kvm_http = 'http://${slap-network-information:local-ipv4}:' ~ slapparameter_dict.get('httpd-port', 8081) -%}
+{% if enable_http == 'True' %}
+{%   if slapparameter_dict.get('use-nat', 'True') == 'True' -%}
+{%     set kvm_http = 'http://10.0.2.100' -%}
+{%   endif %}
+{%   if slapparameter_dict.get('authorized-key', '') -%}
+7_info = Get the publick key file in your VM with the command: wget {{ kvm_http }}/${get-authorized-key:filename}
+{%   endif %}
+{% endif %}
+
 {% if slapparameter_dict.get('use-tap', 'False') == 'True' and tap_network_dict.has_key('ipv4') -%}
 1_info = Use these configurations below to configure interface {{ iface }} in your VM.
 2_info = ${network-config:ifconfig}
 3_info = ${network-config:route-iface}
 4_info = ${network-config:route-network}
 5_info = ${network-config:route-default}
-6_info = In your VM you can run the command: wget -O- http://10.0.2.100/netconfig.sh | /bin/sh -
+{% if enable_http == 'True' %}
+6_info = Or run in your VM the command: wget -O- {{ kvm_http }}/netconfig.sh | /bin/sh -
+{% endif %}
 
 [network-config]
 recipe = plone.recipe.command
@@ -290,6 +305,8 @@ route-network = route add -net ${slap-network-information:tap-network} netmask $
 route-default = route add default gw ${slap-network-information:tap-gateway}
 {%   elif global_ipv4_prefix -%}
 route-default = ip route add {{ global_ipv4_prefix }} via ${slap-network-information:tap-gateway} dev {{ iface }} src ${slap-network-information:tap-ipv4}
+{% else -%}
+route-default =
 {%   endif -%}
 command = 
   echo "#!/bin/sh" > ${:path}
@@ -298,8 +315,35 @@ command =
   echo "${:route-iface}" >> ${:path}
   echo "${:route-network}" >> ${:path}
   echo "${:route-default}" >> ${:path}
+update-command = ${:command}
 {% endif -%}
 
+[get-authorized-key]
+recipe = slapos.recipe.template:jinja2
+template = {{ template_content }}
+filename = authorized_keys
+rendered = ${directory:public}/${:filename}
+public-key = {{ slapparameter_dict.get('authorized-key', '') }}
+context =
+    key content_list :public-key
+    raw sep ##
+
+[publish-host-config]
+recipe = plone.recipe.command
+name = {{ slapparameter_dict.get('name', 'localhost') }}
+{% if slapparameter_dict.get('use-tap', 'False') == 'True' and tap_network_dict.has_key('ipv4') -%}
+local-ipv4 = ${slap-network-information:tap-ipv4}
+{% else -%}
+local-ipv4 = 127.0.0.1
+{% endif -%}
+path-host = ${directory:public}/hostname
+path-ip = ${directory:public}/ipv4
+command = 
+  rm -f ${:path-host}
+  rm -f ${:path-ip}
+  echo "${:name}" > ${:path-host}
+  echo "${:local-ipv4}" > ${:path-ip}
+update-command = ${:command}
 
 [slap-parameter]
 # Default values if not specified
@@ -334,5 +378,8 @@ external-disk-number = 0
 external-disk-size = 20
 external-disk-format = qcow2
 
+# Help to get some configuration files into the vm from http
 enable-http-server = False
 httpd-port = 8081
+# for auto config, the public key file will be available in the VM via url http://10.0.2.100/authorized_key if use-nat = True
+authorized-key = 

software/kvm/instance.cfg.in

@@ -89,6 +89,7 @@ context =
     raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
     raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
     raw template_httpd_cfg ${template-httpd:rendered}
+    raw template_content ${template-content:location}/${template-content:filename}
     raw websockify_executable_location ${buildout:directory}/bin/websockify
 template-parts-destination = ${template-parts:destination}
 template-replicated-destination = ${template-replicated:destination}

software/kvm/template/template-content.in

+{% for content in content_list.split(sep) -%}
+{{ content }}
+{% endfor -%}
\ No newline at end of file