x/cloud-init
Code Issues Proposed changes

Renamed hosts to match the ubuntu distro.

Browse Source 
Also converted all the other templates to tempita format instead of the more complicated (and more dependent on other packages) cheetah format.
This commit is contained in:
Joshua Harlow 2012-06-15 17:40:55 -07:00
parent a6304508dd
commit 28301fc16c
4 changed files with 62 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
templates/chef_client.rb.tmpl
View File

@ -1,12 +1,12 @@
log_level :info
log_location "/var/log/chef/client.log"
ssl_verify_mode :verify_none
validation_client_name "$validation_name"
validation_client_name "{{validation_name}}"
validation_key "/etc/chef/validation.pem"
client_key "/etc/chef/client.pem"
chef_server_url "$server_url"
environment "$environment"
node_name "$node_name"
chef_server_url "{{server_url}}"
environment "{{environment}}"
node_name "{{node_name}}"
json_attribs "/etc/chef/firstboot.json"
file_cache_path "/var/cache/chef"
file_backup_path "/var/backups/chef"

2
templates/default-locale.tmpl
View File

@ -1 +1 @@
LANG="$locale"
LANG="{{locale}}"

15
templates/hosts.tmpl → templates/hosts.ubuntu.tmpl
View File

@ -1,9 +1,7 @@
## This file (/etc/cloud/templates/hosts.tmpl) is only utilized
## if enabled in cloud-config. Specifically, in order to enable it
## you need to add the following to config:
## manage_etc_hosts: True
##
## Note, double-hash commented lines will not appear in /etc/hosts
{{# This file /etc/cloud/templates/hosts.tmpl is only utilized
if enabled in cloud-config. Specifically, in order to enable it
you need to add the following to config:
manage_etc_hosts: True}}
#
# Your system has configured 'manage_etc_hosts' as True.
# As a result, if you wish for changes to this file to persist
@ -12,8 +10,8 @@
# b.) change or remove the value of 'manage_etc_hosts' in
# /etc/cloud/cloud.cfg or cloud-config from user-data
#
## The value '$hostname' will be replaced with the local-hostname
127.0.1.1 $fqdn $hostname
# The following lines are desirable for IPv4 capable hosts
127.0.1.1 {{fqdn}} {{hostname}}
127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts
@ -23,3 +21,4 @@ ff00::0 ip6-mcastprefix
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
ff02::3 ip6-allhosts

101
templates/sources.list.tmpl
View File

@ -1,60 +1,59 @@
\## Note, this file is written by cloud-init on first boot of an instance
\## modifications made here will not survive a re-bundle.
\## if you wish to make changes you can:
\## a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
\## or do the same in user-data
\## b.) add sources in /etc/apt/sources.list.d
\## c.) make changes to template file /etc/cloud/templates/sources.list.tmpl
\###
# Note, this file is written by cloud-init on first boot of an instance
# modifications made here will not survive a re-bundle.
# if you wish to make changes you can:
# a.) add 'apt_preserve_sources_list: true' to /etc/cloud/cloud.cfg
# or do the same in user-data
# b.) add sources in /etc/apt/sources.list.d
# c.) make changes to template file /etc/cloud/templates/sources.list.tmpl
# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
# newer versions of the distribution.
deb $mirror $codename main
deb-src $mirror $codename main
deb {{mirror}} {{codename}} main
deb-src {{mirror}} {{codename}} main
\## Major bug fix updates produced after the final release of the
\## distribution.
deb $mirror $codename-updates main
deb-src $mirror $codename-updates main
# Major bug fix updates produced after the final release of the
# distribution.
deb {{mirror}} {{codename}}-updates main
deb-src {{mirror}} {{codename}}-updates main
\## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
\## team. Also, please note that software in universe WILL NOT receive any
\## review or updates from the Ubuntu security team.
deb $mirror $codename universe
deb-src $mirror $codename universe
deb $mirror $codename-updates universe
deb-src $mirror $codename-updates universe
# N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
# team. Also, please note that software in universe WILL NOT receive any
# review or updates from the Ubuntu security team.
deb {{mirror}} {{codename}} universe
deb-src {{mirror}} {{codename}} universe
deb {{mirror}} {{codename}}-updates universe
deb-src {{mirror}} {{codename}}-updates universe
\## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
\## team, and may not be under a free licence. Please satisfy yourself as to
\## your rights to use the software. Also, please note that software in
\## multiverse WILL NOT receive any review or updates from the Ubuntu
\## security team.
# deb $mirror $codename multiverse
# deb-src $mirror $codename multiverse
# deb $mirror $codename-updates multiverse
# deb-src $mirror $codename-updates multiverse
# N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
# team, and may not be under a free licence. Please satisfy yourself as to
# your rights to use the software. Also, please note that software in
# multiverse WILL NOT receive any review or updates from the Ubuntu
# security team.
# deb {{mirror}} {{codename}} multiverse
# deb-src {{mirror}} {{codename}} multiverse
# deb {{mirror}} {{codename}}-updates multiverse
# deb-src {{mirror}} {{codename}}-updates multiverse
\## Uncomment the following two lines to add software from the 'backports'
\## repository.
\## N.B. software from this repository may not have been tested as
\## extensively as that contained in the main release, although it includes
\## newer versions of some applications which may provide useful features.
\## Also, please note that software in backports WILL NOT receive any review
\## or updates from the Ubuntu security team.
# deb $mirror $codename-backports main restricted universe multiverse
# deb-src $mirror $codename-backports main restricted universe multiverse
# Uncomment the following two lines to add software from the 'backports'
# repository.
# N.B. software from this repository may not have been tested as
# extensively as that contained in the main release, although it includes
# newer versions of some applications which may provide useful features.
# Also, please note that software in backports WILL NOT receive any review
# or updates from the Ubuntu security team.
# deb {{mirror}} {{codename}}-backports main restricted universe multiverse
# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
\## Uncomment the following two lines to add software from Canonical's
\## 'partner' repository.
\## This software is not part of Ubuntu, but is offered by Canonical and the
\## respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu $codename partner
# deb-src http://archive.canonical.com/ubuntu $codename partner
# Uncomment the following two lines to add software from Canonical's
# 'partner' repository.
# This software is not part of Ubuntu, but is offered by Canonical and the
# respective vendors as a service to Ubuntu users.
# deb http://archive.canonical.com/ubuntu {{codename}} partner
# deb-src http://archive.canonical.com/ubuntu {{codename}} partner
deb http://security.ubuntu.com/ubuntu $codename-security main
deb-src http://security.ubuntu.com/ubuntu $codename-security main
deb http://security.ubuntu.com/ubuntu $codename-security universe
deb-src http://security.ubuntu.com/ubuntu $codename-security universe
# deb http://security.ubuntu.com/ubuntu $codename-security multiverse
# deb-src http://security.ubuntu.com/ubuntu $codename-security multiverse
deb http://security.ubuntu.com/ubuntu {{codename}}-security main
deb-src http://security.ubuntu.com/ubuntu {{codename}}-security main
deb http://security.ubuntu.com/ubuntu {{codename}}-security universe
deb-src http://security.ubuntu.com/ubuntu {{codename}}-security universe
# deb http://security.ubuntu.com/ubuntu {{codename}}-security multiverse
# deb-src http://security.ubuntu.com/ubuntu {{codename}}-security multiverse