Merge "Also consider podman containers when running facter"

2018-10-04 07:23:09 +00:00 · 2018-10-04 07:23:09 +00:00 · e65b6cceab
parent 286197f2bd 48bb89e22c
commit e65b6cceab
1 changed files with 2 additions and 1 deletions
--- a/lib/facter/pacemaker_node_name.rb
+++ b/lib/facter/pacemaker_node_name.rb
@ -1,6 +1,7 @@
 require 'facter'

-if not File.exists?('/.dockerenv')
+# Do not call crm_node -n when running inside a container
+if not File.exists?('/.dockerenv') and not File.exists?('/run/.containerenv')
  Facter.add('pacemaker_node_name') do
    setcode do
      Facter::Core::Execution.exec 'crm_node -n'