software/kvm: Drop frontend software type

software/kvm/README.rst

@@ -4,8 +4,7 @@ kvm
 Introduction
 ------------
 
-This software release is used to deploy KVM instances, NBD instances and
-Frontend instances of KVM.
+This software release is used to deploy KVM and NBD instances.
 
 For extensive parameters definition, please look at parameter-input-schema.json.
 
@@ -120,21 +119,3 @@ files for more instance parameters (cpu-count, ram-size, disk-size, specific loc
 
 Then, if you want one of the two clones to takeover, you need to login into
 the hosting machine, go to the partition of the clone, and invoke bin/takeover.
-
-
-KVM Frontend Master Instance (will host all frontend Slave Instances)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This type of instance will allow to host any frontend slave instance requested
-by KVM instances. Slave instances (and thus KVM instance) will be accessible
-at : https://mydomain.com/instancereference .
-
-::
-  mykvmfrontend = request(
-      software_release=kvm,
-      partition_reference="mykvmfrontend",
-      partition_parameter_kw={
-          "domain":"mydomain.com"
-      },
-      software_type="frontend",
-  )

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 028b6a6456d744c11b1bb2c51ecd51b2
+md5sum = 2cbfd6b08c65369c1d45cf3ba2ff335a
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2
@@ -49,10 +49,6 @@ md5sum = b617d64de73de1eed518185f310bbc82
 filename = instance-nbd.cfg.in
 md5sum = f634a5249b773658b7a7bc9fa9bb0368
 
-[template-frontend]
-filename = instance-frontend.cfg.in
-md5sum = 57a4be74e5afb00e378bc726cd7771f8
-
 [template-ansible-promise]
 filename = template/ansible-promise.in
 md5sum = 2036bf145f472f62ef8dee5e729328fd

software/kvm/instance-frontend.cfg.in

-#############################
-#
-# Instanciate kvm frontend
-#
-#############################
-[buildout]
-parts =
-  ca-frontend
-  certificate-authority
-  frontend-promise-ipv6
-  frontend-promise-ipv4
-
-eggs-directory = ${buildout:eggs-directory}
-develop-eggs-directory = ${buildout:develop-eggs-directory}
-offline = true
-
-[rootdirectory]
-recipe = slapos.cookbook:mkdirectory
-etc = $${buildout:directory}/etc
-bin = $${buildout:directory}/bin
-srv = $${buildout:directory}/srv
-var = $${buildout:directory}/var
-
-[basedirectory]
-recipe = slapos.cookbook:mkdirectory
-services = $${rootdirectory:etc}/run
-promises = $${rootdirectory:etc}/promise
-nodejs-conf = $${rootdirectory:etc}/nodejs
-run = $${rootdirectory:var}/run
-log = $${rootdirectory:var}/log
-ca-dir = $${rootdirectory:srv}/ssl
-backup = $${rootdirectory:srv}/backup
-
-[directory]
-recipe = slapos.cookbook:mkdirectory
-ca-dir = $${rootdirectory:srv}/ssl
-
-[frontend-instance]
-recipe = slapos.cookbook:kvm.frontend
-domain = $${ca-frontend:name}
-# port = $${slap-parameter:port}
-ipv6 = $${slap-network-information:global-ipv6}
-ipv4 = $${slap-network-information:local-ipv4}
-port = $${slap-parameter:port}
-http-redirection = $${slap-parameter:http-redirection}
-ssl-key-path = $${ca-frontend:key-file}
-ssl-cert-path = $${ca-frontend:cert-file}
-slave-instance-list = $${slap-parameter:slave_instance_list}
-map-path = $${basedirectory:nodejs-conf}/proxy_table.json
-conf-path = $${basedirectory:nodejs-conf}/kvm-proxy.js
-wrapper-path = $${rootdirectory:bin}/kvm_frontend
-node-binary = ${nodejs:location}/bin/node
-node-env = ${buildout:parts-directory}:${npm-modules:location}/node_modules
-shell-path = ${dash:location}/bin/dash
-
-[frontend-promise-ipv6]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/frontend_promise
-hostname = $${frontend-instance:ipv6}
-port = $${frontend-instance:port}
-
-[frontend-promise-ipv4]
-recipe = slapos.cookbook:check_port_listening
-path = $${basedirectory:promises}/frontend_promise
-hostname = $${frontend-instance:ipv4}
-port = $${frontend-instance:port}
-
-[certificate-authority]
-recipe = slapos.cookbook:certificate_authority
-openssl-binary = ${openssl:location}/bin/openssl
-ca-dir = $${basedirectory:ca-dir}
-requests-directory = $${cadirectory:requests}
-wrapper = $${basedirectory:services}/certificate_authority
-ca-private = $${cadirectory:private}
-ca-certs = $${cadirectory:certs}
-ca-newcerts = $${cadirectory:newcerts}
-ca-crl = $${cadirectory:crl}
-
-[cadirectory]
-recipe = slapos.cookbook:mkdirectory
-requests = $${basedirectory:ca-dir}/requests/
-private = $${basedirectory:ca-dir}/private/
-certs = $${basedirectory:ca-dir}/certs/
-newcerts = $${basedirectory:ca-dir}/newcerts/
-crl = $${basedirectory:ca-dir}/crl/
-
-[ca-frontend]
-<= certificate-authority
-recipe = slapos.cookbook:certificate_authority.request
-key-file = $${basedirectory:nodejs-conf}/nodejs.key
-cert-file = $${basedirectory:nodejs-conf}/nodejs.crt
-executable = $${frontend-instance:wrapper-path}
-wrapper = $${basedirectory:services}/nodejs
-# Put domain name
-name = $${slap-parameter:domain}
-
-[slap-parameter]
-# Default value if no port is specified
-port = 4443
-http-redirection = 0
-slave_instance_list =

software/kvm/instance.cfg.in

@@ -13,7 +13,6 @@ default = $${:kvm}
 kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
 kvm = $${dynamic-template-kvm:rendered}
 nbd = ${template-nbd:output}
-frontend = ${template-frontend:output}
 
 kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
 kvm-import = $${dynamic-template-kvm-import:rendered}

software/kvm/software.cfg

@@ -147,10 +147,6 @@ mode = 0755
 <= template-file-base
 output = ${buildout:directory}/template-nbd.cfg
 
-[template-frontend]
-<= template-file-base
-output = ${buildout:directory}/template-frontend.cfg
-
 [template-ansible-promise]
 <= download-template-base
 filename = ansible-promise.in