Fix prometheus test

diff --git a/.kitchen.yml b/.kitchen.yml
index 7c446effcc7dd0376579f18028160f24a2083474..854666cc6f144da828f0d82d36baea55a82d5ead 100644 (file)
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -278,6 +278,15 @@ suites:
   - name: prometheus
     run_list:
       - recipe[prometheus::default]
   - name: prometheus
     run_list:
       - recipe[prometheus::default]

+    attributes:
+      networking:
+        interfaces:
+          test:
+            interface: eth0
+            role: internal
+            address: 172.18.0.2
+            prefix: 16
+            gateway: 172.18.0.1

   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]
   - name: prometheus-server
     run_list:
       - recipe[prometheus::server]

diff --git a/cookbooks/networking/attributes/default.rb b/cookbooks/networking/attributes/default.rb
index 3872a516516f0a481a10f96ea6419bddf87525ba..23cd15eb0652a2470f35168cb174bff402640ae4 100644 (file)
--- a/cookbooks/networking/attributes/default.rb
+++ b/cookbooks/networking/attributes/default.rb
@@ -7,6 +7,7 @@ default[:networking][:firewall][:log] = true
 default[:networking][:firewall][:mark] = true
 default[:networking][:firewall][:raw] = true
 default[:networking][:firewall][:mangle] = true
 default[:networking][:firewall][:mark] = true
 default[:networking][:firewall][:raw] = true
 default[:networking][:firewall][:mangle] = true

+default[:networking][:roles] = {}

 default[:networking][:interfaces] = {}
 default[:networking][:nameservers] = []
 default[:networking][:search] = []
 default[:networking][:interfaces] = {}
 default[:networking][:nameservers] = []
 default[:networking][:search] = []

diff --git a/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb b/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
index c37883d15ab0395ac8ed3f6df95f959fc897ff2d..bb178dd96a53bd19cb66380e6babe14f772cef21 100644 (file)
--- a/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
+++ b/test/integration/prometheus/serverspec/prometheus_node_exporter_spec.rb
@@ -13,5 +13,5 @@ describe service("prometheus-node-exporter") do
 end
 
 describe port(9100) do
 end
 
 describe port(9100) do

-  it { should be_listening.with("tcp6") }
+  it { should be_listening.with("tcp") }

 end
 end