openstack/fuel-library
Code Issues Proposed changes

Revert "Secure dns and ntp"

Browse Source 
This reverts commit 8d8b45e198.

Change-Id: I1172b7ef30dd081bc740b81d27edb0f715ed27db
This commit is contained in:
Stanislaw Bogatkin 2015-07-01 12:16:40 -05:00
parent 5b9ac8c357
commit e0cc117d03
6 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/puppet/osnailyfacter/manifests/dnsmasq.pp
View File

@ -10,16 +10,11 @@
# [*$master_ip*] # [*$master_ip*]
# Ip address of fuel master node # Ip address of fuel master node
# #
# [*$management_vrouter_vip*]
#
# IP address of management interface in vrouter namespace
#
# === Examples # === Examples
# #
# class { osnailyfacter::dnsmasq: # class { osnailyfacter::dnsmasq:
# external_dns => [ 'pool.ntp.org', 'ntp.local.company.com' ], # external_dns => [ 'pool.ntp.org', 'ntp.local.company.com' ],
# master_ip => '1.1.1.1', # master_ip => '1.1.1.1'
# management_vrouter_vip => '1.2.3.4'
# } # }
# #
# === Authors # === Authors
@ -32,8 +27,7 @@
# #
class osnailyfacter::dnsmasq ( class osnailyfacter::dnsmasq (
$external_dns, $external_dns,
$master_ip, $master_ip
$management_vrouter_vip,
) { ) {
$package_name = $osfamily ? { $package_name = $osfamily ? {
/(RedHat|CentOS)/ => 'dnsmasq', /(RedHat|CentOS)/ => 'dnsmasq',

2
deployment/puppet/osnailyfacter/modular/dns/dns-server.pp
View File

@ -3,12 +3,10 @@ notice('MODULAR: dns-server.pp')
$dns_servers = hiera('external_dns') $dns_servers = hiera('external_dns')
$primary_controller = hiera('primary_controller') $primary_controller = hiera('primary_controller')
$master_ip = hiera('master_ip') $master_ip = hiera('master_ip')
$management_vrouter_vip = hiera('management_vrouter_vip')
class { 'osnailyfacter::dnsmasq': class { 'osnailyfacter::dnsmasq':
external_dns => strip(split($dns_servers['dns_list'], ',')), external_dns => strip(split($dns_servers['dns_list'], ',')),
master_ip => $master_ip, master_ip => $master_ip,
management_vrouter_vip => $management_vrouter_vip,
} -> } ->
class { 'cluster::dns_ocf': class { 'cluster::dns_ocf':

5
deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp
View File

@ -1,13 +1,12 @@
notice('MODULAR: ntp-client.pp') notice('MODULAR: ntp-client.pp')
$management_vrouter_vip = hiera('management_vrouter_vip') $management_vip = hiera('management_vrouter_vip')
$nodes_hash = hiera('nodes', {}) $nodes_hash = hiera('nodes', {})
$roles = node_roles($nodes_hash, hiera('uid')) $roles = node_roles($nodes_hash, hiera('uid'))
if !(member($roles, 'controller') or member($roles, 'primary-controller')) { if !(member($roles, 'controller') or member($roles, 'primary-controller')) {
class { 'ntp': class { 'ntp':
servers => [$management_vrouter_vip], servers => [$management_vip],
interfaces => ['lo'],
service_ensure => running, service_ensure => running,
service_enable => true, service_enable => true,
iburst_enable => true, iburst_enable => true,

2
deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp
View File

@ -1,11 +1,9 @@
notice('MODULAR: ntp-server.pp') notice('MODULAR: ntp-server.pp')
$ntp_servers = hiera('external_ntp') $ntp_servers = hiera('external_ntp')
$management_vrouter_vip = hiera('management_vrouter_vip')
class { 'ntp': class { 'ntp':
servers => strip(split($ntp_servers['ntp_list'], ',')), servers => strip(split($ntp_servers['ntp_list'], ',')),
interfaces => [$management_vrouter_vip],
service_enable => false, service_enable => false,
service_ensure => stopped, service_ensure => stopped,
iburst_enable => true, iburst_enable => true,

2
deployment/puppet/osnailyfacter/templates/dnsmasq.conf.erb
View File

@ -1,5 +1,3 @@
domain=<%= scope.lookupvar('::domain') %> domain=<%= scope.lookupvar('::domain') %>
server=/<%= scope.lookupvar('::domain') %>/<%= @master_ip %> server=/<%= scope.lookupvar('::domain') %>/<%= @master_ip %>
resolv-file=/etc/resolv.dnsmasq.conf resolv-file=/etc/resolv.dnsmasq.conf
bind-interfaces
listen-address=<%= @management_vrouter_vip %>

2
files/fuel-ha-utils/ocf/ns_ntp
View File

@ -179,7 +179,7 @@ ntp_start()
fi fi
# run the ntp binary # 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 if [ $? -ne 0 ]; then
ocf_log err "Error. ntp daemon returned error $?." ocf_log err "Error. ntp daemon returned error $?."
return $OCF_ERR_GENERIC return $OCF_ERR_GENERIC