From ad2680a689ab78847ccce7766d6591797d99e219 Mon Sep 17 00:00:00 2001 From: JJ Asghar Date: Mon, 5 Jun 2017 20:36:12 -0500 Subject: Chef: Update omnibus url to chef.io, minor doc changes. - Updated to standard chef.io url - Removed the port 4000, due to that has been deprecated - Added Note about the run_list not being required Signed-off-by: JJ Asghar --- cloudinit/config/cc_chef.py | 2 +- doc/examples/cloud-config-chef.txt | 12 ++++++------ .../configs/examples/install_run_chef_recipes.yaml | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py index 2be2532c..02c70b10 100644 --- a/cloudinit/config/cc_chef.py +++ b/cloudinit/config/cc_chef.py @@ -92,7 +92,7 @@ REQUIRED_CHEF_DIRS = tuple([ ]) # Used if fetching chef from a omnibus style package -OMNIBUS_URL = "https://www.getchef.com/chef/install.sh" +OMNIBUS_URL = "https://www.chef.io/chef/install.sh" OMNIBUS_URL_RETRIES = 5 CHEF_VALIDATION_PEM_PATH = '/etc/chef/validation.pem' diff --git a/doc/examples/cloud-config-chef.txt b/doc/examples/cloud-config-chef.txt index 3cb62006..9d235817 100644 --- a/doc/examples/cloud-config-chef.txt +++ b/doc/examples/cloud-config-chef.txt @@ -1,6 +1,6 @@ #cloud-config # -# This is an example file to automatically install chef-client and run a +# This is an example file to automatically install chef-client and run a # list of recipes when the instance boots for the first time. # Make sure that this file is valid yaml before starting instances. # It should be passed as user-data when starting the instance. @@ -8,7 +8,7 @@ # This example assumes the instance is 16.04 (xenial) -# The default is to install from packages. +# The default is to install from packages. # Key from https://packages.chef.io/chef.asc apt: @@ -60,7 +60,7 @@ chef: force_install: false # Chef settings - server_url: "https://chef.yourorg.com:4000" + server_url: "https://chef.yourorg.com" # Node Name # Defaults to the instance-id if not present @@ -78,8 +78,8 @@ chef: -----BEGIN RSA PRIVATE KEY----- YOUR-ORGS-VALIDATION-KEY-HERE -----END RSA PRIVATE KEY----- - - # A run list for a first boot json + + # A run list for a first boot json, an example (not required) run_list: - "recipe[apache2]" - "role[db]" @@ -92,7 +92,7 @@ chef: keepalive: "off" # if install_type is 'omnibus', change the url to download - omnibus_url: "https://www.opscode.com/chef/install.sh" + omnibus_url: "https://www.chef.io/chef/install.sh" # Capture all subprocess output into a logfile diff --git a/tests/cloud_tests/configs/examples/install_run_chef_recipes.yaml b/tests/cloud_tests/configs/examples/install_run_chef_recipes.yaml index 0bec305e..66b635a8 100644 --- a/tests/cloud_tests/configs/examples/install_run_chef_recipes.yaml +++ b/tests/cloud_tests/configs/examples/install_run_chef_recipes.yaml @@ -56,7 +56,7 @@ cloud_config: | force_install: false # Chef settings - server_url: "https://chef.yourorg.com:4000" + server_url: "https://chef.yourorg.com" # Node Name # Defaults to the instance-id if not present @@ -75,7 +75,7 @@ cloud_config: | YOUR-ORGS-VALIDATION-KEY-HERE -----END RSA PRIVATE KEY----- - # A run list for a first boot json + # A run list for a first boot json, this is an example (not required) run_list: - "recipe[apache2]" - "role[db]" @@ -88,7 +88,7 @@ cloud_config: | keepalive: "off" # if install_type is 'omnibus', change the url to download - omnibus_url: "https://www.opscode.com/chef/install.sh" + omnibus_url: "https://www.chef.io/chef/install.sh" # Capture all subprocess output into a logfile -- cgit v1.2.3