Skip to content

Commit d3e61c3

Browse files
alvarosimonalvarosimon
committed
ncm-opennebula: more indent fixes
1 parent fa33d4e commit d3e61c3

File tree

3 files changed

+133
-133
lines changed

3 files changed

+133
-133
lines changed

‎ncm-opennebula/src/main/pan/components/opennebula/schema.pan

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -935,17 +935,17 @@ type opennebula_sunstone = {
935935
"oneflow_server" : type_absoluteURI = 'http://localhost:2474/'
936936
"instance_types" : opennebula_instance_types[] = list (
937937
dict("name", "small-x1", "cpu", 1, "vcpu", 1, "memory", 128,
938-
"description", "Very small instance for testing purposes"),
938+
"description", "Very small instance for testing purposes"),
939939
dict("name", "small-x2", "cpu", 2, "vcpu", 2, "memory", 512,
940-
"description", "Small instance for testing multi-core applications"),
940+
"description", "Small instance for testing multi-core applications"),
941941
dict("name", "medium-x2", "cpu", 2, "vcpu", 2, "memory", 1024,
942-
"description", "General purpose instance for low-load servers"),
942+
"description", "General purpose instance for low-load servers"),
943943
dict("name", "medium-x4", "cpu", 4, "vcpu", 4, "memory", 2048,
944-
"description", "General purpose instance for medium-load servers"),
944+
"description", "General purpose instance for medium-load servers"),
945945
dict("name", "large-x4", "cpu", 4, "vcpu", 4, "memory", 4096,
946-
"description", "General purpose instance for servers"),
946+
"description", "General purpose instance for servers"),
947947
dict("name", "large-x8", "cpu", 8, "vcpu", 8, "memory", 8192,
948-
"description", "General purpose instance for high-load servers"),
948+
"description", "General purpose instance for high-load servers"),
949949
)
950950
@{List of Ruby files containing custom routes to be loaded}
951951
"routes" : string[] = list("oneflow", "vcenter", "support", "nsx")

‎ncm-opennebula/src/main/pan/quattor/aii/opennebula/schema.pan

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ type opennebula_vmtemplate_vnet = string{} with {
7171
(! (exists(v['type']) && match(v['type'], '^(Bridge|OVSBridge|IPIP)$'))) && # special types no real dev
7272
(! (exists(v['driver']) && (v['driver'] == 'bonding'))) && # bonding interface is no real device
7373
(! (match(k, '^ib\d+$') && exists("/hardware/cards/ib/" + k))) # It's ok if this is an IB device
74-
) {
74+
) {
7575
error("/system/network/interfaces/%s has no entry in the vnet map", k);
7676
};
7777
};

‎ncm-opennebula/src/test/resources/one.pan

Lines changed: 126 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ prefix "/software/components/opennebula";
7575

7676
"clusters" = dict(
7777
"red.cluster", dict(
78-
"reserved_cpu", 10,
79-
"reserved_mem", 2097152,
80-
"labels", list("quattor", "quattor/VO"),
81-
"description", "red.cluster managed by quattor",
82-
),
78+
"reserved_cpu", 10,
79+
"reserved_mem", 2097152,
80+
"labels", list("quattor", "quattor/VO"),
81+
"description", "red.cluster managed by quattor",
82+
),
8383
);
8484

8585
"vmgroups" = dict(
@@ -98,149 +98,149 @@ prefix "/software/components/opennebula";
9898
"policy", "AFFINED",
9999
),
100100
),
101-
"labels", list("quattor", "quattor/ha_group"),
102-
"description", "New HA VM group managed by quattor",
101+
"labels", list("quattor", "quattor/ha_group"),
102+
"description", "New HA VM group managed by quattor",
103103
),
104104
);
105105

106106
"vnets" = dict(
107107
"altaria.os", dict(
108-
"bridge", "br100",
109-
"gateway", "10.141.3.250",
110-
"dns", "10.141.3.250",
111-
"network_mask", "255.255.0.0",
112-
"labels", list("quattor", "quattor/private"),
113-
),
108+
"bridge", "br100",
109+
"gateway", "10.141.3.250",
110+
"dns", "10.141.3.250",
111+
"network_mask", "255.255.0.0",
112+
"labels", list("quattor", "quattor/private"),
113+
),
114114
"altaria.vsc", dict(
115-
"bridge", "br101",
116-
"gateway", "10.141.3.250",
117-
"dns", "10.141.3.250",
118-
"network_mask", "255.255.0.0",
119-
"labels", list("quattor", "quattor/public"),
120-
),
115+
"bridge", "br101",
116+
"gateway", "10.141.3.250",
117+
"dns", "10.141.3.250",
118+
"network_mask", "255.255.0.0",
119+
"labels", list("quattor", "quattor/public"),
120+
),
121121
"pool.altaria.os", dict(
122-
"bridge", "br100",
123-
"bridge_ovs", "ovsbr0",
124-
"gateway", "10.141.3.250",
125-
"dns", "10.141.3.250",
126-
"network_mask", "255.255.0.0",
127-
"vlan", true,
128-
"vlan_id", 0,
129-
"vn_mad", "ovswitch",
130-
"ar", dict(
131-
"type", "IP4",
132-
"ip", "10.141.14.100",
133-
"size", 29
134-
),
135-
"labels", list("quattor", "quattor/vlans"),
122+
"bridge", "br100",
123+
"bridge_ovs", "ovsbr0",
124+
"gateway", "10.141.3.250",
125+
"dns", "10.141.3.250",
126+
"network_mask", "255.255.0.0",
127+
"vlan", true,
128+
"vlan_id", 0,
129+
"vn_mad", "ovswitch",
130+
"ar", dict(
131+
"type", "IP4",
132+
"ip", "10.141.14.100",
133+
"size", 29
136134
),
135+
"labels", list("quattor", "quattor/vlans"),
136+
),
137137
"vxlan.vmpool.os", dict(
138-
"gateway", "10.1.20.250",
139-
"dns", "10.1.20.1",
140-
"network_mask", "255.255.255.0",
141-
"vlan", true,
142-
"vlan_id", 10,
143-
"vn_mad", "vxlan",
144-
"ar", dict(
145-
"type", "IP4",
146-
"ip", "10.1.20.100",
147-
"size", 100,
148-
),
149-
"phydev", "ib0",
150-
"filter_ip_spoofing", true,
151-
"filter_mac_spoofing", true,
152-
"labels", list("quattor", "quattor/vlans"),
153-
"permissions", dict(
154-
"owner", "lsimngar",
155-
"group", "users",
156-
"mode", 0440,
157-
),
158-
"clusters", list("default", "red.cluster"),
138+
"gateway", "10.1.20.250",
139+
"dns", "10.1.20.1",
140+
"network_mask", "255.255.255.0",
141+
"vlan", true,
142+
"vlan_id", 10,
143+
"vn_mad", "vxlan",
144+
"ar", dict(
145+
"type", "IP4",
146+
"ip", "10.1.20.100",
147+
"size", 100,
159148
),
149+
"phydev", "ib0",
150+
"filter_ip_spoofing", true,
151+
"filter_mac_spoofing", true,
152+
"labels", list("quattor", "quattor/vlans"),
153+
"permissions", dict(
154+
"owner", "lsimngar",
155+
"group", "users",
156+
"mode", 0440,
157+
),
158+
"clusters", list("default", "red.cluster"),
159+
),
160160
);
161161

162162
"datastores" = dict(
163-
"ceph.altaria", dict(
164-
"bridge_list", list("hyp004.cubone.os"),
165-
"ceph_host", list("ceph001.cubone.os", "ceph002.cubone.os", "ceph003.cubone.os"),
166-
"ceph_secret", "8371ae8a-386d-44d7-a228-c42de4259c6e",
167-
"ceph_user", "libvirt",
168-
"disk_type", "RBD",
169-
"datastore_capacity_check", true,
170-
"ceph_user_key", "AQCGZr1TeFUBMRBBHExosSnNXvlhuKexxcczpw==",
171-
"pool_name", "one",
172-
"type", "IMAGE_DS",
173-
"ds_mad", "ceph",
174-
"labels", list("quattor", "quattor/ceph"),
175-
),
176-
"nfs", dict(
177-
"datastore_capacity_check", true,
178-
"ds_mad", "fs",
179-
"tm_mad", "shared",
180-
"type", "IMAGE_DS",
181-
"labels", list("quattor", "quattor/nfs"),
182-
"permissions", dict(
183-
"owner", "lsimngar",
184-
"group", "users",
185-
"mode", 0440,
186-
),
187-
"clusters", list("red.cluster"),
188-
),
189-
"system", dict(
190-
"tm_mad", "shared",
191-
"ds_mad", "fs",
192-
"type", "SYSTEM_DS",
193-
"clusters", list("default", "red.cluster"),
194-
),
195-
"rdm", dict(
196-
"tm_mad", "dev",
197-
"ds_mad", "dev",
198-
"type", "IMAGE_DS",
199-
"disk_type", "BLOCK",
200-
"datastore_capacity_check", false,
201-
"labels", list("quattor", "quattor/rdm"),
202-
),
203-
"cephsys.altaria", dict(
204-
"tm_mad", "ceph",
205-
"type", "SYSTEM_DS",
206-
"bridge_list", list("hyp004.cubone.os"),
207-
"ceph_host", list("ceph001.cubone.os", "ceph002.cubone.os", "ceph003.cubone.os"),
208-
"ceph_secret", "8371ae8a-386d-44d7-a228-c42de4259c6e",
209-
"ceph_user", "libvirt",
210-
"disk_type", "RBD",
211-
"pool_name", "one",
212-
"clusters", list("default", "red.cluster"),
163+
"ceph.altaria", dict(
164+
"bridge_list", list("hyp004.cubone.os"),
165+
"ceph_host", list("ceph001.cubone.os", "ceph002.cubone.os", "ceph003.cubone.os"),
166+
"ceph_secret", "8371ae8a-386d-44d7-a228-c42de4259c6e",
167+
"ceph_user", "libvirt",
168+
"disk_type", "RBD",
169+
"datastore_capacity_check", true,
170+
"ceph_user_key", "AQCGZr1TeFUBMRBBHExosSnNXvlhuKexxcczpw==",
171+
"pool_name", "one",
172+
"type", "IMAGE_DS",
173+
"ds_mad", "ceph",
174+
"labels", list("quattor", "quattor/ceph"),
175+
),
176+
"nfs", dict(
177+
"datastore_capacity_check", true,
178+
"ds_mad", "fs",
179+
"tm_mad", "shared",
180+
"type", "IMAGE_DS",
181+
"labels", list("quattor", "quattor/nfs"),
182+
"permissions", dict(
183+
"owner", "lsimngar",
184+
"group", "users",
185+
"mode", 0440,
213186
),
187+
"clusters", list("red.cluster"),
188+
),
189+
"system", dict(
190+
"tm_mad", "shared",
191+
"ds_mad", "fs",
192+
"type", "SYSTEM_DS",
193+
"clusters", list("default", "red.cluster"),
194+
),
195+
"rdm", dict(
196+
"tm_mad", "dev",
197+
"ds_mad", "dev",
198+
"type", "IMAGE_DS",
199+
"disk_type", "BLOCK",
200+
"datastore_capacity_check", false,
201+
"labels", list("quattor", "quattor/rdm"),
202+
),
203+
"cephsys.altaria", dict(
204+
"tm_mad", "ceph",
205+
"type", "SYSTEM_DS",
206+
"bridge_list", list("hyp004.cubone.os"),
207+
"ceph_host", list("ceph001.cubone.os", "ceph002.cubone.os", "ceph003.cubone.os"),
208+
"ceph_secret", "8371ae8a-386d-44d7-a228-c42de4259c6e",
209+
"ceph_user", "libvirt",
210+
"disk_type", "RBD",
211+
"pool_name", "one",
212+
"clusters", list("default", "red.cluster"),
213+
),
214214
);
215215

216216
"groups" = dict(
217-
"gvo01", dict(
218-
"description", "gvo01 group managed by quattor",
219-
"labels", list("quattor", "quattor/VO"),
220-
),
217+
"gvo01", dict(
218+
"description", "gvo01 group managed by quattor",
219+
"labels", list("quattor", "quattor/VO"),
220+
),
221221
);
222222

223223
"users" = dict(
224-
"lsimngar", dict(
225-
"password", "my_fancy_pass",
226-
"ssh_public_key", list(
227-
'ssh-dss AAAAB3NzaC1kc3MAAACBAOTAivURhU user@OptiPlex-790',
228-
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQ hello@mylaptop'
229-
),
230-
"group", "oneadmin",
231-
"labels", list("quattor", "quattor/localuser"),
232-
),
233-
"stdweird", dict(
234-
"password", "another_fancy_pass",
224+
"lsimngar", dict(
225+
"password", "my_fancy_pass",
226+
"ssh_public_key", list(
227+
'ssh-dss AAAAB3NzaC1kc3MAAACBAOTAivURhU user@OptiPlex-790',
228+
'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQ hello@mylaptop'
235229
),
236-
"serveradmin", dict(
237-
"password", "yet_another_fancy_pass",
238-
),
239-
"oneadmin", dict(
240-
"ssh_public_key", list(
241-
'ssh-dss AAAAB3NzaC1yc2EAAAADAQABAAABAQDI4gvhOpwKbukZP/Tht/GmKcRCBHGn8JadVlgb9U6O/EP/hR1KLDbKY7KVjVOlUcvfawn44SIGsmKCzehYJV2s/XU1QSaaLrjB7n+vfOyj1C3EgzfZcMOHvL51xPuSgIoKd9oER/63B/pUV/BEZK5LEC06O1LgAjwLy2DrHNN3cQdnTbxQ4vM5ggDb/BC+DyRYlN5NG74VFguVQmoqMPA8FYXBvT/bBvIAZFw7piZIQFd6C803dtG61234 another@laptop'
242-
),
230+
"group", "oneadmin",
231+
"labels", list("quattor", "quattor/localuser"),
232+
),
233+
"stdweird", dict(
234+
"password", "another_fancy_pass",
235+
),
236+
"serveradmin", dict(
237+
"password", "yet_another_fancy_pass",
238+
),
239+
"oneadmin", dict(
240+
"ssh_public_key", list(
241+
'ssh-dss AAAAB3NzaC1yc2EAAAADAQABAAABAQDI4gvhOpwKbukZP/Tht/GmKcRCBHGn8JadVlgb9U6O/EP/hR1KLDbKY7KVjVOlUcvfawn44SIGsmKCzehYJV2s/XU1QSaaLrjB7n+vfOyj1C3EgzfZcMOHvL51xPuSgIoKd9oER/63B/pUV/BEZK5LEC06O1LgAjwLy2DrHNN3cQdnTbxQ4vM5ggDb/BC+DyRYlN5NG74VFguVQmoqMPA8FYXBvT/bBvIAZFw7piZIQFd6C803dtG61234 another@laptop'
243242
),
243+
),
244244
);
245245

246246
"hosts" = dict(

0 commit comments

Comments
 (0)