Merge pull request #1744 from lsst-it/IT-6155/rm-comcam-archiver.cp

(role/comcam-archiver) rm

Author: jhoblitt

hieradata/node/comcam-archiver.cp.lsst.org.yaml

@@ -78,16 +78,3 @@ nm::connections:
         method: "disabled"
       ipv6:
         method: "disabled"
-
-nfs::client_enabled: true
-nfs::client_mounts:
-  /data:
-    share: "comcam"
-    server: "nfs-comcam.cp.lsst.org"
-    atboot: true
-
-profile::core::k5login::k5login:
-  "/home/saluser/.k5login":
-    ensure: "present"
-    principals:
-      - "ccs-ipa/[email protected]"

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

@@ -220,18 +220,6 @@ profile::archive::data::auxtel::files:
     owner: 1000  # XXX unreserved
     group: 983  # XXX unreserved
 
-profile::archive::data::comcam::files:
-  /data/repo/LSSTComCam:
-    ensure: "directory"
-    mode: "0777"
-    owner: &saluser 73006
-    group: *saluser
-  /data/repo/LSSTComCam/u:
-    ensure: "directory"
-    mode: "1777"
-    owner: &saluser 73006
-    group: *saluser
-
 profile::core::dtn::sysctls:
   net.core.rmem_max:
     value: 2147483647

hieradata/role/comcam-archiver.yaml

@@ -19,8 +19,7 @@
       end
       let(:node_params) do
         {
-          role: 'nfsclient',
-          cluster: 'comcam-archive',
+          role: 'generic',
           site: 'cp',
         }
       end
@@ -53,16 +52,6 @@
         it_behaves_like 'nm dhcp interface'
         it_behaves_like 'nm ethernet interface'
       end
-
-      it { is_expected.to contain_class('nfs').with_client_enabled(true) }
-
-      it do
-        is_expected.to contain_nfs__client__mount('/data').with(
-          share: 'comcam',
-          server: 'nfs-comcam.cp.lsst.org',
-          atboot: true
-        )
-      end
     end
   end # on os
 end # on_supported_os

site/profile/data/common.yaml

@@ -19,36 +19,14 @@
       end
       let(:node_params) do
         {
-          role: 'comcam-archiver',
+          role: 'generic',
           site: 'tu',
-          cluster: 'comcam-archiver',
         }
       end
 
       it { is_expected.to compile.with_all_deps }
 
       include_examples 'baremetal'
-
-      it { is_expected.to contain_class('nfs::server').with_nfs_v4(true) }
-      it { is_expected.to contain_nfs__server__export('/data/lsstdata') }
-      it { is_expected.to contain_nfs__server__export('/data/repo') }
-      it { is_expected.to contain_nfs__server__export('/data') }
-
-      it do
-        is_expected.to contain_nfs__client__mount('/net/self/data/lsstdata').with(
-          share: 'lsstdata',
-          server: 'comcam-archiver.tu.lsst.org',
-          atboot: true
-        )
-      end
-
-      it do
-        is_expected.to contain_nfs__client__mount('/repo').with(
-          share: 'repo',
-          server: 'comcam-archiver.tu.lsst.org',
-          atboot: true
-        )
-      end
     end # on os
   end # on_supported_os
 end # role