[os][rpm] small tweaks due to AFS package race conditions on EL7

manifests/os/redhat/el7.pp

@@ -54,12 +54,25 @@ class base::os::redhat::el7 {
       require => Package[ 'iptables-services' ],
     }
 
-    # enable afs-client {now, and at boot}
-    exec { 'enable_openafs_client':
+    # enable afs-client {onboot, and now}
+    exec { 'enable_openafs_client_onboot':
       path    => "/usr/bin:/usr/sbin:/bin:/sbin",
-      command => 'systemctl enable openafs-client ; systemctl start openafs-client ; touch /var/puppet/openafs_client_enabled',
-      creates => '/var/puppet/openafs_client_enabled',
-      require => Package[ 'iptables-services' ],
+      command => 'systemctl enable openafs-client && touch /var/puppet/openafs_client_autostart_enabled',
+      creates => '/var/puppet/openafs_client_autostart_enabled',
+      require => Package[ 'openafs-client' ],
+    }
+    exec { 'start_openafs_client_first_time':
+      path    => "/usr/bin:/usr/sbin:/bin:/sbin",
+      command => 'systemctl start openafs-client && touch /var/puppet/openafs_client_started_first_time',
+      creates => '/var/puppet/openafs_client_started_first_time',
+      require => Package[ 'openafs-client' ],
+    }
+
+    # Our EL7 build of openafs-client does not pull this in automatically
+    # opting to fix here rather than change shared afs module
+    package { 'openafs-krb5':
+      ensure  => installed,
+      require => Package[ 'openafs-client' ],
     }
 
     # Warning about the directory facilitating these fixes