From addb90f6c3d42d68cf00f55ca7d485979a75b48b Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 18 May 2021 19:04:24 +0200 Subject: [PATCH] update dataset --- provisioning.yaml | 51 +++++++++++++++++++---------------------- provisioning_example.sh | 31 +++++++++++-------------- 2 files changed, 37 insertions(+), 45 deletions(-) diff --git a/provisioning.yaml b/provisioning.yaml index 761dfec..4cf0cbc 100755 --- a/provisioning.yaml +++ b/provisioning.yaml @@ -2,13 +2,13 @@ zones: - name: internet settings: configuration: - network: 192.168.1.0/24 + network: 192.168.0.0/24 host: - start: 192.168.1.10 - stop: 192.168.1.100 - dns: [192.168.1.2] - vlan_id: 192 - gateway: 192.168.1.254 + start: 192.168.0.150 + stop: 192.168.0.200 + dns: [192.168.0.1] + vlan_id: 0 + gateway: 192.168.0.1 clusters: - name: hapy.ac-test.fr @@ -33,27 +33,12 @@ servermodels: unbound_allowed_client_cidr: 192.168.1.0/24 reseau: unbound_route_address: 192.168.1.254 - unbound: - unbound_zone_cadoles_com: - hostname_cadoles_com: - hostname_cadoles_com: - - toto - - titi - ip_cadoles_com: - - index: 0 - value: 192.168.1.25 - type_cadoles_com: - - index: 1 - value: CNAME - cname_cadoles_com: - - index: 1 - value: toto.cadoles.com - name: aca applicationservices: [openssh-server] settings: configuration: - serveur_ssh: - ssh_allow_networks: admin.cadoles.com + ssh_server: + ssh_allow_cidr: 192.168.0.0/24 children: - name: etb1 children: @@ -61,8 +46,21 @@ servermodels: other_parents: [unbound] settings: configuration: - reseau: - unbound_domain_name: dns.cadoles.com + unbound: + unbound_zone_cadoles_com: + hostname_cadoles_com: + hostname_cadoles_com: + - toto + - titi + ip_cadoles_com: + - index: 0 + value: 192.168.1.25 + type_cadoles_com: + - index: 1 + value: CNAME + cname_cadoles_com: + - index: 1 + value: toto.cadoles.com organizations: - name: cadoles.com @@ -75,9 +73,6 @@ organizations: zones: [internet] servermodel: unbound_etab1 settings: - configuration: - reseau: - unbound_ip_address_cidr: 192.168.1.2/24 opennebula: cpu: 0.2 vcpu: 2 diff --git a/provisioning_example.sh b/provisioning_example.sh index a025a08..c5301b0 100755 --- a/provisioning_example.sh +++ b/provisioning_example.sh @@ -34,12 +34,12 @@ cucchiaiata-cli v1.user.role.create --user_login gnunux \ cucchiaiata-cli v1.infra.zone.create --zone_name internet # zone configuration S=$(get_id "cucchiaiata-cli v1.setting.session.zone.start --zone_name internet") -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.network "192.168.1.0/24" \ - --configuration.host.start "192.168.1.10" \ - --configuration.host.stop "192.168.1.100" \ - --configuration.dns 192.168.1.2 \ - --configuration.vlan_id 192 \ - --configuration.gateway 192.168.1.254 +cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.network "192.168.0.0/24" \ + --configuration.host.start "192.168.0.150" \ + --configuration.host.stop "192.168.0.200" \ + --configuration.dns 192.168.0.1 \ + --configuration.vlan_id 0 \ + --configuration.gateway 192.168.0.1 cucchiaiata-cli v1.setting.session.validate --session_id $S cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save @@ -59,7 +59,7 @@ cucchiaiata-cli v1.infra.cluster.node.create --node_name node1.cadoles.com \ # configuration S=$(get_id "cucchiaiata-cli v1.setting.session.cluster.start --cluster_name hapy.ac-test.fr") -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.virtual_ip "192.168.1.1" +cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.virtual_ip "192.168.0.115" # FIXME endpoint == https:///RPC2 cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.opennebula.one_user "eoleone" cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.opennebula.one_password "eole" @@ -101,24 +101,22 @@ cucchiaiata-cli v1.setting.servermodel.create --servermodel_name unbound_etab1 - # Servermodel ACA S=$(get_id "cucchiaiata-cli v1.setting.session.servermodel.start --servermodel_name aca") -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.serveur_ssh.ssh_allow_networks admin.cadoles.com +cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.ssh_server.ssh_allow_cidr 192.168.0.0/24 cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save # Servermodel unbound S=$(get_id "cucchiaiata-cli v1.setting.session.servermodel.start --servermodel_name unbound") cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.serveur_dns.unbound_local_zones cadoles.com \ - --configuration.reseau.unbound_route_address 192.168.1.254 \ - --configuration.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24 -cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace unbound -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi \ - --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.1.25 \ - --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME \ - --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com + --configuration.serveur_dns.unbound_allowed_client_cidr 192.168.0.0/24 cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save # Servermodel unbound_etab1 S=$(get_id "cucchiaiata-cli v1.setting.session.servermodel.start --servermodel_name unbound_etab1") -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.reseau.unbound_domain_name dns.cadoles.com +cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace unbound +cucchiaiata-cli v1.setting.session.configure --session_id "$S" --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi \ + --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.0.25 \ + --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME \ + --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com cucchiaiata-cli v1.setting.session.stop --session_id "$S" --save # Server @@ -138,7 +136,6 @@ cucchiaiata-cli v1.infra.server.create --server_name dns.cadoles.com \ # configuration sleep 1 S=$(get_id "cucchiaiata-cli v1.setting.session.server.start --server dns.cadoles.com") -cucchiaiata-cli v1.setting.session.configure --session_id "$S" --configuration.reseau.unbound_ip_address_cidr 192.168.1.2/24 cucchiaiata-cli v1.setting.session.filter --session_id "$S" --namespace opennebula cucchiaiata-cli v1.setting.session.configure --session_id "$S" --opennebula.cpu 0.2 \ --opennebula.vcpu 2 \