Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
04938bff
Commit
04938bff
authored
5 years ago
by
Łukasz Nowak
Committed by
Łukasz Nowak
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
software/kvm: Drop frontend software type
parent
aaee1c5a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
131 deletions
+2
-131
software/kvm/README.rst
software/kvm/README.rst
+1
-20
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-5
software/kvm/instance-frontend.cfg.in
software/kvm/instance-frontend.cfg.in
+0
-101
software/kvm/instance.cfg.in
software/kvm/instance.cfg.in
+0
-1
software/kvm/software.cfg
software/kvm/software.cfg
+0
-4
No files found.
software/kvm/README.rst
View file @
04938bff
...
@@ -4,8 +4,7 @@ kvm
...
@@ -4,8 +4,7 @@ kvm
Introduction
Introduction
------------
------------
This software release is used to deploy KVM instances, NBD instances and
This software release is used to deploy KVM and NBD instances.
Frontend instances of KVM.
For extensive parameters definition, please look at parameter-input-schema.json.
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
...
@@ -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
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.
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",
)
This diff is collapsed.
Click to expand it.
software/kvm/buildout.hash.cfg
View file @
04938bff
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[template]
[template]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum =
028b6a6456d744c11b1bb2c51ecd51b2
md5sum =
2cbfd6b08c65369c1d45cf3ba2ff335a
[template-kvm]
[template-kvm]
filename = instance-kvm.cfg.jinja2
filename = instance-kvm.cfg.jinja2
...
@@ -49,10 +49,6 @@ md5sum = b617d64de73de1eed518185f310bbc82
...
@@ -49,10 +49,6 @@ md5sum = b617d64de73de1eed518185f310bbc82
filename = instance-nbd.cfg.in
filename = instance-nbd.cfg.in
md5sum = f634a5249b773658b7a7bc9fa9bb0368
md5sum = f634a5249b773658b7a7bc9fa9bb0368
[template-frontend]
filename = instance-frontend.cfg.in
md5sum = 57a4be74e5afb00e378bc726cd7771f8
[template-ansible-promise]
[template-ansible-promise]
filename = template/ansible-promise.in
filename = template/ansible-promise.in
md5sum = 2036bf145f472f62ef8dee5e729328fd
md5sum = 2036bf145f472f62ef8dee5e729328fd
...
...
This diff is collapsed.
Click to expand it.
software/kvm/instance-frontend.cfg.in
deleted
100644 → 0
View file @
aaee1c5a
#############################
#
# 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 =
This diff is collapsed.
Click to expand it.
software/kvm/instance.cfg.in
View file @
04938bff
...
@@ -13,7 +13,6 @@ default = $${:kvm}
...
@@ -13,7 +13,6 @@ default = $${:kvm}
kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
kvm-cluster = $${dynamic-template-kvm-cluster:rendered}
kvm = $${dynamic-template-kvm:rendered}
kvm = $${dynamic-template-kvm:rendered}
nbd = ${template-nbd:output}
nbd = ${template-nbd:output}
frontend = ${template-frontend:output}
kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
kvm-resilient = $${dynamic-template-kvm-resilient:rendered}
kvm-import = $${dynamic-template-kvm-import:rendered}
kvm-import = $${dynamic-template-kvm-import:rendered}
...
...
This diff is collapsed.
Click to expand it.
software/kvm/software.cfg
View file @
04938bff
...
@@ -147,10 +147,6 @@ mode = 0755
...
@@ -147,10 +147,6 @@ mode = 0755
<= template-file-base
<= template-file-base
output = ${buildout:directory}/template-nbd.cfg
output = ${buildout:directory}/template-nbd.cfg
[template-frontend]
<= template-file-base
output = ${buildout:directory}/template-frontend.cfg
[template-ansible-promise]
[template-ansible-promise]
<= download-template-base
<= download-template-base
filename = ansible-promise.in
filename = ansible-promise.in
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment