Revert "Secure dns and ntp"
This reverts commit 8d8b45e198
.
Change-Id: I1172b7ef30dd081bc740b81d27edb0f715ed27db
This commit is contained in:
parent
5b9ac8c357
commit
e0cc117d03
@ -10,16 +10,11 @@
|
||||
# [*$master_ip*]
|
||||
# Ip address of fuel master node
|
||||
#
|
||||
# [*$management_vrouter_vip*]
|
||||
#
|
||||
# IP address of management interface in vrouter namespace
|
||||
#
|
||||
# === Examples
|
||||
#
|
||||
# class { osnailyfacter::dnsmasq:
|
||||
# external_dns => [ 'pool.ntp.org', 'ntp.local.company.com' ],
|
||||
# master_ip => '1.1.1.1',
|
||||
# management_vrouter_vip => '1.2.3.4'
|
||||
# master_ip => '1.1.1.1'
|
||||
# }
|
||||
#
|
||||
# === Authors
|
||||
@ -32,8 +27,7 @@
|
||||
#
|
||||
class osnailyfacter::dnsmasq (
|
||||
$external_dns,
|
||||
$master_ip,
|
||||
$management_vrouter_vip,
|
||||
$master_ip
|
||||
) {
|
||||
$package_name = $osfamily ? {
|
||||
/(RedHat|CentOS)/ => 'dnsmasq',
|
||||
|
@ -3,12 +3,10 @@ notice('MODULAR: dns-server.pp')
|
||||
$dns_servers = hiera('external_dns')
|
||||
$primary_controller = hiera('primary_controller')
|
||||
$master_ip = hiera('master_ip')
|
||||
$management_vrouter_vip = hiera('management_vrouter_vip')
|
||||
|
||||
class { 'osnailyfacter::dnsmasq':
|
||||
external_dns => strip(split($dns_servers['dns_list'], ',')),
|
||||
master_ip => $master_ip,
|
||||
management_vrouter_vip => $management_vrouter_vip,
|
||||
} ->
|
||||
|
||||
class { 'cluster::dns_ocf':
|
||||
|
@ -1,13 +1,12 @@
|
||||
notice('MODULAR: ntp-client.pp')
|
||||
|
||||
$management_vrouter_vip = hiera('management_vrouter_vip')
|
||||
$management_vip = hiera('management_vrouter_vip')
|
||||
$nodes_hash = hiera('nodes', {})
|
||||
$roles = node_roles($nodes_hash, hiera('uid'))
|
||||
|
||||
if !(member($roles, 'controller') or member($roles, 'primary-controller')) {
|
||||
class { 'ntp':
|
||||
servers => [$management_vrouter_vip],
|
||||
interfaces => ['lo'],
|
||||
servers => [$management_vip],
|
||||
service_ensure => running,
|
||||
service_enable => true,
|
||||
iburst_enable => true,
|
||||
|
@ -1,11 +1,9 @@
|
||||
notice('MODULAR: ntp-server.pp')
|
||||
|
||||
$ntp_servers = hiera('external_ntp')
|
||||
$management_vrouter_vip = hiera('management_vrouter_vip')
|
||||
|
||||
class { 'ntp':
|
||||
servers => strip(split($ntp_servers['ntp_list'], ',')),
|
||||
interfaces => [$management_vrouter_vip],
|
||||
service_enable => false,
|
||||
service_ensure => stopped,
|
||||
iburst_enable => true,
|
||||
|
@ -1,5 +1,3 @@
|
||||
domain=<%= scope.lookupvar('::domain') %>
|
||||
server=/<%= scope.lookupvar('::domain') %>/<%= @master_ip %>
|
||||
resolv-file=/etc/resolv.dnsmasq.conf
|
||||
bind-interfaces
|
||||
listen-address=<%= @management_vrouter_vip %>
|
||||
|
@ -179,7 +179,7 @@ ntp_start()
|
||||
fi
|
||||
|
||||
# run the ntp binary
|
||||
ocf_run ${COMMAND} ${OCF_RESKEY_extraconf} -u ntp:ntp -p "${PIDFILE}" -4 -g -c ${CONF_FILE}
|
||||
ocf_run ${COMMAND} ${OCF_RESKEY_extraconf} -u ntp:ntp -p "${PIDFILE}" -g -c ${CONF_FILE}
|
||||
if [ $? -ne 0 ]; then
|
||||
ocf_log err "Error. ntp daemon returned error $?."
|
||||
return $OCF_ERR_GENERIC
|
||||
|
Loading…
Reference in New Issue
Block a user