cloud-init-dev team mailing list archive

[JJ Asghar <jj@xxxxxxx>]

JJ Asghar has proposed merging ~d-jj/cloud-init:chef13 into cloud-init:master.

Requested reviews:
  Server Team CI bot (server-team-bot): continuous-integration
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~d-jj/cloud-init/+git/cloud-init/+merge/325136

This is to update the Chef notes and examples to Chef13 and the standard chef.io domain.
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~d-jj/cloud-init:chef13 into cloud-init:master.

diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index 2be2532..02c70b1 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 3cb6200..9d23581 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 0bec305..66b635a 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