Merge dc2440de8a into 83962eb3b4

test/integration/default/controls/config_spec.rb

@@ -10,9 +10,9 @@ root_group =
   end
 
 github_known_host = 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGm[...]'
-gitlab_known_host_re = /gitlab.com,[0-9a-f.:,]* ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABA/
-minion_rsa_known_host = 'minion.id,alias.of.minion.id ssh-rsa [...]'
-minion_ed25519_known_host = 'minion.id,alias.of.minion.id ssh-ed25519 [...]'
+gitlab_known_host_re = /gitlab.com[0-9a-f.:,]* ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABA/
+minion_rsa_known_host = /minion\.id,alias\.of\.minion.id[0-9a-f.:,]* ssh-rsa .+/
+minion_ed25519_known_host = /minion\.id,alias\.of\.minion\.id[0-9a-f.:,]* ssh-ed25519 .+/
 
 control 'openssh configuration' do
   title 'should match desired lines'
@@ -50,7 +50,7 @@ control 'openssh configuration' do
     it { should be_grouped_into root_group }
     its('content') { should include github_known_host }
     its('content') { should match(gitlab_known_host_re) }
-    its('content') { should include minion_rsa_known_host }
-    its('content') { should include minion_ed25519_known_host }
+    its('content') { should match minion_rsa_known_host }
+    its('content') { should match minion_ed25519_known_host }
   end
 end