diff --git a/deployment/puppet/osnailyfacter/manifests/dnsmasq.pp b/deployment/puppet/osnailyfacter/manifests/dnsmasq.pp index 30f9499675..0855d02fb8 100644 --- a/deployment/puppet/osnailyfacter/manifests/dnsmasq.pp +++ b/deployment/puppet/osnailyfacter/manifests/dnsmasq.pp @@ -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' +# external_dns => [ 'pool.ntp.org', 'ntp.local.company.com' ], +# 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', diff --git a/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp b/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp index 54f0ad75ed..1e80dfa062 100644 --- a/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp +++ b/deployment/puppet/osnailyfacter/modular/dns/dns-server.pp @@ -1,14 +1,12 @@ 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') +$dns_servers = hiera('external_dns') +$primary_controller = hiera('primary_controller') +$master_ip = hiera('master_ip') class { 'osnailyfacter::dnsmasq': - external_dns => strip(split($dns_servers['dns_list'], ',')), - master_ip => $master_ip, - management_vrouter_vip => $management_vrouter_vip, + external_dns => strip(split($dns_servers['dns_list'], ',')), + master_ip => $master_ip, } -> class { 'cluster::dns_ocf': diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp index cdd40aa0d1..11eef4cbcc 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-client.pp @@ -1,13 +1,12 @@ notice('MODULAR: ntp-client.pp') -$management_vrouter_vip = hiera('management_vrouter_vip') -$nodes_hash = hiera('nodes', {}) -$roles = node_roles($nodes_hash, hiera('uid')) +$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, diff --git a/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp b/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp index f7098e2a50..e55a39d7ab 100644 --- a/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp +++ b/deployment/puppet/osnailyfacter/modular/ntp/ntp-server.pp @@ -1,11 +1,9 @@ notice('MODULAR: ntp-server.pp') -$ntp_servers = hiera('external_ntp') -$management_vrouter_vip = hiera('management_vrouter_vip') +$ntp_servers = hiera('external_ntp') class { 'ntp': servers => strip(split($ntp_servers['ntp_list'], ',')), - interfaces => [$management_vrouter_vip], service_enable => false, service_ensure => stopped, iburst_enable => true, diff --git a/deployment/puppet/osnailyfacter/templates/dnsmasq.conf.erb b/deployment/puppet/osnailyfacter/templates/dnsmasq.conf.erb index 406f697e56..96547dd0a3 100644 --- a/deployment/puppet/osnailyfacter/templates/dnsmasq.conf.erb +++ b/deployment/puppet/osnailyfacter/templates/dnsmasq.conf.erb @@ -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 %> diff --git a/files/fuel-ha-utils/ocf/ns_ntp b/files/fuel-ha-utils/ocf/ns_ntp index e51de7e022..f1b55d4335 100644 --- a/files/fuel-ha-utils/ocf/ns_ntp +++ b/files/fuel-ha-utils/ocf/ns_ntp @@ -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