Infra
/
cucchiaiata
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop

This commit is contained in:
Emmanuel Garette 2020-08-12 08:36:58 +02:00
parent 5403d45632 39206076f1
commit 5bef815c43
3 changed files with 105 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
provisioning_example.sh
View File

@ -1,96 +1,134 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Configuration
# -> base (cadoles' servermodel)
# |-> cluster (servermodel)
# | '-> node1.cadoles.com (server)
# |
# |-> aca (servermodel) + unbound (AS) + openssh (AS)
# | '-> etab1 (servermodel) -------------------,
# | |
# '-> fedora-32 (cadoles' servermodel) |
# '-> unbound (servermodel) + unbound (AS) --|
# '-> unbound_etab1 (servermodel)
# '-> dns.cadoles.com (server)
# Site and zone
# + = = = = = = = = = = = = = = = = = = = = = = = +
# " SITE cluster "
# " "
# " +-------------------+ "
# " | node1.cadoles.com | "-----------+
# " | | " |
# " +-------------------+ " |
# " " +~~~~~~~~+
# + = = = = = = = = = = = = = = = = = = = = = = = + ! ZONE !
# ! pedago !
# + = = = = = = = = = = = = = = = = = = = = = = = + +~~~~~~~~+
# " SITE etab1 " |
# " +-----------------+ " |
# " | dns.cadoles.com | "-----------+
# " | | "
# " +-----------------+ "
# " "
# + = = = = = = = = = = = = = = = = = = = = = = = +
# #
# + = = = = = = = = = = = = = = = = = = = = = = = = = = = +
# " SITE cluster " # Cluster description:
# " +---------------------+ " # +-----------------------------+
# " | NEBULACLUSTER | " # + cluster.cadoles.com +
# " | cluster.cadoles.com | " # + +
# " +---------------------+ " # + +--------------------+ +
# " | " # + + node1.cadoles.com + +
# " +-------------------+ " # + + + +
# " | NODE | "-----------+ # + + + +
# " | node1.cadoles.com | " | # + +--------------------+ +
# " +-------------------+ " | # + +
# " | " +~~~~~~~~+ # +-----------------------------+
# + = = = = = = = = = = = = = | = = = = = = = = = = = = = + ! ZONE !
# | ! pedago ! # Cluster execution:
# + = = = = = = = = = = = = = | = = = = = = = = = = = = = + +~~~~~~~~+ # +-----------------------------+
# " SITE etab1 | " | # + cluster.cadoles.com +
# " +-----------------+ " | # + +
# " | VM DNS | "-----------+ # + +--------------------+ +
# " | dns.cadoles.com | " # + + dns.cadoles.com + +
# " +-----------------+ " # + + + +
# " " # + + + +
# + = = = = = = = = = = = = = = = = = = = = = = = = = = = + # + +--------------------+ +
# # + +
# +-----------------------------+
set -xe set -xe
verif() { verif() {
i=0 i=0
argv=("$@") argv=("$@")
for V in creole.reseau.unbound_route_address creole.reseau.unbound_domain_name creole.serveur_dns.unbound_local_zones creole.reseau.unbound_ip_address_cidr; do for V in configuration.reseau.unbound_route_address configuration.reseau.unbound_domain_name configuration.serveur_dns.unbound_local_zones configuration.reseau.unbound_ip_address_cidr; do
i=$((i+1)) i=$((i+1))
R=$(cucchiaiata-cli setting.session.$1.get -s $S -n $V | jq -Mcr .content[]) R=$(cucchiaiata-cli "setting.session.$1.get" -s "$S" -n "$V" | jq -Mcr .content[])
[ $R = "${argv[i]}" ] [ "$R" = "${argv[i]}" ]
done done
} }
# Import EOLE # Import Cadoles seed
cucchiaiata-cli setting.source.create -o cadoles -u http://localhost cucchiaiata-cli setting.source.create -o cadoles -d /srv/risotto/seed/cadoles
cucchiaiata-cli setting.source.release.create -o cadoles -r 2020.1.1 -e last
cucchiaiata-cli setting.applicationservice.dataset.updated -o cadoles -e last
cucchiaiata-cli setting.servermodel.dataset.updated -o cadoles -e last
# Create a new user and set role 'server_rw' for this server # Create a new user and set role 'server_rw' for the server dns.cadoles.com
cucchiaiata-cli user.user.create -u gnunux -n gnunux -s gnunux cucchiaiata-cli user.user.create -u gnunux -n gnunux -s gnunux
cucchiaiata-cli user.role.create -u gnunux -o 'server_rw' -a 'Server.ServerName' -v dns.cadoles.com cucchiaiata-cli user.role.create -u gnunux -o 'server_rw' -a 'Server.ServerName' -v dns.cadoles.com
# A servermodel for node in cluster
cucchiaiata-cli setting.servermodel.create -m cluster -d "Node in the cluster" -p base -o cadoles -e last
# Heritage # Heritage
## ACA ## ACA
cucchiaiata-cli setting.servermodel.create -m aca -d Aca -p base -o cadoles -e last cucchiaiata-cli setting.servermodel.create -m aca -d Aca -p base -o cadoles -e last
cucchiaiata-cli setting.servermodel.dependency.add -m aca -a unbound -o cadoles -e last cucchiaiata-cli setting.servermodel.dependency.add -m aca -a unbound -o cadoles -e last
S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id)
verif servermodel null null [] null verif servermodel null null [] null
cucchiaiata-cli setting.session.servermodel.configure -s $S --creole.reseau.unbound_route_address 192.168.1.2 cucchiaiata-cli setting.session.servermodel.configure -s "$S" --configuration.reseau.unbound_route_address 192.168.1.2
cucchiaiata-cli setting.session.servermodel.configure -s $S --creole.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24 cucchiaiata-cli setting.session.servermodel.configure -s "$S" --configuration.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24
verif servermodel 192.168.1.2 null [] null verif servermodel 192.168.1.2 null [] null
cucchiaiata-cli setting.session.servermodel.stop -s $S -a cucchiaiata-cli setting.session.servermodel.stop -s "$S" -a
## etab1 ## etab1
cucchiaiata-cli setting.servermodel.create -m etab1 -d "Etab 1" -p aca -o internal -e last cucchiaiata-cli setting.servermodel.create -m etab1 -d "Etab 1" -p aca -o internal -e last
S=$(cucchiaiata-cli setting.session.servermodel.start -m etab1 -e last| jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m etab1 -e last| jq -r .session_id)
cucchiaiata-cli setting.session.servermodel.configure -s $S --creole.reseau.unbound_domain_name dns.cadoles.com cucchiaiata-cli setting.session.servermodel.configure -s "$S" --configuration.reseau.unbound_domain_name dns.cadoles.com
verif servermodel 192.168.1.2 dns.cadoles.com [] null verif servermodel 192.168.1.2 dns.cadoles.com [] null
cucchiaiata-cli setting.session.servermodel.stop -s $S -a cucchiaiata-cli setting.session.servermodel.stop -s "$S" -a
## unbound ## unbound
cucchiaiata-cli setting.servermodel.create -m unbound -d "generic unbound configuration" -p fedora-31 -o cadoles -e last cucchiaiata-cli setting.servermodel.create -m unbound -d "generic unbound configuration" -p fedora-32 -o cadoles -e last
cucchiaiata-cli setting.servermodel.dependency.add -m unbound -a unbound -o cadoles -e last cucchiaiata-cli setting.servermodel.dependency.add -m unbound -a unbound -o cadoles -e last
S=$(cucchiaiata-cli setting.session.servermodel.start -m unbound -e last| jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m unbound -e last| jq -r .session_id)
cucchiaiata-cli setting.session.servermodel.configure -s $S --creole.serveur_dns.unbound_local_zones cadoles.com cucchiaiata-cli setting.session.servermodel.configure -s "$S" --configuration.serveur_dns.unbound_local_zones cadoles.com
cucchiaiata-cli setting.session.servermodel.filter -s $S -n unbound cucchiaiata-cli setting.session.servermodel.filter -s "$S" -n unbound
cucchiaiata-cli setting.session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi cucchiaiata-cli setting.session.servermodel.configure -s "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi
cucchiaiata-cli setting.session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.1.25 cucchiaiata-cli setting.session.servermodel.configure -s "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.1.25
cucchiaiata-cli setting.session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME cucchiaiata-cli setting.session.servermodel.configure -s "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME
cucchiaiata-cli setting.session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com cucchiaiata-cli setting.session.servermodel.configure -s "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com
cucchiaiata-cli setting.session.servermodel.filter -s $S -n creole cucchiaiata-cli setting.session.servermodel.filter -s "$S" -n configuration
verif servermodel null null '["cadoles.com"]' null verif servermodel null null '["cadoles.com"]' null
cucchiaiata-cli setting.session.servermodel.stop -s $S -a cucchiaiata-cli setting.session.servermodel.stop -s "$S" -a
## unbound_etab1 ## unbound_etab1
cucchiaiata-cli setting.servermodel.create -m unbound_etab1 -d "unbound configuration for etab1" -p etab1 unbound -o internal -e last cucchiaiata-cli setting.servermodel.create -m unbound_etab1 -d "unbound configuration for etab1" -p etab1 unbound -o internal -e last
S=$(cucchiaiata-cli setting.session.servermodel.start -m unbound_etab1 -e last | jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m unbound_etab1 -e last | jq -r .session_id)
verif servermodel 192.168.1.2 dns.cadoles.com '["cadoles.com"]' null verif servermodel 192.168.1.2 dns.cadoles.com '["cadoles.com"]' null
cucchiaiata-cli setting.session.servermodel.stop -s "$S" -a
# Create a site, a zone and servers # Create sites and zone
cucchiaiata-cli infra.site.create -i etab1 -d "Etab 1"
cucchiaiata-cli infra.site.create -i cluster -d "Cluster" cucchiaiata-cli infra.site.create -i cluster -d "Cluster"
cucchiaiata-cli infra.site.create -i etab1 -d "Etab 1"
cucchiaiata-cli infra.zone.create -z pedago -d "Pedago" -s etab1 cluster -n "192.168.1.0/24" -t "192.168.1.10" -e "192.168.1.100" -q 192.168.1.1 -g 192.168.1.254 cucchiaiata-cli infra.zone.create -z pedago -d "Pedago" -s etab1 cluster -n "192.168.1.0/24" -t "192.168.1.10" -e "192.168.1.100" -q 192.168.1.1 -g 192.168.1.254
# Create a servermodel for node in cluster and a server "node1"
cucchiaiata-cli setting.servermodel.create -m cluster -d "Node in the cluster" -p base -o cadoles -e last
cucchiaiata-cli infra.server.create -s node1.cadoles.com -d node1 -m cluster -e last -i cluster -z pedago cucchiaiata-cli infra.server.create -s node1.cadoles.com -d node1 -m cluster -e last -i cluster -z pedago
# Create a new server "dns"
cucchiaiata-cli infra.server.create -s dns.cadoles.com -d description -m unbound_etab1 -e last -i etab1 -z pedago cucchiaiata-cli infra.server.create -s dns.cadoles.com -d description -m unbound_etab1 -e last -i etab1 -z pedago
# Create a cluster with one node and one VM # Create a cluster with one node and one VM
@ -100,10 +138,10 @@ cucchiaiata-cli provider.factory.server.add -s dns.cadoles.com -c cluster.cadole
# Configure server # Configure server
S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id) S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id)
cucchiaiata-cli setting.session.server.configure -s $S --creole.reseau.unbound_ip_address_cidr 192.168.1.1/24 cucchiaiata-cli setting.session.server.configure -s "$S" --configuration.reseau.unbound_ip_address_cidr 192.168.1.1/24
cucchiaiata-cli setting.session.server.validate -s $S cucchiaiata-cli setting.session.server.validate -s $S
verif server 192.168.1.2 dns.cadoles.com '["cadoles.com"]' 192.168.1.1/24 verif server 192.168.1.2 dns.cadoles.com '["cadoles.com"]' 192.168.1.1/24
cucchiaiata-cli setting.session.server.stop -s $S -a cucchiaiata-cli setting.session.server.stop -s "$S" -a
# Generate configuration # Generate configuration
cucchiaiata-cli setting.config.configuration.server.deploy -s dns.cadoles.com cucchiaiata-cli setting.config.configuration.server.deploy -s dns.cadoles.com
@ -111,19 +149,20 @@ cucchiaiata-cli setting.template.generate -s dns.cadoles.com
# Add OpenSSH dependency # Add OpenSSH dependency
cucchiaiata-cli setting.servermodel.dependency.add -m aca -a openssh -o cadoles -e last cucchiaiata-cli setting.servermodel.dependency.add -m aca -a openssh -o cadoles -e last
S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id) S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id)
R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[]) R=$(cucchiaiata-cli setting.session.server.get -s "$S" -n configuration.serveur_ssh.ssh_allow_networks | jq -Mcr .content[])
[ $R = "[]" ] [ "$R" = "[]" ]
cucchiaiata-cli setting.session.server.stop -s $S cucchiaiata-cli setting.session.server.stop -s "$S"
S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id) S=$(cucchiaiata-cli setting.session.servermodel.start -m aca -e last| jq -r .session_id)
cucchiaiata-cli setting.session.servermodel.configure -s $S --creole.serveur_ssh.ssh_allow_networks admin.cadoles.com cucchiaiata-cli setting.session.servermodel.configure -s "$S" --configuration.serveur_ssh.ssh_allow_networks admin.cadoles.com
cucchiaiata-cli setting.session.servermodel.stop -s $S -a cucchiaiata-cli setting.session.servermodel.stop -s "$S" -a
S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id) S=$(cucchiaiata-cli setting.session.server.start -s dns.cadoles.com | jq -r .session_id)
R=$(cucchiaiata-cli setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[]) R=$(cucchiaiata-cli setting.session.server.get -s "$S" -n configuration.serveur_ssh.ssh_allow_networks | jq -Mcr .content[])
[ $R = '["admin.cadoles.com"]' ] [ "$R" = '["admin.cadoles.com"]' ]
cucchiaiata-cli setting.session.server.stop -s $S cucchiaiata-cli setting.session.server.stop -s "$S"
# Regenerate configuration # Regenerate configuration
cucchiaiata-cli setting.config.configuration.server.deploy -s dns.cadoles.com cucchiaiata-cli setting.config.configuration.server.deploy -s dns.cadoles.com

6
script/cucchiaiata-cli
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python3 #!/usr/bin/python3
"""Zephir-cmd-input script """Zephir-cmd-input script
""" """
from sys import exit, argv from sys import exit, argv
@ -10,8 +10,8 @@ from cucchiaiata.i18n import _
def main(): def main():
try: try:
if argv[1] in ['setting.session.server.configure', if len(argv) > 2 and argv[1] in ['setting.session.server.configure',
'setting.session.servermodel.configure']: 'setting.session.servermodel.configure']:
Configuration().get() Configuration().get()
else: else:
parser = Parser() parser = Parser()

2
src/cucchiaiata/config.py
View File

@ -29,7 +29,7 @@ version: {version}"""
self.url = config['url'] self.url = config['url']
self.version = config['version'] self.version = config['version']
self.debug = 'debug' in config self.debug = config.get('debug', False)
self.remote_url = 'http://{}/api/{}'.format(self.url, self.version) self.remote_url = 'http://{}/api/{}'.format(self.url, self.version)
self.token_file = join(expanduser("~"), '.zephir-client.jwt.token') self.token_file = join(expanduser("~"), '.zephir-client.jwt.token')
self.indent = config.get('indent', 2) self.indent = config.get('indent', 2)