cloud-init

Merge lp:~d-jj/cloud-init/chef-12-updates into lp:~cloud-init-dev/cloud-init/trunk

  1. chef-12-updates
  2. Merge into trunk
Proposed by JJ Asghar
Status: Rejected
Rejected by: Scott Moser
Proposed branch: lp:~d-jj/cloud-init/chef-12-updates
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 178 lines (+81/-42)
2 files modified
doc/examples/cloud-config-chef.txt (+77/-41)
templates/chef_client.rb.tmpl (+4/-1)
To merge this branch: bzr merge lp:~d-jj/cloud-init/chef-12-updates
Reviewer Review Type Date Requested Status
JJ Asghar (community) Approve
Review via email: mp+262266@code.launchpad.net

Description of the change

This is to update the Chef examples and changes for the newer/est ways
Chef is converting to. Omnibus is now the default installation method, but
there are also more up-to-date package repos at packagecloud.io if the user
still wants to install the deb package.

I have also added the encrypted_data_bag option to the client.rb being that
it is a useful option to have for more secure environments.

To post a comment you must log in.
Revision history for this message
JJ Asghar (d-jj) :
review: Approve
Revision history for this message
JJ Asghar (d-jj) wrote :

I have signed the Canonical Contributors license, and been approved. Is there anything else i need to get this merged?

Revision history for this message
Scott Moser (smoser) wrote :

Hi JJ,
 Sorry for the very slow reply.

 Almost all nit picks inline below.

Thanks for your suggestion,
If you have further questions, please join #cloud-init on Freenode and poke me (smoser).

Revision history for this message
Scott Moser (smoser) wrote :

Hello,
Thank you for taking the time to contribute to cloud-init. Cloud-init has moved its revision control system to git. As a result, we are marking all bzr merge proposals as 'rejected'. If you would like to re-submit this proposal for review, please do so by following the current HACKING documentation at http://cloudinit.readthedocs.io/en/latest/topics/hacking.html .

I believe portions of this might be upstream at this point, see commits
 https://git.launchpad.net/cloud-init/commit/?id=482b2746b5919233
 https://git.launchpad.net/cloud-init/commit/?id=291d2976bd7b

Revision history for this message
JJ Asghar (d-jj) wrote :

Awesome, i've gone ahead and updated: https://code.launchpad.net/~d-jj/cloud-init/+git/cloud-init/+merge/325136

Unmerged revisions

1075. By JJ Asghar

i hate whitespace issues

1074. By JJ Asghar

WS removal

1073. By JJ Asghar

fixed up per Matt Rays suggestions and catches

1072. By JJ Asghar

updated for chef 12 and packagecloud.io changes and also converted to omnibus as the defacto standard to install chef

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'doc/examples/cloud-config-chef.txt'
--- doc/examples/cloud-config-chef.txt 2012-12-12 15:39:43 +0000
+++ doc/examples/cloud-config-chef.txt 2015-06-17 19:47:46 +0000
@@ -1,61 +1,97 @@
1#cloud-config1#cloud-config
2#2#
3# This is an example file to automatically install chef-client and run a 3# This is an example file to automatically install chef-client and run a
4# list of recipes when the instance boots for the first time.4# list of recipes when the instance boots for the first time.
5# Make sure that this file is valid yaml before starting instances.5# Make sure that this file is valid yaml before starting instances.
6# It should be passed as user-data when starting the instance.6# It should be passed as user-data when starting the instance.
7#7#
8# This example assumes the instance is 12.04 (precise)8# This example assumes the instance is 12.04 (precise)
99
1010# The default is to install from omnibus.
11# The default is to install from packages. 11
1212# Key from https://packagecloud.io/gpg.key
13# Key from http://apt.opscode.com/packages@opscode.com.gpg.key
14apt_sources:13apt_sources:
15 - source: "deb http://apt.opscode.com/ $RELEASE-0.10 main"14 - source: "deb https://packagecloud.io/chef/stable/ubuntu/ precise main"
16 key: |15 key: |
17 -----BEGIN PGP PUBLIC KEY BLOCK-----16 -----BEGIN PGP PUBLIC KEY BLOCK-----
18 Version: GnuPG v1.4.9 (GNU/Linux)17 Version: GnuPG v1.4.11 (GNU/Linux)
19 18
20 mQGiBEppC7QRBADfsOkZU6KZK+YmKw4wev5mjKJEkVGlus+NxW8wItX5sGa6kdUu19 mQINBFLUbogBEADceEoxBDoE6QM5xV/13qiELbFIkQgy/eEi3UesXmJblFdU7wcD
21 twAyj7Yr92rF+ICFEP3gGU6+lGo0Nve7KxkN/1W7/m3G4zuk+ccIKmjp8KS3qn9920 LOW3NuOIx/dgbZljeMEerj6N1cR7r7X5sVoFVEZiK4RLkC3Cpdns0d90ud2f3VyK
22 dxy64vcji9jIllVa+XXOGIp0G8GEaj7mbkixL/bMeGfdMlv8Gf2XPpp9vwCgn/GC21 K7PXRBstdLm3JlW9OWZoe4VSADSMGWm1mIhT601qLKKAuWJoBIhnKY/RhA/RBXt7
23 JKacfnw7MpLKUHOYSlb//JsEAJqao3ViNfav83jJKEkD8cf59Y8xKia5OpZqTK5W22 z22g4ta9bT67PlliTo1a8y6DhUA7gd+5TsVHaxDRrzc3mKObdyS5LOT/gf8Ti2tY
24 ShVnNWS3U5IVQk10ZDH97Qn/YrK387H4CyhLE9mxPXs/ul18ioiaars/q2MEKU2I23 BY5MBbQ8NUGExls4dXKlieePhKutFbde7sq3n5sdp1Ndoran1u0LsWnaSDx11R3x
25 XKfV21eMLO9LYd6Ny/Kqj8o5WQK2J6+NAhSwvthZcIEphcFignIuobP+B5wNFQpe24 iYfXJ6xGukAc6pYlUD1yYjU4oRGhD2fPyuewqhHNUVwqupTBQtEGULrtdwK04kgI
26 DbKfA/0WvN2OwFeWRcmmd3Hz7nHTpcnSF+4QX6yHRF/5BgxkG6IqBIACQbzPn6Hm25 H93ssGRsLqUKe88uZeeBczVuupv8ZLd1YcQ29AfJHe6nsevsgjF+eajYlzsvC8BN
27 sMtm/SVf11izmDqSsQptCrOZILfLX/mE+YOl+CwWSHhl+YsFts1WOuh1EhQD26aO26 q3nOvvedcuI6BW4WWFjraH06GNTyMAZi0HibTg65guZXpLcpPW9hTzXMoUrZz8Mv
28 Z84HuHV5HFRWjDLw9LriltBVQcXbpfSrRP5bdr7Wh8vhqJTPjrQnT3BzY29kZSBQ27 J9yUBcFPKuFOLDpRP6uaIbxJsYqiituoltl0vgS/vJcpIVVRwSaqPHa6S63dmKm2
29 YWNrYWdlcyA8cGFja2FnZXNAb3BzY29kZS5jb20+iGAEExECACAFAkppC7QCGwMG28 6gq18v4l05mVcInPn+ciHtcSlZgQkCsRTSvfUrK+7nzyWtNQMGKstAZ7AHCoA8Pb
30 CwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRApQKupg++Caj8sAKCOXmdG36gWji/K29 c3i7wyOtnTgfPFHVpHg3JHsPXKk9/71YogtoNFoETMFeKL1K+O+GMQddYQARAQAB
31 +o+XtBfvdMnFYQCfTCEWxRy2BnzLoBBFCjDSK6sJqCu5Ag0ESmkLtBAIAIO2SwlR30 tDdwYWNrYWdlY2xvdWQgb3BzIChwcm9kdWN0aW9uIGtleSkgPG9wc0BwYWNrYWdl
32 lU5i6gTOp42RHWW7/pmW78CwUqJnYqnXROrt3h9F9xrsGkH0Fh1FRtsnncgzIhvh31 Y2xvdWQuaW8+iQI+BBMBAgAoBQJS1G6IAhsvBQkJZgGABgsJCAcDAgYVCAIJCgsE
33 DLQnRHnkXm0ws0jV0PF74ttoUT6BLAUsFi2SPP1zYNJ9H9fhhK/pjijtAcQwdgxu32 FgIDAQIeAQIXgAAKCRDC5zQk1ZCXq13KD/wNzAi6rEzRyx6NH61Hc19s2QAgcU1p
34 wwNJ5xCEscBZCjhSRXm0d30bK1o49Cow8ZIbHtnXVP41c9QWOzX/LaGZsKQZnaMx33 1mX1Tw0fU7CThx1nr8JrG63465c9dzUpVzNTYvMsUSBJwbb1phahCMNGbJpZRQ5b
35 EzDk8dyyctR2f03vRSVyTFGgdpUcpbr9eTFVgikCa6ODEBv+0BnCH6yGTXwBid9g34 vW/i3azmk/EHKL7wgMV8wu1atu6crrxGoDEfWUa4aIwbxZGkoxDZKZeKaLxz2ZCh
36 w0o1e/2DviKUWCC+AlAUOubLmOIGFBuI4UR+rux9affbHcLIOTiKQXv79lW3P7W835 uKzjvkGUk4PUoOxxPn9XeFmJQ68ys4Z0CgIGfx2i64apqfsjVEdWEEBLoxHFIPy7
37 AAfniSQKfPWXrrcAAwUH/2XBqD4Uxhbs25HDUUiM/m6Gnlj6EsStg8n0nMggLhuN36 FgFafRL0bgsquwPkb5q/dihIzJEZ2EMOGwXuUaKI/UAhgRIUGizuW7ECEjX4FG92
38 QmPfoNByMPUqvA7sULyfr6xCYzbzRNxABHSpf85FzGQ29RF4xsA4vOOU8RDIYQ9X37 8RsizHBjYL5Gl7DMt1KcPFe/YU/AdWEirs9pLQUr9eyGZN7HYJ03Aiy8R5aMBoeY
39 Q8NqqR6pydprRFqWe47hsAN7BoYuhWqTtOLSBmnAnzTR5pURoqcquWYiiEavZixJ38 sfxjifkbWCpbN+SEATaB8YY6Zy2LK/5TiUYNUYb/VHP//ZEv0+uPgkoro6gWVkvG
40 3ZRAq/HMGioJEtMFrvsZjGXuzef7f0ytfR1zYeLVWnL9Bd32CueBlI7dhYwkFe+V39 DdXqH2d9svwfrQKfGSEQYXlLytZKvQSDLAqclSANs/y5HDjUxgtWKdsL3xNPCmff
41 Ep5jWOCj02C1wHcwt+uIRDJV6TdtbIiBYAdOMPk15+VBdweBXwMuYXr76+A7VeDL40 jpyiqS4pvoTiUwS4FwBsIR2sBDToIEHDvTNk1imeSmxCUgDxFzWkmB70FBmwz7zs
42 zIhi7tKFo6WiwjKZq0dzctsJJjtIfr4K4vbiD9Ojg1iISQQYEQIACQUCSmkLtAIb41 9FzuoegrAxXonVit0+f3CxquN7tS0mHaWrZfhHxEIt65edkIz1wETOch3LIg6RaF
43 DAAKCRApQKupg++CauISAJ9CxYPOKhOxalBnVTLeNUkAHGg2gACeIsbobtaD4ZHG42 wsXgrZCNTB/zjKGAFEzxOSBkjhyJCY2g74QNObKgTSeGNFqG0ZBHe2/JQ33UxrDt
44 0GLl8EkfA8uhluM=43 peKvCYTbjuWlyrkCDQRS1G6IARAArtNBXq+CNU9DR2YCi759fLR9F62Ec/QLWY3c
45 =zKAm44 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
77 sA==
78 =H60S
46 -----END PGP PUBLIC KEY BLOCK-----79 -----END PGP PUBLIC KEY BLOCK-----
4780
48chef:81chef:
4982
50 # Valid values are 'gems' and 'packages' and 'omnibus'83 # Valid values are 'gems' and 'packages' and 'omnibus'.
51 install_type: "packages"84 # Omnibus has become the defacto way to describute chef
85 # binaries, if you need the deb, use the packagecloud.io
86 # above.
87 install_type: "omnibus"
5288
53 # Boolean: run 'install_type' code even if chef-client89 # Boolean: run 'install_type' code even if chef-client
54 # appears already installed.90 # appears already installed.
55 force_install: false91 force_install: false
5692
57 # Chef settings93 # Chef settings
58 server_url: "https://chef.yourorg.com:4000"94 server_url: "https://chef.yourorg.com/organizations/myorg/"
5995
60 # Node Name96 # Node Name
61 # Defaults to the instance-id if not present97 # Defaults to the instance-id if not present
@@ -71,8 +107,8 @@
71 -----BEGIN RSA PRIVATE KEY-----107 -----BEGIN RSA PRIVATE KEY-----
72 YOUR-ORGS-VALIDATION-KEY-HERE108 YOUR-ORGS-VALIDATION-KEY-HERE
73 -----END RSA PRIVATE KEY-----109 -----END RSA PRIVATE KEY-----
74 110
75 # A run list for a first boot json111# A run list for a first boot json
76 run_list:112 run_list:
77 - "recipe[apache2]"113 - "recipe[apache2]"
78 - "role[db]"114 - "role[db]"
@@ -85,7 +121,7 @@
85 keepalive: "off"121 keepalive: "off"
86122
87 # if install_type is 'omnibus', change the url to download123 # if install_type is 'omnibus', change the url to download
88 omnibus_url: "https://www.opscode.com/chef/install.sh"124 omnibus_url: "https://chef.io/chef/install.sh"
89125
90126
91# Capture all subprocess output into a logfile127# Capture all subprocess output into a logfile
92128
=== modified file 'templates/chef_client.rb.tmpl'
--- templates/chef_client.rb.tmpl 2014-10-11 23:59:50 +0000
+++ templates/chef_client.rb.tmpl 2015-06-17 19:47:46 +0000
@@ -1,6 +1,6 @@
1## template:jinja1## template:jinja
2{#2{#
3This file is only utilized if the module 'cc_chef' is enabled in 3This file is only utilized if the module 'cc_chef' is enabled in
4cloud-config. Specifically, in order to enable it4cloud-config. Specifically, in order to enable it
5you need to add the following to config:5you need to add the following to config:
6 chef:6 chef:
@@ -56,3 +56,6 @@
56{% if show_time %}56{% if show_time %}
57Chef::Log::Formatter.show_time = true57Chef::Log::Formatter.show_time = true
58{% endif %}58{% endif %}
59{% if encrypted_data_bag_secret %}
60encrypted_data_bag_secret "{{encrypted_data_bag_secret}}"
61{% endif %}