Skip to content

S
slapos.core
Commit 5a067b29 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Introduce "slapos node register" script. 

Squashed commit of the following:

commit a9aa690c5b74de55fed2499cbe6a2a205fbc2550
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Fri Aug 17 10:18:14 2012 +0200

    Introduce use of logger

commit a36d37f766062eb5faed1e179d64a6c6a2bc2e50
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 19:05:09 2012 +0200

    update copyright from 2010 to 2012

commit 167c2a83d45a5e1ca88dab806a5612e981aaf6a9
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 19:02:56 2012 +0200

    Add dry run control in saving old configuration

commit 80eecf880c214c96d780547e95c447d794a87c0e
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 19:00:35 2012 +0200

    Clean code

commit 359cf29263e72f2070659d7fdc1ba227dff85426
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 18:51:43 2012 +0200

    Moved comments to docs

commit 84077e2a926b7d8fdf2495001df9378a301b5bbd
Merge: 42f2b2d 8d7ba61
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 18:46:52 2012 +0200

    Merge remote-tracking branch 'origin/register' into register

commit 42f2b2dae626dfa7ef54f2df97e21d089e5890d7
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 18:46:31 2012 +0200

    Moved register.py to register/

commit 8d7ba617c3d0697683eff48aee8401067d23c413
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 16 10:48:48 2012 +0200

    Display error if wrong usage

commit 927d395f2f3e1f01085c38ea681f16034182e2bd
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Tue Aug 14 14:57:33 2012 +0200

    Added created_tap = false in slapos.cfg

commit 49669afd0514f01b4720f94137c1f76cc47b4904
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Tue Aug 14 12:05:07 2012 +0200

    If a slapos.old file is find, backup will be made in slapos.old.i
    Where i is the lower integer available starting at 1

commit 430406f39753af3f2de26e5a631350c5fb997a3a
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Tue Aug 14 11:04:11 2012 +0200

    Can pass login and password in command line argument

commit 50b19497981d274f327fbe44c619a221539697aa
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 11:49:29 2012 +0200

    Solved bug in writting interface in slapos.cfg

commit 27fe79c859a65095493303da7f81ace0c3643641
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 10:51:10 2012 +0200

    Added option to modify master webservice url for computer registration

commit 9ed75848324789bb01404592780ba7cd2ab65f3c
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 10:17:28 2012 +0200

    Removed useless recursive include in MANIFEST.in

commit 6b2d90c0b8149872b56dc9b565cb4800c3183594
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 10:08:31 2012 +0200

    removed useless parameters in Option function call

commit 34083f2351570a1413bffb18db05bd17a6a8a18c
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 10:06:07 2012 +0200

    removed useless '/'.join in os.path.join

commit 8408a213e655cc9030493d8a4695a4e4c0380c30
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Thu Aug 9 09:53:07 2012 +0200

    Withdraw unused module from code

commit 2805cf2a9927e0b09a60984f7255423602e37e31
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Wed Aug 8 16:17:31 2012 +0200

    Fixed forgotten code

commit 35e0b0ba9c6a7a9782a895b7ff74ab1294d1cad2
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Wed Aug 8 15:53:50 2012 +0200

    Added slapos entry point, just giving acces to register script now

commit d2456a5a5f9135176498ac40088850627e21f88c
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Wed Aug 8 11:46:34 2012 +0200

    Register function is now made to run in command line
    ipv6 interface option added

commit 71bc5c9edae00502cf09abaac4a4d70be96d4a9a
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Tue Aug 7 17:40:56 2012 +0200

    Added creation partition_pki repertory

commit e80fede661858f98d0508bf61c4489b2e174882e
Author: Cédric Le Ninivin <cedric.leninivin@tiolive.com>
Date:   Tue Aug 7 17:01:23 2012 +0200

    Introducing independant register function that saves configuration in /etc/opt/slapos/slapos.cfg
parent a630757b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 522 additions and 0 deletions
setup.py
View file @ 5a067b29
......@@ -58,6 +58,7 @@ setup(name=name,
'slapgrid-supervisord = slapos.grid.svcbackend:supervisord',
'slapproxy = slapos.proxy:main',
'bang = slapos.bang:main',
'slapos = slapos.slapos:main',
]
},
test_suite="slapos.tests",
......
slapos/register/__init__.py 0 → 100644
View file @ 5a067b29
# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
try:
__import__('pkg_resources').declare_namespace(__name__)
except ImportError:
from pkgutil import extend_path
__path__ = extend_path(__path__, __name__)
slapos/register/register.py 0 → 100644
View file @ 5a067b29
This diff is collapsed.
slapos/register/templates/slapos.cfg.in 0 → 100644
View file @ 5a067b29
[slapos]
software_root = /opt/slapgrid
instance_root = /srv/slapgrid
master_url = %(master_url)s
computer_id = %(computer_id)s
key_file = %(key_file)s
cert_file = %(cert_file)s
certificate_repository_path = %(certificate_repository_path)s
[slapformat]
interface_name = %(interface)s
computer_xml = /opt/slapos/slapos.xml
log_file = /opt/slapos/slapformat.log
create_tap = false
partition_amount = %(partition_amount)s
partition_base_name = slappart
user_base_name = slapuser
tap_base_name = slaptap
# You can choose any other local network which does not conflict with your
# current machine configuration
ipv4_local_network = %(ipv4_network)s
%(ipv6_interface)s
[networkcache]
# Define options for binary cache, used to download already compiled software.
download-binary-cache-url = http://www.shacache.org/shacache
download-cache-url = https://www.shacache.org/shacache
download-binary-dir-url = http://www.shacache.org/shadir
# List of signatures of uploaders we trust:
# Romain Courteaud
# Sebastien Robin
# Kazuhiko Shiozaki
# Cedric de Saint Martin
# Yingjie Xu
# Gabriel Monnerat
# Łukasz Nowak
signature-certificate-list =
-----BEGIN CERTIFICATE-----
MIIB4DCCAUkCADANBgkqhkiG9w0BAQsFADA5MQswCQYDVQQGEwJGUjEZMBcGA1UE
CBMQRGVmYXVsdCBQcm92aW5jZTEPMA0GA1UEChMGTmV4ZWRpMB4XDTExMDkxNTA5
MDAwMloXDTEyMDkxNTA5MDAwMlowOTELMAkGA1UEBhMCRlIxGTAXBgNVBAgTEERl
ZmF1bHQgUHJvdmluY2UxDzANBgNVBAoTBk5leGVkaTCBnzANBgkqhkiG9w0BAQEF
AAOBjQAwgYkCgYEApYZv6OstoqNzxG1KI6iE5U4Ts2Xx9lgLeUGAMyfJLyMmRLhw
boKOyJ9Xke4dncoBAyNPokUR6iWOcnPHtMvNOsBFZ2f7VA28em3+E1JRYdeNUEtX
Z0s3HjcouaNAnPfjFTXHYj4um1wOw2cURSPuU5dpzKBbV+/QCb5DLheynisCAwEA
ATANBgkqhkiG9w0BAQsFAAOBgQBCZLbTVdrw3RZlVVMFezSHrhBYKAukTwZrNmJX
mHqi2tN8tNo6FX+wmxUUAf3e8R2Ymbdbn2bfbPpcKQ2fG7PuKGvhwMG3BlF9paEC
q7jdfWO18Zp/BG7tagz0jmmC4y/8akzHsVlruo2+2du2freE8dK746uoMlXlP93g
QUUGLQ==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB8jCCAVugAwIBAgIJAPu2zchZ2BxoMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
BAMMB3RzeGRldjMwHhcNMTExMDE0MTIxNjIzWhcNMTIxMDEzMTIxNjIzWjASMRAw
DgYDVQQDDAd0c3hkZXYzMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrPbh+
YGmo6mWmhVb1vTqX0BbeU0jCTB8TK3i6ep3tzSw2rkUGSx3niXn9LNTFNcIn3MZN
XHqbb4AS2Zxyk/2tr3939qqOrS4YRCtXBwTCuFY6r+a7pZsjiTNddPsEhuj4lEnR
L8Ax5mmzoi9nE+hiPSwqjRwWRU1+182rzXmN4QIDAQABo1AwTjAdBgNVHQ4EFgQU
/4XXREzqBbBNJvX5gU8tLWxZaeQwHwYDVR0jBBgwFoAU/4XXREzqBbBNJvX5gU8t
LWxZaeQwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQA07q/rKoE7fAda
FED57/SR00OvY9wLlFEF2QJ5OLu+O33YUXDDbGpfUSF9R8l0g9dix1JbWK9nQ6Yd
R/KCo6D0sw0ZgeQv1aUXbl/xJ9k4jlTxmWbPeiiPZEqU1W9wN5lkGuLxV4CEGTKU
hJA/yXa1wbwIPGvX3tVKdOEWPRXZLg==
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB7jCCAVegAwIBAgIJAJWA0jQ4o9DGMA0GCSqGSIb3DQEBBQUAMA8xDTALBgNV
BAMMBHg2MXMwIBcNMTExMTI0MTAyNDQzWhgPMjExMTEwMzExMDI0NDNaMA8xDTAL
BgNVBAMMBHg2MXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANdJNiFsRlkH
vq2kHP2zdxEyzPAWZH3CQ3Myb3F8hERXTIFSUqntPXDKXDb7Y/laqjMXdj+vptKk
3Q36J+8VnJbSwjGwmEG6tym9qMSGIPPNw1JXY1R29eF3o4aj21o7DHAkhuNc5Tso
67fUSKgvyVnyH4G6ShQUAtghPaAwS0KvAgMBAAGjUDBOMB0GA1UdDgQWBBSjxFUE
RfnTvABRLAa34Ytkhz5vPzAfBgNVHSMEGDAWgBSjxFUERfnTvABRLAa34Ytkhz5v
PzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAFLDS7zNhlrQYSQO5KIj
z2RJe3fj4rLPklo3TmP5KLvendG+LErE2cbKPqnhQ2oVoj6u9tWVwo/g03PMrrnL
KrDm39slYD/1KoE5kB4l/p6KVOdeJ4I6xcgu9rnkqqHzDwI4v7e8/D3WZbpiFUsY
vaZhjNYKWQf79l6zXfOvphzJ
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAO4V/jiMoICoMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMjMyMCAXDTEyMDIxNjExMTAyM1oYDzIxMTIwMTIzMTExMDIzWjAT
MREwDwYDVQQDDAhDT01QLTIzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
wi/3Z8W9pUiegUXIk/AiFDQ0UJ4JFAwjqr+HSRUirlUsHHT+8DzH/hfcTDX1I5BB
D1ADk+ydXjMm3OZrQcXjn29OUfM5C+g+oqeMnYQImN0DDQIOcUyr7AJc4xhvuXQ1
P2pJ5NOd3tbd0kexETa1LVhR6EgBC25LyRBRae76qosCAwEAAaNQME4wHQYDVR0O
BBYEFMDmW9aFy1sKTfCpcRkYnP6zUd1cMB8GA1UdIwQYMBaAFMDmW9aFy1sKTfCp
cRkYnP6zUd1cMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAskbFizHr
b6d3iIyN+wffxz/V9epbKIZVEGJd/6LrTdLiUfJPec7FaxVCWNyKBlCpINBM7cEV
Gn9t8mdVQflNqOlAMkOlUv1ZugCt9rXYQOV7rrEYJBWirn43BOMn9Flp2nibblby
If1a2ZoqHRxoNo2yTmm7TSYRORWVS+vvfjY=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAIlBksrZVkK8MA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMzU3MCAXDTEyMDEyNjEwNTUyOFoYDzIxMTIwMTAyMTA1NTI4WjAT
MREwDwYDVQQDDAhDT01QLTM1NzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
ts+iGUwi44vtIfwXR8DCnLtHV4ydl0YTK2joJflj0/Ws7mz5BYkxIU4fea/6+VF3
i11nwBgYgxQyjNztgc9u9O71k1W5tU95yO7U7bFdYd5uxYA9/22fjObaTQoC4Nc9
mTu6r/VHyJ1yRsunBZXvnk/XaKp7gGE9vNEyJvPn2bkCAwEAAaNQME4wHQYDVR0O
BBYEFKuGIYu8+6aEkTVg62BRYaD11PILMB8GA1UdIwQYMBaAFKuGIYu8+6aEkTVg
62BRYaD11PILMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAMoTRpBxK
YLEZJbofF7gSrRIcrlUJYXfTfw1QUBOKkGFFDsiJpEg4y5pUk1s5Jq9K3SDzNq/W
it1oYjOhuGg3al8OOeKFrU6nvNTF1BAvJCl0tr3POai5yXyN5jlK/zPfypmQYxE+
TaqQSGBJPVXYt6lrq/PRD9ciZgKLOwEqK8w=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAPHoWu90gbsgMA0GCSqGSIb3DQEBBQUAMBQxEjAQBgNV
BAMMCXZpZmlibm9kZTAeFw0xMjAzMTkyMzIwNTVaFw0xMzAzMTkyMzIwNTVaMBQx
EjAQBgNVBAMMCXZpZmlibm9kZTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
ozBijpO8PS5RTeKTzA90vi9ezvv4vVjNaguqT4UwP9+O1+i6yq1Y2W5zZxw/Klbn
oudyNzie3/wqs9VfPmcyU9ajFzBv/Tobm3obmOqBN0GSYs5fyGw+O9G3//6ZEhf0
NinwdKmrRX+d0P5bHewadZWIvlmOupcnVJmkks852BECAwEAAaNQME4wHQYDVR0O
BBYEFF9EtgfZZs8L2ZxBJxSiY6eTsTEwMB8GA1UdIwQYMBaAFF9EtgfZZs8L2ZxB
JxSiY6eTsTEwMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAc43YTfc6
baSemaMAc/jz8LNLhRE5dLfLOcRSoHda8y0lOrfe4lHT6yP5l8uyWAzLW+g6s3DA
Yme/bhX0g51BmI6gjKJo5DoPtiXk/Y9lxwD3p7PWi+RhN+AZQ5rpo8UfwnnN059n
yDuimQfvJjBFMVrdn9iP6SfMjxKaGk6gVmI=
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIB9jCCAV+gAwIBAgIJAMNZBmoIOXPBMA0GCSqGSIb3DQEBBQUAMBMxETAPBgNV
BAMMCENPTVAtMTMyMCAXDTEyMDUwMjEyMDQyNloYDzIxMTIwNDA4MTIwNDI2WjAT
MREwDwYDVQQDDAhDT01QLTEzMjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
6peZQt1sAmMAmSG9BVxxcXm8x15kE9iAplmANYNQ7z2YO57c10jDtlYlwVfi/rct
xNUOKQtc8UQtV/fJWP0QT0GITdRz5X/TkWiojiFgkopza9/b1hXs5rltYByUGLhg
7JZ9dZGBihzPfn6U8ESAKiJzQP8Hyz/o81FPfuHCftsCAwEAAaNQME4wHQYDVR0O
BBYEFNuxsc77Z6/JSKPoyloHNm9zF9yqMB8GA1UdIwQYMBaAFNuxsc77Z6/JSKPo
yloHNm9zF9yqMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAl4hBaJy1
cgiNV2+Z5oNTrHgmzWvSY4duECOTBxeuIOnhql3vLlaQmo0p8Z4c13kTZq2s3nhd
Loe5mIHsjRVKvzB6SvIaFUYq/EzmHnqNdpIGkT/Mj7r/iUs61btTcGUCLsUiUeci
Vd0Ozh79JSRpkrdI8R/NRQ2XPHAo+29TT70=
-----END CERTIFICATE-----
slapos/slapos.py 0 → 100644
View file @ 5a067b29
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2012 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import sys
from register.register import main as node_register
def main():
if len(sys.argv) < 3:
print "Usage: slapos node register NODE_NAME [options]"
print "%s: error: Incorrect number of arguments" % sys.argv[0]
return 0
"Run default configuration."
if sys.argv[1] == "node" and sys.argv[2] == "register":
sys.argv=sys.argv[2:]
node_register()
else :
print "Usage: slapos node register NODE_NAME [options]"
print "%s: error: Incorrect arguments" % sys.argv[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