(maint) Add some new optional parameters for puppetserver testing

Author: Morgan Rhodes

gem/lib/pupperware/spec_helper.rb

@@ -216,10 +216,10 @@ def wait_on_puppetdb_status(seconds = 240)
   # Puppetserver Helpers
   ######################################################################
 
-  def wait_on_puppetserver_status(seconds = 180)
+  def wait_on_puppetserver_status(seconds = 180, service_name = 'puppet')
     # puppetserver has a healthcheck, we can let that deal with timeouts
     return retry_block_up_to_timeout(seconds) do
-      status = get_container_status(get_service_container('puppet'))
+      status = get_container_status(get_service_container(service_name))
       (status == 'healthy' || status == "'healthy'") ? 'healthy' :
         raise("puppetserver stuck in #{status}")
     end
@@ -237,11 +237,11 @@ def clean_certificate(agent_name)
   # Puppet Agent Helpers
   ######################################################################
 
-  def run_agent(agent_name, network, server = get_container_hostname(get_service_container('puppet')))
+  def run_agent(agent_name, network, server = get_container_hostname(get_service_container('puppet')), ca = get_container_hostname(get_service_container('puppet')))
     # setting up a Windows TTY is difficult, so we don't
     # allocating a TTY will show container pull output on Linux, but that's not good for tests
     STDOUT.puts("running agent #{agent_name} in network #{network} against #{server}")
-    result = run_command("docker run --rm --network #{network} --name #{agent_name} --hostname #{agent_name} puppet/puppet-agent-alpine agent --verbose --onetime --no-daemonize --summarize --server #{server}")
+    result = run_command("docker run --rm --network #{network} --name #{agent_name} --hostname #{agent_name} puppet/puppet-agent-alpine agent --verbose --onetime --no-daemonize --summarize --server #{server} --ca_server #{ca}")
     return result[:status].exitstatus
   end