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:
6
cloudinit/user-data
Normal file
6
cloudinit/user-data
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
#cloud-config
|
||||||
|
puppet:
|
||||||
|
conf:
|
||||||
|
agent:
|
||||||
|
server: "os-ci-test2.enovance.com"
|
||||||
|
certname: "%i.%f"
|
||||||
@@ -21,6 +21,7 @@
|
|||||||
|
|
||||||
class os_params {
|
class os_params {
|
||||||
$site_domain = "enovance.com"
|
$site_domain = "enovance.com"
|
||||||
|
$os_release = "havana"
|
||||||
$region = "enovance-ci"
|
$region = "enovance-ci"
|
||||||
|
|
||||||
# Root hashed password (enovance by default)
|
# Root hashed password (enovance by default)
|
||||||
|
|||||||
@@ -19,4 +19,21 @@
|
|||||||
|
|
||||||
class os_puppet_master{
|
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',
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user