Merge "Fix MOTD not include system ID on controller-1"
This commit is contained in:
commit
42d1114648
puppet-manifests/src/modules/platform
@ -15,6 +15,7 @@ class platform::config
|
|||||||
include ::platform::params
|
include ::platform::params
|
||||||
include ::platform::anchors
|
include ::platform::anchors
|
||||||
include ::platform::config::pam_systemd
|
include ::platform::config::pam_systemd
|
||||||
|
include ::platform::config::system_name
|
||||||
|
|
||||||
stage { 'pre':
|
stage { 'pre':
|
||||||
before => Stage['main'],
|
before => Stage['main'],
|
||||||
@ -257,6 +258,18 @@ class platform::config::hostname {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class platform::config::system_name {
|
||||||
|
$system_name = $platform::params::system_name
|
||||||
|
|
||||||
|
file { '/etc/sysinv/motd.system':
|
||||||
|
ensure => present,
|
||||||
|
owner => 'root',
|
||||||
|
group => 'root',
|
||||||
|
mode => '0644',
|
||||||
|
content => template('platform/system_name.erb'),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class platform::config::apparmor {
|
class platform::config::apparmor {
|
||||||
include ::platform::params
|
include ::platform::params
|
||||||
|
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
<%
|
||||||
|
if !@system_name.nil? && !@system_name.empty?
|
||||||
|
-%>
|
||||||
|
|
||||||
|
<%= "====================================================================" %>
|
||||||
|
<%= " SYSTEM: #{@system_name}" %>
|
||||||
|
<%= "====================================================================" %>
|
||||||
|
|
||||||
|
<% end -%>
|
Loading…
x
Reference in New Issue
Block a user