From a69e2cca1d79edb99de80288e9523d0691fb8d71 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Wed, 18 Mar 2020 14:14:10 +0100 Subject: [PATCH] message standardization --- provisioning_example.sh | 44 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/provisioning_example.sh b/provisioning_example.sh index 37bcaee..198f051 100755 --- a/provisioning_example.sh +++ b/provisioning_example.sh @@ -12,20 +12,20 @@ verif() { } # Import EOLE -./script/cucchiaiata setting.source.create -n eole -u http://localhost -./script/cucchiaiata setting.source.release.create -s eole -n 2.7.1.1 -d last -./script/cucchiaiata setting.applicationservice.dataset.updated -s eole -r last -./script/cucchiaiata setting.servermodel.dataset.updated -s eole -r last +./script/cucchiaiata setting.source.create -o eole -u http://localhost +./script/cucchiaiata setting.source.release.create -o eole -r 2.7.1.1 -e last +./script/cucchiaiata setting.applicationservice.dataset.updated -o eole -e last +./script/cucchiaiata setting.servermodel.dataset.updated -o eole -e last # Create a new user and set role 'server_rw' for this server -./script/cucchiaiata user.user.create -l gnunux -n gnunux -s gnunux -./script/cucchiaiata user.role.create -u gnunux -n 'server_rw' -a 'Server.ServerName' -v test.cadoles.com +./script/cucchiaiata user.user.create -u gnunux -n gnunux -s gnunux +./script/cucchiaiata user.role.create -u gnunux -o 'server_rw' -a 'Server.ServerName' -v test.cadoles.com # Heritage ## ACA -./script/cucchiaiata setting.servermodel.create -n aca -d Aca -p base -s eole -r last -./script/cucchiaiata setting.applicationservice.dependency.add -n local_aca -a unbound -s eole -r last -S=$(./script/cucchiaiata setting.session.servermodel.start -s aca | jq -r .session_id) +./script/cucchiaiata setting.servermodel.create -m aca -d Aca -p base -o eole -e last +./script/cucchiaiata setting.applicationservice.dependency.add -n local_aca -a unbound -o eole -e last +S=$(./script/cucchiaiata setting.session.servermodel.start -m aca | jq -r .session_id) verif servermodel null null [] null ./script/cucchiaiata setting.session.servermodel.configure -s $S --creole.reseau.unbound_route_address 192.168.1.2 ./script/cucchiaiata setting.session.servermodel.configure -s $S --creole.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24 @@ -33,16 +33,16 @@ verif servermodel 192.168.1.2 null [] null ./script/cucchiaiata setting.session.servermodel.stop -s $S -a ## etab1 -./script/cucchiaiata setting.servermodel.create -n etab1 -d "Etab 1" -p aca -s internal -r last -S=$(./script/cucchiaiata setting.session.servermodel.start -s etab1 | jq -r .session_id) +./script/cucchiaiata setting.servermodel.create -m etab1 -d "Etab 1" -p aca -o internal -e last +S=$(./script/cucchiaiata setting.session.servermodel.start -m etab1 | jq -r .session_id) ./script/cucchiaiata setting.session.servermodel.configure -s $S --creole.reseau.unbound_domain_name test.cadoles.com verif servermodel 192.168.1.2 test.cadoles.com [] null ./script/cucchiaiata setting.session.servermodel.stop -s $S -a ## unbound -./script/cucchiaiata setting.servermodel.create -n unbound -d "generic unbound configuration" -p base -s eole -r last -./script/cucchiaiata setting.applicationservice.dependency.add -n local_unbound -a unbound -s eole -r last -S=$(./script/cucchiaiata setting.session.servermodel.start -s unbound | jq -r .session_id) +./script/cucchiaiata setting.servermodel.create -m unbound -d "generic unbound configuration" -p base -o eole -e last +./script/cucchiaiata setting.applicationservice.dependency.add -n local_unbound -a unbound -o eole -e last +S=$(./script/cucchiaiata setting.session.servermodel.start -m unbound | jq -r .session_id) ./script/cucchiaiata setting.session.servermodel.configure -s $S --creole.serveur_dns.unbound_local_zones cadoles.com ./script/cucchiaiata setting.session.servermodel.filter -s $S -n unbound ./script/cucchiaiata setting.session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi @@ -54,15 +54,17 @@ verif servermodel null null '["cadoles.com"]' null ./script/cucchiaiata setting.session.servermodel.stop -s $S -a ## unbound_etab1 -./script/cucchiaiata setting.servermodel.create -n unbound_etab1 -d "unbound configuration for etab1" -p etab1 unbound -s internal -r last -S=$(./script/cucchiaiata setting.session.servermodel.start -s unbound_etab1 | jq -r .session_id) +./script/cucchiaiata setting.servermodel.create -m unbound_etab1 -d "unbound configuration for etab1" -p etab1 unbound -o internal -e last +S=$(./script/cucchiaiata setting.session.servermodel.start -m unbound_etab1 | jq -r .session_id) verif servermodel 192.168.1.2 test.cadoles.com '["cadoles.com"]' null -# Create a site, a zone and a server -./script/cucchiaiata infra.site.create -s etab1 -d "Etab 1" +# Create a site, a zone, a server, a cluster +./script/cucchiaiata infra.site.create -i etab1 -d "Etab 1" ./script/cucchiaiata infra.zone.create -z pedago -d "Pedago" -s etab1 -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 -./script/cucchiaiata infra.server.create -s test.cadoles.com -d description -m unbound_etab1 -r last -i etab1 -z pedago +./script/cucchiaiata infra.server.create -s test.cadoles.com -d description -m unbound_etab1 -e last -i etab1 -z pedago + +./script/cucchiaiata provider.factory.cluster.create -c cluster.cadoles.com -d toto -v 192.168.1.1 -z pedago # Configure server S=$(./script/cucchiaiata setting.session.server.start -s test.cadoles.com | jq -r .session_id) @@ -76,13 +78,13 @@ verif server 192.168.1.2 test.cadoles.com '["cadoles.com"]' 192.168.1.1/24 ./script/cucchiaiata setting.template.generate -s test.cadoles.com # Add OpenSSH dependency -./script/cucchiaiata setting.applicationservice.dependency.add -n local_aca -a openssh -s eole -r last +./script/cucchiaiata setting.applicationservice.dependency.add -n local_aca -a openssh -o eole -e last S=$(./script/cucchiaiata setting.session.server.start -s test.cadoles.com | jq -r .session_id) R=$(./script/cucchiaiata setting.session.server.get -s $S -n creole.serveur_ssh.ssh_allow_networks | jq -Mcr .content[]) [ $R = "[]" ] ./script/cucchiaiata setting.session.server.stop -s $S -S=$(./script/cucchiaiata setting.session.servermodel.start -s aca | jq -r .session_id) +S=$(./script/cucchiaiata setting.session.servermodel.start -m aca | jq -r .session_id) ./script/cucchiaiata setting.session.servermodel.configure -s $S --creole.serveur_ssh.ssh_allow_networks admin.cadoles.com ./script/cucchiaiata setting.session.servermodel.stop -s $S -a