summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Harlow <harlowja@gmail.com>2014-11-22 12:41:31 -0800
committerJoshua Harlow <harlowja@gmail.com>2014-11-22 12:41:31 -0800
commit17fef56ab4d1235fb08cae824139b2a7cb6801f4 (patch)
treec4c3c83d39aeda9d498cfe9120454d7dc132c39c
parente4d3fdb65bb31c2c3ed02ffdc14c0437379f64d8 (diff)
parent696ea58ae484e9006477d5b8714a67861511cfcd (diff)
downloadvyos-cloud-init-17fef56ab4d1235fb08cae824139b2a7cb6801f4.tar.gz
vyos-cloud-init-17fef56ab4d1235fb08cae824139b2a7cb6801f4.zip
Update to use a newer and better OMNIBUS_URL
This is minor change which uses the new Chef (company) top level domain for grabbing the Omnibus installation shell script.
-rw-r--r--ChangeLog1
-rw-r--r--cloudinit/config/cc_chef.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5597e10f..d8a2038a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
- Be more tolerant of ssh keys passed into 'ssh_authorized_keys'; allowing
for list, tuple, set, dict, string types and warning on other unexpected
types
+ - Update to use newer/better OMNIBUS_URL for chef module
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/cloudinit/config/cc_chef.py b/cloudinit/config/cc_chef.py
index d5611253..fc837363 100644
--- a/cloudinit/config/cc_chef.py
+++ b/cloudinit/config/cc_chef.py
@@ -90,7 +90,8 @@ REQUIRED_CHEF_DIRS = tuple([
'/etc/chef',
])
-OMNIBUS_URL = "https://www.opscode.com/chef/install.sh"
+# Used if fetching chef from a omnibus style package
+OMNIBUS_URL = "https://www.getchef.com/chef/install.sh"
OMNIBUS_URL_RETRIES = 5
CHEF_VALIDATION_PEM_PATH = '/etc/chef/validation.pem'