Rename patch role to compliance

Add windows example node

Author: Stephen Lauck

.kitchen.yml

@@ -83,35 +83,3 @@ suites:
       customize:
         memory: 1024
         cpus: 1
-
-  # - name: supermarket
-  #   run_list:
-  #     - recipe[test::hostsfile]
-  #     - recipe[test::supermarket_node]
-  #   attributes:
-  #     supermarket_omnibus:
-  #       chef_server_url: 'https://chef.services.com'
-  #       chef_oauth2_verify_ssl: false
-  #   driver:
-  #     vm_hostname: supermarket.services.com
-  #     network:
-  #       - ['private_network', {ip: '33.33.33.13'}]
-  #     customize:
-  #       memory: 1024
-  #       cpus: 1
-  #
-  # - name: compliance
-  #   run_list:
-  #     - recipe[test::hostsfile]
-  #     - recipe[test::compliance_node]
-  #   attributes:
-  #     compliance:
-  #       accept_license: true
-  #       fqdn: compliance.services.com
-  #   driver:
-  #     vm_hostname: compliance.services.com
-  #     network:
-  #       - ['private_network', {ip: '33.33.33.14'}]
-  #     customize:
-  #       memory: 1024
-  #       cpus: 1

Berksfile.lock

@@ -21,7 +21,7 @@ GRAPH
     chef-ingredient (>= 0.18.0)
   chef-server-ctl (0.1.0)
     chef-server (>= 0.0.0)
-  chef-services (5.0.0)
+  chef-services (5.1.0)
     chef_stack (>= 0.0.0)
     fancy_execute (>= 0.0.0)
   chef_stack (0.5.10)
@@ -37,6 +37,7 @@ GRAPH
     hostsfile (>= 0.0.0)
   test (0.0.1)
     chef-server-ctl (>= 0.0.0)
+    chef_stack (>= 0.0.0)
     hostsfile (>= 0.0.0)
     ntp (>= 0.0.0)
     supermarket-omnibus-cookbook (>= 0.0.0)

files/default/installer.sh

@@ -117,12 +117,12 @@ berks upload --no-ssl-verify
 # --> bootstrap with correct runlist
 
 if [ ! -z $CHEF_AUTOMATE_FQDN ]; then
-  knife bootstrap $CHEF_AUTOMATE_FQDN -N $CHEF_AUTOMATE_FQDN -x $CHEF_USER -P $CHEF_PW --sudo -r "role[patch],recipe[chef-services::delivery]" -j "{\"chef_server\":{\"fqdn\":\"$CHEF_SERVER_FQDN\"},\"chef_automate\":{\"fqdn\":\"$CHEF_AUTOMATE_FQDN\"}}" -E delivered -y --node-ssl-verify-mode none
+  knife bootstrap $CHEF_AUTOMATE_FQDN -N $CHEF_AUTOMATE_FQDN -x $CHEF_USER -P $CHEF_PW --sudo -r "role[compliance],recipe[chef-services::delivery]" -j "{\"chef_server\":{\"fqdn\":\"$CHEF_SERVER_FQDN\"},\"chef_automate\":{\"fqdn\":\"$CHEF_AUTOMATE_FQDN\"}}" -E delivered -y --node-ssl-verify-mode none
 fi
 
 if [ ! -z $CHEF_BUILD_FQDN ]; then
-  knife bootstrap $CHEF_BUILD_FQDN -N $CHEF_BUILD_FQDN -x $CHEF_USER -P $CHEF_PW --sudo -r "role[patch],recipe[chef-services::install_build_nodes]" -j "{\"chef_server\":{\"fqdn\":\"$CHEF_SERVER_FQDN\"},\"chef_automate\":{\"fqdn\":\"$CHEF_AUTOMATE_FQDN\"},\"tags\":\"delivery-build-node\"}" -E delivered -y --node-ssl-verify-mode none
+  knife bootstrap $CHEF_BUILD_FQDN -N $CHEF_BUILD_FQDN -x $CHEF_USER -P $CHEF_PW --sudo -r "role[compliance],recipe[chef-services::install_build_nodes]" -j "{\"chef_server\":{\"fqdn\":\"$CHEF_SERVER_FQDN\"},\"chef_automate\":{\"fqdn\":\"$CHEF_AUTOMATE_FQDN\"},\"tags\":\"delivery-build-node\"}" -E delivered -y --node-ssl-verify-mode none
 fi
 
 echo -e "{\"chef_server\": {\"fqdn\":\"$CHEF_SERVER_FQDN\",\"install_dir\":\"$INSTALL_DIR\"}, \"chef_environment\": \"delivered\"}" > attributes.json
-chef-client -j attributes.json -r 'role[patch],recipe[chef-services::chef-server]'
+chef-client -j attributes.json -r 'role[compliance],recipe[chef-services::chef-server]'

metadata.rb

@@ -4,7 +4,7 @@
 license          'all_rights'
 description      'Installs/Configures chef-services'
 long_description 'Installs/Configures chef-services'
-version          '5.1.0'
+version          '5.2.0'
 
 depends 'fancy_execute'
 depends 'chef_stack'

recipes/chef-server.rb

@@ -37,7 +37,7 @@
   config "file_cache_path '#{node['chef_server']['install_dir']}/chef_installer/.chef/cache'"
   ssl_verify false
   run_list [
-    "role[patch]",
+    "role[compliance]",
     "recipe[chef-services::chef-server]"
   ]
 end

recipes/compliance_patch.rb

@@ -4,10 +4,10 @@
   recursive true
 end
 
-file "#{node['chef_server']['install_dir']}/chef_installer/roles/patch.json" do
+file "#{node['chef_server']['install_dir']}/chef_installer/roles/compliance.json" do
   content <<-EOD
   {
-    "name": "patch",
+    "name": "compliance",
     "description": "",
     "json_class": "Chef::Role",
     "default_attributes": {

test/fixtures/cookbooks/test/recipes/compliance_node.rb

@@ -63,7 +63,7 @@
       "chef_oauth2_verify_ssl": false
     },
     "run_list": [
-        "role[patch]",
+        "role[compliance]",
         "recipe[chef-services::compliance]"
     ],
     "chef_environment": "delivered"

test/fixtures/cookbooks/test/recipes/delivery_build_node.rb

@@ -55,7 +55,7 @@
       "fqdn": "automate.services.com"
     },
     "run_list": [
-        "role[patch]",
+        "role[compliance]",
         "recipe[chef-services::install_build_nodes]"
     ],
     "chef_environment": "delivered"

test/fixtures/cookbooks/test/recipes/delivery_node.rb

@@ -60,7 +60,7 @@
       "fqdn": "chef.services.com"
     },
     "run_list": [
-        "role[patch]",
+        "role[compliance]",
         "recipe[chef-services::delivery]"
     ],
     "chef_environment": "delivered"

test/fixtures/cookbooks/test/recipes/supermarket_node.rb

@@ -63,7 +63,7 @@
       "chef_oauth2_verify_ssl": false
     },
     "run_list": [
-        "role[patch]",
+        "role[compliance]",
         "recipe[chef-services::supermarket]"
     ],
     "chef_environment": "delivered"