ncm-ceph: Fix wrapping and indentation in pan

quattor · Nov 28, 2024 · 429578b · 429578b
1 parent a45fab7
commit 429578b
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 46 deletions.
diff --git a/ncm-ceph/src/main/resources/tests/profiles/basic_crushmap.pan b/ncm-ceph/src/main/resources/tests/profiles/basic_crushmap.pan
@@ -5,10 +5,10 @@ variable BASE_STEPS = list(
         'take', 'default',
         'set_chooseleaf_tries', 5,
         'choices', list(
-        dict(
-            'chtype', 'chooseleaf firstn',
-            'number', 0,
-            'bktype', 'host',
+            dict(
+                'chtype', 'chooseleaf firstn',
+                'number', 0,
+                'bktype', 'host',
             ),
         ),
     ),

diff --git a/ncm-ceph/src/test/resources/basic_cluster.pan b/ncm-ceph/src/test/resources/basic_cluster.pan
@@ -1,27 +1,27 @@
 object template basic_cluster;
 
 
-variable OSDS = dict (
-    'ceph001', dict (
+variable OSDS = dict(
+    'ceph001', dict(
         'fqdn', 'ceph001.cubone.os',
         'osds', dict(
             escape('/var/lib/ceph/osd/sdc'), dict(),
             'sdd', dict(
                 'journal_path', '/var/lib/ceph/log/sda4/osd-sdd/journal'
-                )
             )
-        ),
-    'ceph002', dict (
+        )
+    ),
+    'ceph002', dict(
         'fqdn', 'ceph002.cubone.os',
         'osds', dict(
             'sdc', dict(
-            'journal_path', '/var/lib/ceph/log/sda4/osd-sdc/journal'
+                'journal_path', '/var/lib/ceph/log/sda4/osd-sdc/journal'
             )
         )
     )
 );
 
-variable MDSS = dict (
+variable MDSS = dict(
     'ceph002', dict(
         'fqdn', 'ceph002.cubone.os',
         'up', true
@@ -40,23 +40,23 @@ variable MONITOR3 =  dict(
     'up', true,
 );
 
-variable CONFIG = dict (
+variable CONFIG = dict(
     'fsid' , 'a94f9906-ff68-487d-8193-23ad04c1b5c4',
     'mon_initial_members', list ('ceph001', 'ceph002', 'ceph003')
 );
 
 prefix '/software/components/ceph/clusters';
 
-'ceph' = dict (
+'ceph' = dict(
     'config', CONFIG,
     'osdhosts', OSDS,
     'mdss', MDSS,
-    'monitors', dict (
+    'monitors', dict(
         'ceph001', MONITOR1,
         'ceph002', MONITOR2,
         'ceph003', MONITOR3
     ),
-    'deployhosts', dict (
+    'deployhosts', dict(
         'ceph002', 'ceph002.cubone.os'
     )
 
@@ -67,6 +67,10 @@ prefix '/software/components/ceph/clusters';
 '/system/network/hostname' = 'ceph003';
 '/system/network/domainname' = 'cubone.os';
 
-'/software/components/accounts/users/ceph' =
-    dict('homeDir', '/tmp', 'gid', '111' );
-'/software/components/accounts/groups/ceph' = dict('gid', '111');
+'/software/components/accounts/users/ceph' = dict(
+    'homeDir', '/tmp',
+    'gid', '111',
+);
+'/software/components/accounts/groups/ceph' = dict(
+    'gid', '111',
+);
diff --git a/ncm-ceph/src/test/resources/basic_crushmap.pan b/ncm-ceph/src/test/resources/basic_crushmap.pan
@@ -9,10 +9,10 @@ variable CEPH_OSD_DISKS = list('sdc', 'sdd', 'sde', 'sdf', 'sdg', 'sdh', 'sdi',
 variable CEPH_JOURNAL_DISKS = list('sda4', 'sdb');
 variable CEPH_DEFAULT_OSD_WEIGHT = 1.0;
 
-variable MDSS = dict (
+variable MDSS = dict(
     'ceph001.cubone.os', dict(
         'fqdn', 'ceph001.cubone.os',
-        ),
+    ),
     'ceph002.cubone.os', dict(
         'fqdn', 'ceph002.cubone.os',
     )
@@ -30,7 +30,7 @@ variable MONITOR3 =  dict(
     'fqdn', 'ceph003.cubone.os',
 );
 
-variable CONFIG = dict (
+variable CONFIG = dict(
     'fsid' , '82766e04-585b-49a6-a0ac-c13d9ffd0a7d',
     'mon_initial_members', list ('ceph001', 'ceph002', 'ceph003'),
     'public_network', '10.141.8.0/20',
@@ -50,10 +50,10 @@ variable BASE_STEPS = list(
     dict(
         'take', 'default',
         'choices', list(
-        dict(
-            'chtype', 'chooseleaf firstn',
-            'bktype', 'host',
-            'number', 0,
+            dict(
+                'chtype', 'chooseleaf firstn',
+                'bktype', 'host',
+                'number', 0,
             ),
         ),
     ),
@@ -122,11 +122,11 @@ prefix '/software/components/ceph/clusters/ceph';
 };
 
 'mdss' = MDSS;
-'monitors' = dict (
+'monitors' = dict(
     'ceph001', MONITOR1,
     'ceph002', MONITOR2,
     'ceph003', MONITOR3
 );
-'deployhosts' = dict (
+'deployhosts' = dict(
     'ceph001', 'ceph001.cubone.os',
 );
diff --git a/ncm-ceph/src/test/resources/basic_crushmap_tt.pan b/ncm-ceph/src/test/resources/basic_crushmap_tt.pan
@@ -11,7 +11,7 @@ variable CEPH_DEFAULT_OSD_WEIGHT = 1.0;
 variable MDSS = dict (
     'ceph001.cubone.os', dict(
         'fqdn', 'ceph001.cubone.os',
-        ),
+    ),
     'ceph002.cubone.os', dict(
         'fqdn', 'ceph002.cubone.os',
     )
@@ -48,9 +48,9 @@ variable BASE_STEPS = list(
     dict(
         'take', 'default',
         'choices', list(
-        dict(
-            'chtype', 'chooseleaf firstn',
-            'bktype', 'host',
+            dict(
+                'chtype', 'chooseleaf firstn',
+                'bktype', 'host',
             ),
         ),
     ),

diff --git a/ncm-ceph/src/test/resources/basic_radosgw.pan b/ncm-ceph/src/test/resources/basic_radosgw.pan
@@ -40,6 +40,5 @@ prefix '/software/components/ceph/clusters';
 '/system/network/hostname' = 'ceph002';
 '/system/network/domainname' = 'cubone.os';
 
-'/software/components/accounts/users/ceph' =
-    dict('homeDir', '/tmp', 'gid', '111' );
+'/software/components/accounts/users/ceph' = dict('homeDir', '/tmp', 'gid', '111');
 '/software/components/accounts/groups/ceph' = dict('gid', '111');
diff --git a/ncm-ceph/src/test/resources/labeled_crushmap.pan b/ncm-ceph/src/test/resources/labeled_crushmap.pan
@@ -13,7 +13,7 @@ variable CEPH_DEFAULT_OSD_WEIGHT = 1.0;
 variable MDSS = dict (
     'ceph001.cubone.os', dict(
         'fqdn', 'ceph001.cubone.os',
-        ),
+    ),
     'ceph002.cubone.os', dict(
         'fqdn', 'ceph002.cubone.os',
     )
@@ -51,10 +51,10 @@ variable BASE_STEPS = list(
     dict(
         'take', 'default',
         'choices', list(
-        dict(
-            'chtype', 'chooseleaf firstn',
-            'bktype', 'host',
-            'number', 0,
+            dict(
+                'chtype', 'chooseleaf firstn',
+                'bktype', 'host',
+                'number', 0,
             ),
         ),
     ),

diff --git a/ncm-ceph/src/test/resources/tcfgfile.pan b/ncm-ceph/src/test/resources/tcfgfile.pan
@@ -18,4 +18,5 @@ prefix '/software/components/ceph/config';
 'rgw/client.rgw.test' = dict(
     'host', 'host3',
     'keyring', 'keyfile',
-    'rgw_dns_name', 'host3.aaa.be');
+    'rgw_dns_name', 'host3.aaa.be',
+);
diff --git a/ncm-ceph/src/test/resources/tcluster.pan b/ncm-ceph/src/test/resources/tcluster.pan
@@ -1,6 +1,6 @@
 template tcluster;
 
-variable MDS_NODES = dict (
+variable MDS_NODES = dict(
     'ceph002', dict(
         'fqdn', 'ceph002.cubone.os',
     ),
@@ -27,12 +27,12 @@ bind '/software/components/ceph' = ceph_component;
 prefix '/software/components/ceph/cluster';
 
 'mdss' = MDS_NODES;
-'monitors' = dict (
+'monitors' = dict(
     'ceph001', MONITOR1,
     'ceph002', MONITOR2,
     'ceph003', MONITOR3
 );
-'deployhosts' = dict (
+'deployhosts' = dict(
     'ceph002', 'ceph002.cubone.os'
 );
 'ssh_multiplex' = true;
@@ -57,7 +57,10 @@ prefix 'configdb';
 '/system/network/hostname' = 'ceph002';
 '/system/network/domainname' = 'cubone.os';
 
-'/software/components/accounts/users/ceph' =
-    dict('homeDir', '/tmp', 'gid', '167' );
-'/software/components/accounts/groups/ceph' = dict('gid', '167');
-
+'/software/components/accounts/users/ceph' = dict(
+    'homeDir', '/tmp',
+    'gid', '167',
+);
+'/software/components/accounts/groups/ceph' = dict(
+    'gid', '167',
+);