Skip to content

slapos
slapos
Commit 719f05a9 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into zope4py2

parents 057d3a46 ad0562fc
Hide whitespace changes
Inline Side-by-side
Showing with 163 additions and 194 deletions
setup.py
View file @ 719f05a9
...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages ...@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '1.0.252' version = '1.0.253'
name = 'slapos.cookbook' name = 'slapos.cookbook'
long_description = open("README.rst").read() long_description = open("README.rst").read()
......
slapos/recipe/pbs.py
View file @ 719f05a9
...@@ -226,15 +226,9 @@ class Recipe(GenericSlapRecipe, Notify, Callback): ...@@ -226,15 +226,9 @@ class Recipe(GenericSlapRecipe, Notify, Callback):
(self.options['sshclient-binary'], (self.options['sshclient-binary'],
parsed_url.username, parsed_url.hostname, parsed_url.port))) parsed_url.username, parsed_url.hostname, parsed_url.port)))
# Create known_hosts file by default. # Create known_hosts file
# In some case, we don't want to create it (case where we share IP mong partitions) known_hostname = "[%s]:%s" % (parsed_url.hostname, parsed_url.port)
if not self.isTrueValue(self.options.get('ignore-known-hosts-file')): known_hosts_file[known_hostname] = entry['server-key'].strip()
# Migration code: if known_hosts file contains entry with just IP, then it
# is updated to use [IP]:port. It allows to share same IP among partitions
if parsed_url.hostname in known_hosts_file:
del known_hosts_file[parsed_url.hostname]
known_hostname = "[%s]:%s" % (parsed_url.hostname, parsed_url.port)
known_hosts_file[known_hostname] = entry['server-key'].strip()
notifier_wrapper_path = os.path.join(self.options['wrappers-directory'], slave_id) notifier_wrapper_path = os.path.join(self.options['wrappers-directory'], slave_id)
rdiff_wrapper_path = notifier_wrapper_path + '_raw' rdiff_wrapper_path = notifier_wrapper_path + '_raw'
......
software/erp5testnode/testsuite/instance-kvm-resilient-test.cfg.jinja2
View file @ 719f05a9
...@@ -52,7 +52,6 @@ config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum} ...@@ -52,7 +52,6 @@ config-virtual-hard-drive-md5sum = ${slap-parameter:virtual-hard-drive-md5sum}
config-virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped} config-virtual-hard-drive-gzipped = ${slap-parameter:virtual-hard-drive-gzipped}
config-resiliency-backup-periodicity = */5 * * * * config-resiliency-backup-periodicity = */5 * * * *
config-resilient-clone-number = 1 config-resilient-clone-number = 1
config-ignore-known-hosts-file = false
return = ipv6 return = ipv6
# XXX What to do? # XXX What to do?
sla-computer_guid = ${slap-connection:computer-id} sla-computer_guid = ${slap-connection:computer-id}
......
software/kvm/instance-kvm-resilient-input-schema.json
View file @ 719f05a9
...@@ -56,13 +56,6 @@ ...@@ -56,13 +56,6 @@
"type": "string", "type": "string",
"default": "2W", "default": "2W",
"optional": true "optional": true
},
"ignore-known-hosts-file": {
"title": "Ignore known_hosts file",
"description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).",
"type": "boolean",
"default": false,
"optional": true
} }
} }
} }
......
software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -72,25 +72,25 @@ ...@@ -72,25 +72,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd1900-enb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -60,25 +60,25 @@ ...@@ -60,25 +60,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -78,30 +78,30 @@ ...@@ -78,30 +78,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -66,30 +66,30 @@ ...@@ -66,30 +66,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -72,25 +72,25 @@ ...@@ -72,25 +72,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd2600-enb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -60,25 +60,25 @@ ...@@ -60,25 +60,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -78,30 +78,30 @@ ...@@ -78,30 +78,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -66,30 +66,30 @@ ...@@ -66,30 +66,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -72,25 +72,25 @@ ...@@ -72,25 +72,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd3500-enb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -60,25 +60,25 @@ ...@@ -60,25 +60,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -78,30 +78,30 @@ ...@@ -78,30 +78,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -66,30 +66,30 @@ ...@@ -66,30 +66,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -72,25 +72,25 @@ ...@@ -72,25 +72,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd3700-enb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"mme_list": { "mme_list": {
"title": "MME list", "title": "MME list",
"description": "Optionnal. List of MME to which the gNodeB is connected", "description": "Optionnal. List of MME to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"mme_addr": { "mme_addr": {
...@@ -60,25 +60,25 @@ ...@@ -60,25 +60,25 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)", "description": "List of PLMNs broadcasted by the eNodeB, at most 6 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"attach_without_pdn": { "attach_without_pdn": {
"default": false, "default": false,
"title": "Attach Without PDN", "title": "Attach Without PDN",
"description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.", "description": "Optional boolean. Indicates if PLMN supports attach without PDN connectivity.",
"type": "boolean" "type": "boolean"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
......
software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json
View file @ 719f05a9
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -78,30 +78,30 @@ ...@@ -78,30 +78,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json
View file @ 719f05a9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
"amf_list": { "amf_list": {
"title": "AMF list", "title": "AMF list",
"description": "Optionnal. List of AMF to which the gNodeB is connected", "description": "Optionnal. List of AMF to which the gNodeB is connected",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"amf_addr": { "amf_addr": {
...@@ -66,30 +66,30 @@ ...@@ -66,30 +66,30 @@
"plmn_list": { "plmn_list": {
"title": "PLMN list", "title": "PLMN list",
"description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)", "description": "List of PLMNs broadcasted by the gNodeB, at most 12 (default: 00101)",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"plmn": { "plmn": {
"default": "00101", "default": "00101",
"title": "Public Land Mobile Network", "title": "Public Land Mobile Network",
"description": "Public Land Mobile Network", "description": "Public Land Mobile Network",
"type": "string" "type": "string"
}, },
"tac": { "tac": {
"default": 100, "default": 100,
"title": "Tracking Area Code", "title": "Tracking Area Code",
"description": "Integer (range 0 to 16777215)", "description": "Integer (range 0 to 16777215)",
"type": "number" "type": "number"
}, },
"ranac": { "ranac": {
"title": "Optional integer (range 0 to 255)", "title": "Optional integer (range 0 to 255)",
"description": "RAN Area Code", "description": "RAN Area Code",
"type": "number" "type": "number"
}, },
"reserved": { "reserved": {
"default": false, "default": false,
"title": "Reserved", "title": "Reserved",
"description": "True if the cell is reserved for operator use.", "description": "True if the cell is reserved for operator use.",
"type": "boolean" "type": "boolean"
} }
}, },
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
"nssai": { "nssai": {
"title": "AMF slices configuration", "title": "AMF slices configuration",
"description": "AMF slices configuration.", "description": "AMF slices configuration.",
"patternProperties": { "patternProperties": {
".*": { ".*": {
"properties": { "properties": {
"sst": { "sst": {
......
software/ors-amarisoft/software-tdd1900.cfg.json
View file @ 719f05a9
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
"index": 5 "index": 5
} }
} }
} }
\ No newline at end of file
software/ors-amarisoft/software-tdd2600.cfg.json
View file @ 719f05a9
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
"index": 5 "index": 5
} }
} }
} }
\ No newline at end of file
software/ors-amarisoft/software-tdd3500.cfg.json
View file @ 719f05a9
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
"index": 5 "index": 5
} }
} }
} }
\ No newline at end of file
software/ors-amarisoft/software-tdd3700.cfg.json
View file @ 719f05a9
...@@ -53,4 +53,4 @@ ...@@ -53,4 +53,4 @@
"index": 5 "index": 5
} }
} }
} }
\ No newline at end of file
software/slaprunner/instance-runner-resilient-input-schema.json
View file @ 719f05a9
...@@ -58,13 +58,6 @@ ...@@ -58,13 +58,6 @@
"type": "string", "type": "string",
"default": "2W", "default": "2W",
"optional": true "optional": true
},
"ignore-known-hosts-file": {
"title": "Ignore known_hosts file",
"description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, webrunner).",
"type": "boolean",
"default": false,
"optional": true
} }
} }
} }
......
software/theia/instance-resilient-input-schema.json
View file @ 719f05a9
...@@ -59,13 +59,6 @@ ...@@ -59,13 +59,6 @@
"type": "string", "type": "string",
"default": "2W", "default": "2W",
"optional": true "optional": true
},
"ignore-known-hosts-file": {
"title": "Ignore known_hosts file",
"description": "Set either to fill known_hosts file for ssh or not. Useful if main instance and PBS are using the same IP (slapos proxy, theia).",
"type": "boolean",
"default": false,
"optional": true
} }
} }
} }
......
stack/resilient/buildout.hash.cfg
View file @ 719f05a9
...@@ -26,11 +26,11 @@ md5sum = 2ef471242ab1fe9d0998f49304bfa066 ...@@ -26,11 +26,11 @@ md5sum = 2ef471242ab1fe9d0998f49304bfa066
[template-pull-backup] [template-pull-backup]
filename = instance-pull-backup.cfg.in filename = instance-pull-backup.cfg.in
md5sum = 44a3166048a81d0d76d69527b1934ef7 md5sum = 1b8645835f04081861266436505fd28f
[template-replicated] [template-replicated]
filename = template-replicated.cfg.in filename = template-replicated.cfg.in
md5sum = 2eea3b0227c3ae9e44cfc41df9930fa7 md5sum = ba90373d7ba062a6b8117b821a2d7765
[template-parts] [template-parts]
filename = template-parts.cfg.in filename = template-parts.cfg.in
......
stack/resilient/instance-pull-backup.cfg.in
View file @ 719f05a9
...@@ -124,7 +124,6 @@ pull-push-maximum-run = 5 ...@@ -124,7 +124,6 @@ pull-push-maximum-run = 5
# XXX: this should be named "notifier-host" # XXX: this should be named "notifier-host"
notifier-url = http://[$${notifier:host}]:$${notifier:port} notifier-url = http://[$${notifier:host}]:$${notifier:port}
slave-instance-list = {{ dumps(slave_instance_list) }} slave-instance-list = {{ dumps(slave_instance_list) }}
ignore-known-hosts-file = {{ slapparameter_dict.get('ignore-known-hosts-file', 'false') }}
# To get a verbose feed about PBS state # To get a verbose feed about PBS state
instance-root-name = $${monitor-instance-parameter:root-instance-title} instance-root-name = $${monitor-instance-parameter:root-instance-title}
log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/ log-url = $${monitor-publish-parameters:monitor-base-url}/private/notifier/
......
stack/resilient/template-replicated.cfg.in
View file @ 719f05a9
...@@ -196,7 +196,6 @@ software-type = pull-backup ...@@ -196,7 +196,6 @@ software-type = pull-backup
[request-pbs-{{namebase}}-{{id}}] [request-pbs-{{namebase}}-{{id}}]
<= request-pbs-common <= request-pbs-common
name = PBS ({{namebase}} / {{id}}) name = PBS ({{namebase}} / {{id}})
config-ignore-known-hosts-file = ${slap-parameter:ignore-known-hosts-file}
config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}} config-monitor-title = PBS ${slap-connection:computer-id}-{{namebase}}-{{id}}
{% for key, value in six.iteritems(monitor_dict) -%} {% for key, value in six.iteritems(monitor_dict) -%}
config-{{ key }} = {{ value }} config-{{ key }} = {{ value }}
...@@ -294,6 +293,5 @@ sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid} ...@@ -294,6 +293,5 @@ sla-instance_guid = ${request-pbs-{{namebase}}-{{id}}:instance_guid}
{{namebase}}{{id}}-computer-guid = {{namebase}}{{id}}-computer-guid =
pbs-{{namebase}}{{id}}-computer-guid = pbs-{{namebase}}{{id}}-computer-guid =
{% endfor %} {% endfor %}
ignore-known-hosts-file = false
{% endmacro %} {% endmacro %}
stack/slapos.cfg
View file @ 719f05a9
...@@ -194,7 +194,7 @@ setproctitle = 1.1.10 ...@@ -194,7 +194,7 @@ setproctitle = 1.1.10
setuptools-dso = 1.7 setuptools-dso = 1.7
rubygemsrecipe = 0.4.3 rubygemsrecipe = 0.4.3
six = 1.12.0 six = 1.12.0
slapos.cookbook = 1.0.252 slapos.cookbook = 1.0.253
slapos.core = 1.7.9 slapos.core = 1.7.9
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.extension.shared = 1.0 slapos.extension.shared = 1.0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7