Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 452acfacd9 | |||
| a5ed2c278e | |||
| aa125b5e83 | |||
| a250d30d7d | |||
| e90884507b | |||
| 49c14e7bda | |||
| 3726210d38 |
@@ -2,6 +2,8 @@
|
||||
hiera_include:
|
||||
- glauth
|
||||
|
||||
profiles::puppet::migrate::enabled: true
|
||||
|
||||
# additional altnames
|
||||
profiles::pki::vault::alt_names:
|
||||
- ldap.main.unkin.net
|
||||
|
||||
@@ -3,6 +3,8 @@ hiera_include:
|
||||
- profiles::ceph::rgw
|
||||
- profiles::nginx::simpleproxy
|
||||
|
||||
profiles::puppet::migrate::enabled: true
|
||||
|
||||
profiles::ceph::rgw::enable: true
|
||||
|
||||
# FIXME: puppet-python wants to try manage python-dev, which is required by the ceph package
|
||||
|
||||
@@ -4,6 +4,8 @@ hiera_include:
|
||||
- frrouting
|
||||
- exporters::frr_exporter
|
||||
|
||||
profiles::puppet::migrate::enabled: true
|
||||
|
||||
profiles::packages::include:
|
||||
cobbler: {}
|
||||
cobbler3.2-web: {}
|
||||
|
||||
@@ -4,6 +4,8 @@ hiera_include:
|
||||
- profiles::dhcp::server
|
||||
- exporters::frr_exporter
|
||||
|
||||
profiles::puppet::migrate::enabled: true
|
||||
|
||||
# networking
|
||||
anycast_ip: 198.18.19.18
|
||||
systemd::manage_networkd: true
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
profiles::puppet::migrate::enabled: true
|
||||
|
||||
profiles::pki::vault::alt_names:
|
||||
- jumphost.service.consul
|
||||
- jumphost.query.consul
|
||||
|
||||
@@ -31,7 +31,7 @@ profiles::puppet::enc::repo: https://git.service.au-syd1.consul/unkinben/puppet-
|
||||
# Deep-merged with the entries in roles/infra/puppet.yaml.
|
||||
profiles::packages::include:
|
||||
encapic:
|
||||
ensure: '0.2.0'
|
||||
ensure: '0.5.0'
|
||||
certmanager:
|
||||
ensure: '0.2.0'
|
||||
sshsignhost:
|
||||
|
||||
@@ -5,14 +5,13 @@
|
||||
# config so the encapi endpoint can change without repackaging.
|
||||
class profiles::puppet::encapic (
|
||||
Stdlib::HTTPUrl $encapi_url,
|
||||
Stdlib::AbsolutePath $config_dir = '/etc/encapic',
|
||||
Stdlib::AbsolutePath $config_dir = '/etc/encapi',
|
||||
String $config_name = 'encapic.conf',
|
||||
String $owner = 'root',
|
||||
String $group = 'root',
|
||||
) {
|
||||
|
||||
# The RPM ships this file as %config(noreplace), so puppet must write it only
|
||||
# once the package is present or the install overwrites it.
|
||||
# order after the package so the shim exists before the config does.
|
||||
file { $config_dir:
|
||||
ensure => directory,
|
||||
mode => '0755',
|
||||
@@ -29,4 +28,11 @@ class profiles::puppet::encapic (
|
||||
content => "ENCAPI_URL=${encapi_url}\n",
|
||||
require => File[$config_dir],
|
||||
}
|
||||
|
||||
# legacy pre-0.5.0 config dir; also clears any rpm .rpmsave left behind
|
||||
file { '/etc/encapic':
|
||||
ensure => absent,
|
||||
force => true,
|
||||
require => Package['encapic'],
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user