(maint) incorporate review comments

Author: sheenaajay

.fixtures.yml

@@ -14,7 +14,6 @@ fixtures:
     facts: 'git://github.com/puppetlabs/puppetlabs-facts.git'
     puppet_agent: 'git://github.com/puppetlabs/puppetlabs-puppet_agent.git'
     provision: 'git://github.com/puppetlabs/provision.git'
-    rook: 'git://github.com/puppetlabs/puppetlabs-rook.git'
     yumrepo_core:
       repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
       puppet_version: ">= 6.0.0"

.github/workflows/integration_test.yml

@@ -116,15 +116,15 @@ jobs:
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_gcp gcp_image=${{ matrix.platform }}
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster gcp_image=${{ matrix.platform }}
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo
         echo ::endgroup::
         echo ::group::=== INVENTORY ===
         sed -e 's/password: .*/password: "[redacted]"/' < inventory.yaml || true
         echo ::endgroup::
-    - name: Install module
+    - name: Puppet server setup
       run: |
         buildevents cmd $TRACE_ID $STEP_ID 'rake kubernetes::puppetserver_setup' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::puppetserver_setup -i ./inventory.yaml
     - name: Install agent

.github/workflows/nightly.yml

@@ -118,7 +118,7 @@ jobs:
         echo STEP_START=$(date +%s) >> $GITHUB_ENV
     - name: Provision test environment
       run: |
-        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_gcp gcp_image=${{ matrix.platform }}
+        buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision' -- bundle exec bolt --modulepath spec/fixtures/modules plan run kubernetes::provision_cluster gcp_image=${{ matrix.platform }}
         echo ::group::=== REQUEST ===
         cat request.json || true
         echo

plans/provision_gcp.pp renamed to plans/provision_cluster.pp

@@ -4,7 +4,7 @@
 #
 # @example
 #   kubernetes::provision_integration
-plan kubernetes::provision_gcp(
+plan kubernetes::provision_cluster(
   Optional[String] $gcp_image = 'centos-7',
 ) {
   #provision server machine, set role

spec/acceptance/kubernetes_spec.rb

@@ -58,8 +58,8 @@ class {'kubernetes':
         end
 
         it 'can access the deployed service' do
-          sleep(180)
-          run_shell('curl -s 10.96.188.5', expect_failures: true) do |r|
+          run_shell('sleep 60')
+          run_shell('curl --retry 10 --retry-delay 15 -s 10.96.188.5') do |r|
             expect(r.stdout).to match (/Welcome to nginx!/)
           end
         end

spec/spec_helper_acceptance_local.rb

@@ -70,6 +70,7 @@ def configure_puppet_server(controller, worker1, worker2)
   execute_agent('controller')
   # Configure the puppet agents
   configure_puppet_agent('worker1')
+  puppet_cert_sign
   configure_puppet_agent('worker2')
   puppet_cert_sign
   # Create site.pp
@@ -309,5 +310,6 @@ def execute_agent(role)
   execute_agent('controller')
   execute_agent('worker1')
   execute_agent('worker2')
+  puppet_cert_sign
 end
 end