Merge pull request #224 from bastelfreak/legacy

Validate legacy domain/fqdn/hostname fact on all factsets & Add missing fqdn/domain/hostname fact to all factsets
voxpupuli · Dec 15, 2021 · e092685 · e092685
2 parents 6b43240 + af35299
commit e092685
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 3 deletions.
diff --git a/facts/3.0/ubuntu-15.10-i386.facts b/facts/3.0/ubuntu-15.10-i386.facts
@@ -1,4 +1,7 @@
 {
+  "hostname": "foo",
+  "domain": "example.com",
+  "fqdn": "foo.example.com",
   "augeas": {
     "version": "1.4.0"
   },

diff --git a/facts/3.0/ubuntu-15.10-x86_64.facts b/facts/3.0/ubuntu-15.10-x86_64.facts
@@ -1,4 +1,7 @@
 {
+  "hostname": "foo",
+  "domain": "example.com",
+  "fqdn": "foo.example.com",
   "augeas": {
     "version": "1.4.0"
   },

diff --git a/facts/3.10/ubuntu-18.04-aarch64.facts b/facts/3.10/ubuntu-18.04-aarch64.facts
@@ -1,4 +1,7 @@
 {
+  "fqdn": "foo.example.com",
+  "domain": "example.com",
+  "hostname": "foo",
   "disks": {
     "mmcblk1": {
       "size": "29.81 GiB",
@@ -301,8 +304,8 @@
   },
   "networking": {
     "dhcp": "192.168.1.1",
-    "fqdn": "master1",
-    "hostname": "master1",
+    "fqdn": "foo.example.com",
+    "hostname": "foo",
     "interfaces": {
       "datapath": {
         "bindings6": [

diff --git a/facts/3.2/aix-53-powerpc.facts b/facts/3.2/aix-53-powerpc.facts
@@ -1,4 +1,7 @@
 {
+  "fqdn": "foo.example.com",
+  "domain": "example.com",
+  "hostname": "foo",
   "augeas": {
     "version": "1.4.0"
   },

diff --git a/facts/3.2/aix-61-powerpc.facts b/facts/3.2/aix-61-powerpc.facts
@@ -1,4 +1,7 @@
 {
+  "hostname": "foo",
+  "domain": "example.com",
+  "fqdn": "foo.example.com",
   "augeas": {
     "version": "1.4.0"
   },

diff --git a/facts/3.2/aix-71-powerpc.facts b/facts/3.2/aix-71-powerpc.facts
@@ -1,4 +1,7 @@
 {
+  "fqdn": "foo.example.com",
+  "domain": "example.com",
+  "hostname": "foo",
   "augeas": {
     "version": "1.4.0"
   },

diff --git a/facts/3.6/pcs-6-x86_64.facts b/facts/3.6/pcs-6-x86_64.facts
@@ -1,4 +1,7 @@
 {
+  "fqdn": "foo.example.com",
+  "domain": "example.com",
+  "hostname": "foo",
   "aio_agent_version": "1.10.1",
   "augeas": {
     "version": "1.4.0"

diff --git a/spec/facts_spec.rb b/spec/facts_spec.rb
@@ -134,7 +134,6 @@
         expect(content['systemd_internal_services']).to be_nil
       end
       it 'contains a legacy hostname, domain and fqdn fact' do
-        pending KNOWN_HOSTNAME_PENDING[relative_path] if KNOWN_HOSTNAME_PENDING.key?(relative_path)
         expect(content['hostname']).to eq('foo')
         expect(content['fqdn']).to eq('foo.example.com')
         expect(content['domain']).to eq('example.com')