diff options
| author | Scott Moser <smoser@ubuntu.com> | 2010-09-07 21:06:29 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2010-09-07 21:06:29 -0400 |
| commit | da283d59f4b51d4182f6079392e68709165b65f6 (patch) | |
| tree | 341b0798ceff00b93a578aa3c602b82a0b9783ce | |
| parent | 3cfdf654f65882ae3d618b6e7d17d03bf08f9fcb (diff) | |
| parent | c0528202733a9ec576bb89ca4e771b5f09168eae (diff) | |
| download | vyos-cloud-init-da283d59f4b51d4182f6079392e68709165b65f6.tar.gz vyos-cloud-init-da283d59f4b51d4182f6079392e68709165b65f6.zip | |
fix cc_puppet.py missing imports
LP: #632744
| -rw-r--r-- | cloudinit/CloudConfig/cc_puppet.py | 2 | ||||
| -rw-r--r-- | doc/examples/cloud-config-puppet.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cloudinit/CloudConfig/cc_puppet.py b/cloudinit/CloudConfig/cc_puppet.py index ac72057c..8ccfb2df 100644 --- a/cloudinit/CloudConfig/cc_puppet.py +++ b/cloudinit/CloudConfig/cc_puppet.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. import os +import pwd +import socket import subprocess def handle(name,cfg,cloud,log,args): diff --git a/doc/examples/cloud-config-puppet.txt b/doc/examples/cloud-config-puppet.txt index 258418a4..cd3c2f8e 100644 --- a/doc/examples/cloud-config-puppet.txt +++ b/doc/examples/cloud-config-puppet.txt @@ -18,7 +18,7 @@ puppet: # The puppmaster ca certificate will be available in # /var/lib/puppet/ssl/certs/ca.pem conf: - puppetd: + agent: server: "puppetmaster.example.org" # certname supports substitutions at runtime: # %i: instanceid |