Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Hiera configures the primary listen interface, no magic ifname lookup anymore #142

Merged
merged 1 commit into from
Mar 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions .puppet/hieradata/common.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
---
icinga::icingaweb2::listen_ip: "%{ipaddress_eth1}"
# node::ipaddress is specified in `node/{::fqdn}.yaml`
#
icinga::icingaweb2::listen_ip: "%{lookup('node::ipaddress')}"
icinga::icingaweb2::fqdn: "%{fqdn}"
icinga::icinga2::node_name: "%{fqdn}"

graphite::carbon::listen_ip: "%{ipaddress_eth1}"
graphite::carbon::listen_ip: "%{lookup('node::ipaddress')}"
graphite::carbon::listen_port: "2003"
graphite::web::listen_ip: "%{ipaddress_eth1}"
graphite::web::listen_ip: "%{lookup('node::ipaddress')}"
graphite::web::listen_port: "8003"

influxdb::server::listen_ip: "%{ipaddress_eth1}"
influxdb::server::listen_ip: "%{lookup('node::ipaddress')}"
influxdb::server::listen_port: "8086"

grafana::server::listen_ip: "%{ipaddress_eth1}"
grafana::server::listen_ip: "%{lookup('node::ipaddress')}"
grafana::server::listen_port: "8004"

elastic::elasticsearch::listen_ip: "localhost"
elastic::elasticsearch::listen_port: "9200"
elastic::kibana::listen_ip: "localhost"
elastic::kibana::listen_port: "5601"

graylog::gelf::listen_ip: "%{ipaddress_eth1}"
graylog::gelf::listen_ip: "%{lookup('node::ipaddress')}"
graylog::gelf::listen_port: "12201"
graylog::web::listen_ip: "%{ipaddress_eth1}"
graylog::web::listen_port: "9000"
graylog::web::listen_ip: "%{lookup('node::ipaddress')}"
graylog::web::listen_port: "9000"

#dashing::server::listen_ip: "%{::ipaddress_eth1}"
#dashing::server::listen_ip: "%{lookup('node::ipaddress')}"
#dashing::server::listen_port: "8005"

# Repos
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node::ipaddress: "192.168.33.7"

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node::ipaddress: "192.168.33.6"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node::ipaddress: "192.168.33.8"
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node::ipaddress: "192.168.33.101"

icinga::icinga2::zone_name: "master"
icinga::icinga2::zones:
master:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
node::ipaddress: "192.168.33.102"

icinga::icinga2::zone_name: "satellite"
icinga::icinga2::zones:
master:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node::ipaddress: "192.168.33.5"
4 changes: 2 additions & 2 deletions distributed/Vagrantfile.nodes
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nodes = {
:box_libvirt => 'centos/7',
:mac => '020027001000',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.101',
:hostonly => '192.168.33.101', # keep in sync with hieradata
:memory => '1024',
:cpus => '2',
:forwarded => {
Expand All @@ -32,7 +32,7 @@ nodes = {
:box_libvirt => 'centos/7',
:mac => '020027002000',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.102',
:hostonly => '192.168.33.102', # keep in sync with hieradata
:memory => '1024',
:cpus => '2',
:forwarded => {
Expand Down
2 changes: 1 addition & 1 deletion elastic/Vagrantfile.nodes
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ nodes = {
:box_parallels => 'bento/centos-7.4',
:box_libvirt => 'centos/7',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.7',
:hostonly => '192.168.33.7', # keep in sync with hieradata
:memory => '2048',
:cpus => '2',
:mac => '020027000900',
Expand Down
2 changes: 1 addition & 1 deletion graylog/Vagrantfile.nodes
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ nodes = {
:box_parallels => 'bento/centos-7.4',
:box_libvirt => 'centos/7',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.6',
:hostonly => '192.168.33.6', # keep in sync with hieradata
:memory => '2048',
:cpus => '2',
:mac => '020027000600',
Expand Down
2 changes: 1 addition & 1 deletion influxdb/Vagrantfile.nodes
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ nodes = {
:box_parallels => 'bento/centos-7.4',
:box_libvirt => 'centos/7',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.8',
:hostonly => '192.168.33.8', # keep in sync with hieradata
:memory => '2048',
:cpus => '2',
:mac => '020027000199',
Expand Down
2 changes: 1 addition & 1 deletion standalone/Vagrantfile.nodes
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ nodes = {
:box_parallels => 'bento/centos-7.4',
:box_libvirt => 'centos/7',
:net => 'vagrant.demo.icinga.com',
:hostonly => '192.168.33.5',
:hostonly => '192.168.33.5', # keep in sync with hieradata
:memory => '2048',
:cpus => '2',
:mac => '020027000500',
Expand Down