Updates (see commit msg)

- Add os_release variable
- Add cloudinit user-data file
- Clone & prepare puppet submodules on Puppet Master

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2013-10-15 20:48:32 +02:00
parent 20ec9f7e28
commit 502b0c6258
3 changed files with 24 additions and 0 deletions

6
cloudinit/user-data Normal file
View File

@@ -0,0 +1,6 @@
#cloud-config
puppet:
conf:
agent:
server: "os-ci-test2.enovance.com"
certname: "%i.%f"

View File

@@ -21,6 +21,7 @@
class os_params {
$site_domain = "enovance.com"
$os_release = "havana"
$region = "enovance-ci"
# Root hashed password (enovance by default)

View File

@@ -19,4 +19,21 @@
class os_puppet_master{
# Install Puppet submodules
vcsrepo { '/etc/puppet/modules/':
ensure => latest,
provider => git,
require => [ Package["git"] ],
source => "gitolite@git.labs.enovance.com:puppet.git",
revision => "openstack-${$os_params::os_release}/master",
}
->
exec { '/usr/bin/git submodule init':
cwd => '/etc/puppet/modules',
}
->
exec { '/usr/bin/git submodule update':
cwd => '/etc/puppet/modules',
}
}