Merge pull request #1835 from lsst-it/IT-6374/ccs-tu-data

(node/{auxtel,comcam}-fp01.tu) mv /ccs-data -> /data

Author: jhoblitt

hieradata/node/auxtel-dc01.tu.lsst.org.yaml

@@ -43,3 +43,10 @@ nm::connections:
       ipv6:
         method: "disabled"
       proxy: {}
+
+nfs::client_enabled: true
+nfs::client_mounts:
+  /data:
+    share: "data"
+    server: "auxtel-fp01.tu.lsst.org"
+    atboot: true

hieradata/node/auxtel-fp01.tu.lsst.org.yaml

@@ -50,15 +50,15 @@ nfs::nfs_v4_export_root_clients: >-
   %{facts.networking.ip}/32(ro,fsid=root,insecure,no_subtree_check,async,root_squash)
   auxtel-mcm.tu.lsst.org(ro,fsid=root,insecure,no_subtree_check,async,root_squash)
 nfs::nfs_exports_global:
-  /ccs-data:
+  /data:
     clients: >-
       %{facts.networking.ip}/32(ro,nohide,insecure,no_subtree_check,async,root_squash)
       auxtel-mcm.tu.lsst.org(ro,nohide,insecure,no_subtree_check,async,root_squash)
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /net/self/ccs-data:
-    share: "ccs-data"
+  /net/self/data:
+    share: "data"
     server: "%{facts.networking.fqdn}"
     atboot: true
 

hieradata/node/comcam-dc01.tu.lsst.org.yaml

@@ -46,7 +46,7 @@ nm::connections:
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /net/ccs-data:
-    share: "ccs-data"
+  /data:
+    share: "data"
     server: "comcam-fp01.tu.lsst.org"
     atboot: true

hieradata/node/comcam-fp01.tu.lsst.org.yaml

@@ -49,15 +49,15 @@ nfs::nfs_v4_export_root_clients: >-
   %{facts.networking.ip}/32(ro,fsid=root,insecure,no_subtree_check,async,root_squash)
   comcam-dc01.tu.lsst.org(ro,fsid=root,insecure,no_subtree_check,async,root_squash)
 nfs::nfs_exports_global:
-  /ccs-data:
+  /data:
     clients: >-
       %{facts.networking.ip}/32(ro,nohide,insecure,no_subtree_check,async,root_squash)
       comcam-dc01.tu.lsst.org(ro,nohide,insecure,no_subtree_check,async,root_squash)
 
 nfs::client_enabled: true
 nfs::client_mounts:
-  /net/self/ccs-data:
-    share: "ccs-data"
+  /net/self/data:
+    share: "data"
     server: "%{facts.networking.fqdn}"
     atboot: true
 

spec/hosts/nodes/auxtel-dc01.tu.lsst.org_spec.rb

@@ -57,6 +57,14 @@
         it_behaves_like 'nm bridge interface'
         it { expect(nm_keyfile['ipv4']['ignore-auto-dns']).to be true }
       end
+
+      it do
+        is_expected.to contain_nfs__client__mount('/data').with(
+          share: 'data',
+          server: 'auxtel-fp01.tu.lsst.org',
+          atboot: true
+        )
+      end
     end # on os
   end # on_supported_os
 end

spec/hosts/nodes/auxtel-fp01.tu.lsst.org_spec.rb

@@ -89,11 +89,11 @@
       end
 
       it { is_expected.to contain_class('nfs::server').with_nfs_v4(true) }
-      it { is_expected.to contain_nfs__server__export('/ccs-data') }
+      it { is_expected.to contain_nfs__server__export('/data') }
 
       it do
-        is_expected.to contain_nfs__client__mount('/net/self/ccs-data').with(
-          share: 'ccs-data',
+        is_expected.to contain_nfs__client__mount('/net/self/data').with(
+          share: 'data',
           server: 'auxtel-fp01.tu.lsst.org',
           atboot: true
         )

spec/hosts/nodes/comcam-dc01.tu.lsst.org_spec.rb

@@ -58,6 +58,14 @@
         it_behaves_like 'nm bridge interface'
         it { expect(nm_keyfile['ipv4']['ignore-auto-dns']).to be true }
       end
+
+      it do
+        is_expected.to contain_nfs__client__mount('/data').with(
+          share: 'data',
+          server: 'comcam-fp01.tu.lsst.org',
+          atboot: true
+        )
+      end
     end # on os
   end # on_supported_os
 end

spec/hosts/nodes/comcam-fp01.tu.lsst.org_spec.rb

@@ -90,6 +90,17 @@
       it { is_expected.to contain_service('comcam-fp') }
       it { is_expected.to contain_service('comcam-ih') }
       it { is_expected.to contain_service('h2db') }
+
+      it { is_expected.to contain_class('nfs::server').with_nfs_v4(true) }
+      it { is_expected.to contain_nfs__server__export('/data') }
+
+      it do
+        is_expected.to contain_nfs__client__mount('/net/self/data').with(
+          share: 'data',
+          server: 'comcam-fp01.tu.lsst.org',
+          atboot: true
+        )
+      end
     end # on os
   end # on_supported_os
 end