Browse Source

Add ubuntu16 facts

Change-Id: I17575d71cb2fa5e54ec170f37104bc1361ac9aa7
Related-Bug: 1614157
Dmitry Ilyin 2 years ago
parent
commit
35844aca65
5 changed files with 304 additions and 5 deletions
  1. 0
    0
      facts/ubuntu14.yaml
  2. 299
    0
      facts/ubuntu16.yaml
  3. 1
    1
      lib/noop/config/facts.rb
  4. 1
    1
      lib/noop/manager/options.rb
  5. 3
    3
      spec/lib/task_spec.rb

facts/ubuntu.yaml → facts/ubuntu14.yaml View File


+ 299
- 0
facts/ubuntu16.yaml View File

@@ -0,0 +1,299 @@
1
+--- 
2
+  partitions: 
3
+    sda1: 
4
+      size: "49152"
5
+      label: primary
6
+    sda2: 
7
+      size: "409600"
8
+      label: primary
9
+    sda3: 
10
+      uuid: ae0ac634-e27b-42f3-9153-d92a0068220d
11
+      size: "409600"
12
+      mount: /boot
13
+      label: primary
14
+      filesystem: ext2
15
+    sda4: 
16
+      size: "35782656"
17
+      label: primary
18
+      filesystem: LVM2_member
19
+    sda5: 
20
+      size: "21102592"
21
+      label: primary
22
+      filesystem: LVM2_member
23
+    sda6: 
24
+      size: "42074112"
25
+      label: primary
26
+      filesystem: LVM2_member
27
+    sda7: 
28
+      size: "23199744"
29
+      label: primary
30
+      filesystem: LVM2_member
31
+    sda8: 
32
+      size: "11032576"
33
+      label: primary
34
+      filesystem: LVM2_member
35
+    sda9: 
36
+      uuid: d1d1f9e8-0e6e-4687-9bb7-96c32f0df974
37
+      size: "40960"
38
+      label: config-2
39
+      filesystem: ext2
40
+    sdb1: 
41
+      size: "49152"
42
+      label: primary
43
+    sdb2: 
44
+      size: "409600"
45
+      label: primary
46
+    sdb3: 
47
+      size: "132667392"
48
+      label: primary
49
+      filesystem: LVM2_member
50
+    sdc1: 
51
+      size: "49152"
52
+      label: primary
53
+    sdc2: 
54
+      size: "409600"
55
+      label: primary
56
+    sdc3: 
57
+      size: "132667392"
58
+      label: primary
59
+      filesystem: LVM2_member
60
+  hardwaremodel: x86_64
61
+  netmask: "255.255.255.0"
62
+  ps: "ps -ef"
63
+  lsbdistdescription: "Ubuntu 16.04.1 LTS"
64
+  processors: 
65
+    models: 
66
+      - "Intel(R) Core(TM) i5-4670 CPU @ 3.40GHz"
67
+    count: 1
68
+    physicalcount: 1
69
+  hardwareisa: x86_64
70
+  kernel: Linux
71
+  os_package_type: debian
72
+  service_provider: systemd
73
+  operatingsystem: Ubuntu
74
+  sshdsakey: "AAAAB3NzaC1kc3MAAACBAO4GCoitokg7853i4il87AGQp+4IPKsqXRG0os5lXCg5DobISOPSmRp2PpSpiMkVv3jl5keceLb3nUz/FLeSrqEhsveYZT0qxqjtIerXrfc29S794B9T62zhIWQ2nWzpNQMYcOhovU5ov59ZSNWIA/llcDKbc3Gk9QEBsDgM5ezdAAAAFQC1AkJ5ok29hQ5QYKE0yikni/T2bQAAAIEApJZUPDJ+BXN459d7qE7Pxow+sIdKZ5Fe0lHPK9wybYunnNbo0GtjAU5SwwCdU3Eul9aGc5zgY2eT4JjZ5uZwymaJlHpL0LULbH+eQwwbWosQLw8Mw6piCjl8mn1ubC+xeqvvsM1denv3Xfs3CAQma4ZxTEO5qhqKGL3RSAllOwwAAACBAJNUP3Jcxbl28WZZfqnzC5YJQEZPp1A07uv4REN2UvPVK0nXdK2DbcHS7WCEx9ywF/qqf4fTTY+0lv3MPWS/c9kF+XETBB1dfepsK/omyZ53UxhPGTnaRh9xtRq80g+jJKItslg//eAogGip+7Ta7OhwVR6KlAbV36OhGow3p8U2"
75
+  sshfp_dsa: |-
76
+    SSHFP 2 1 7f2f5019ac51633b74237eae02ac43c242a6f778
77
+    SSHFP 2 2 b8bfabf1413f1d6ec99099522f5517b2edd4afb4245f1f30b0a62088425e469b
78
+  sshrsakey: "AAAAB3NzaC1yc2EAAAADAQABAAABAQCxwXqBS4gaX/1Wc0VGA5TcUCeWeSeuE7jtVzakRHmlI15ghrKmcsw3g1PXtWdDBbYIqeOwZO4+ya8ffyRzln+bMZF34OmpSq00HoyBazaZloC0ZMnk1Mw45lMntUwdSDftYz8OexY/y0wuEtLZd64Ul+UxRGphg7M+wJky7gdmR8Ow7so7HOxOXSwUz7dQPbvRiTR2JFdKGbIQLF6RX/YAc0TRU3ifRD1UM92CYXLPEBxP9Yy7F0dC4sN5aGPkdogArbq02TT4y2Wb272ScmXutCh5aBeVx4K5BNW/gbgbEecCzvLel4/7ZIplqeKP/CL75uSokn+Cs4YZ/j6hpyv/"
79
+  sshfp_rsa: |-
80
+    SSHFP 1 1 15cd6b8b3164701e01a3e4f1bc7d29e0d1b74078
81
+    SSHFP 1 2 96118cfb8744672ada34fec91b36be29a3f2a4395cc6e3b57319a257ccdf42ee
82
+  sshecdsakey: "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJUympV1vesrscbddEOEBNvAiYBezisSwLSo3RqdGBHOB1RN+L1geo8RHqinWh1V69CDMEd1ZP17VSCTj48+T3o="
83
+  sshfp_ecdsa: |-
84
+    SSHFP 3 1 b2ec93f3ad6e627f59dcaf595c14ba40636471bb
85
+    SSHFP 3 2 0024d215f0e46148b8c5cd90e7aa58cb2add1d73c6858c11d92a142ad14b431b
86
+  sshed25519key: AAAAC3NzaC1lZDI1NTE5AAAAIKNTc/YaVliwqJ0UH5DHwy4jeitxyiVS71wi/2R4hviN
87
+  sshfp_ed25519: |-
88
+    SSHFP 4 1 51aa4d868ea4b3bfeaa9b0141d1ad9eb945ec297
89
+    SSHFP 4 2 c07d50bdf2be408db24d11e2200a796ae8169f2a558d412289eb28f93e884be9
90
+  augeasversion: "1.4.0"
91
+  selinux: false
92
+  puppetversion: "3.8.5"
93
+  virtual: kvm
94
+  is_virtual: true
95
+  vlans: "101,102"
96
+  boardmanufacturer: "Oracle Corporation"
97
+  boardproductname: VirtualBox
98
+  boardserialnumber: "0"
99
+  bios_vendor: "innotek GmbH"
100
+  bios_version: VirtualBox
101
+  bios_release_date: "12/01/2006"
102
+  manufacturer: "innotek GmbH"
103
+  productname: VirtualBox
104
+  serialnumber: "0"
105
+  uuid: F98DAF54-7849-4D4C-9FA9-474080EBB4D9
106
+  type: Other
107
+  uptime: "3:04 hours"
108
+  uptime_hours: 3
109
+  blockdevice_sda_size: 68718428160
110
+  blockdevice_sda_vendor: ATA
111
+  blockdevice_sda_model: "VBOX HARDDISK"
112
+  blockdevice_sdb_size: 68718428160
113
+  blockdevice_sdb_vendor: ATA
114
+  blockdevice_sdb_model: "VBOX HARDDISK"
115
+  blockdevice_sdc_size: 68718428160
116
+  blockdevice_sdc_vendor: ATA
117
+  blockdevice_sdc_model: "VBOX HARDDISK"
118
+  blockdevices: "sda,sdb,sdc"
119
+  facterversion: "2.4.6"
120
+  memorysize: "1.95 GB"
121
+  memoryfree: "183.81 MB"
122
+  swapsize: "2.00 GB"
123
+  swapfree: "0.01 MB"
124
+  swapsize_mb: "2048.00"
125
+  swapfree_mb: "0.01"
126
+  memorysize_mb: "2000.45"
127
+  memoryfree_mb: "183.81"
128
+  uptime_days: 0
129
+  architecture: amd64
130
+  kernelmajversion: "4.4"
131
+  interfaces: "bond0,br_ex,br_floating,br_fw_admin,br_int,br_mgmt,br_prv,br_storage,enp0s3,enp0s8,enp0s9,enp0s3_101,enp0s3_102,hapr_host,lo,ovs_system,p_eeee51a2_0,p_ff798dba_0,v_management,v_public,vr_host_base"
132
+  macaddress_bond0: "92:d3:0e:75:f7:64"
133
+  mtu_bond0: 1500
134
+  ipaddress_br_ex: "172.16.0.5"
135
+  macaddress_br_ex: "08:00:27:bc:e2:66"
136
+  netmask_br_ex: "255.255.255.0"
137
+  mtu_br_ex: 1500
138
+  macaddress_br_floating: "22:fd:9f:51:aa:48"
139
+  mtu_br_floating: 1500
140
+  ipaddress_br_fw_admin: "10.20.0.4"
141
+  macaddress_br_fw_admin: "08:00:27:9a:28:24"
142
+  netmask_br_fw_admin: "255.255.255.0"
143
+  mtu_br_fw_admin: 1500
144
+  macaddress_br_int: "9e:78:0c:ef:c5:4f"
145
+  mtu_br_int: 1500
146
+  ipaddress_br_mgmt: "192.168.0.6"
147
+  macaddress_br_mgmt: "08:00:27:9a:28:24"
148
+  netmask_br_mgmt: "255.255.255.0"
149
+  mtu_br_mgmt: 1500
150
+  macaddress_br_prv: "12:fd:e9:d6:6d:4c"
151
+  mtu_br_prv: 1500
152
+  ipaddress_br_storage: "192.168.1.4"
153
+  macaddress_br_storage: "08:00:27:9a:28:24"
154
+  netmask_br_storage: "255.255.255.0"
155
+  mtu_br_storage: 1500
156
+  macaddress_enp0s3: "08:00:27:9a:28:24"
157
+  mtu_enp0s3: 1500
158
+  macaddress_enp0s8: "08:00:27:bc:e2:66"
159
+  mtu_enp0s8: 1500
160
+  macaddress_enp0s9: "08:00:27:2f:eb:50"
161
+  mtu_enp0s9: 1500
162
+  macaddress_enp0s3_101: "08:00:27:9a:28:24"
163
+  mtu_enp0s3_101: 1500
164
+  macaddress_enp0s3_102: "08:00:27:9a:28:24"
165
+  mtu_enp0s3_102: 1500
166
+  ipaddress_hapr_host: "240.0.0.1"
167
+  macaddress_hapr_host: "72:43:d1:27:6e:fa"
168
+  netmask_hapr_host: "255.255.255.252"
169
+  mtu_hapr_host: 1500
170
+  ipaddress_lo: "127.0.0.1"
171
+  netmask_lo: "255.0.0.0"
172
+  mtu_lo: 65536
173
+  macaddress_ovs_system: "4a:33:57:2f:f1:34"
174
+  mtu_ovs_system: 1500
175
+  macaddress_p_eeee51a2_0: "9e:66:67:d6:60:88"
176
+  mtu_p_eeee51a2_0: 65000
177
+  macaddress_p_ff798dba_0: "b6:56:6e:f8:66:1f"
178
+  mtu_p_ff798dba_0: 65000
179
+  macaddress_v_management: "6e:b3:0a:cf:24:43"
180
+  mtu_v_management: 1500
181
+  macaddress_v_public: "c6:ff:b4:07:8c:79"
182
+  mtu_v_public: 1500
183
+  ipaddress_vr_host_base: "240.0.0.5"
184
+  macaddress_vr_host_base: "46:91:25:77:2d:6e"
185
+  netmask_vr_host_base: "255.255.255.252"
186
+  mtu_vr_host_base: 1500
187
+  timezone: UTC
188
+  gid: root
189
+  path: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
190
+  macaddress: "92:d3:0e:75:f7:64"
191
+  system_uptime: 
192
+    seconds: 11093
193
+    hours: 3
194
+    days: 0
195
+    uptime: "3:04 hours"
196
+  hostname: ctrl1
197
+  filesystems: "ext2,ext3,ext4,squashfs,vfat,xfs"
198
+  lsbmajdistrelease: "16.04"
199
+  os: 
200
+    name: Ubuntu
201
+    family: Debian
202
+    release: 
203
+      major: "16.04"
204
+      full: "16.04"
205
+    lsb: 
206
+      distcodename: xenial
207
+      distid: Ubuntu
208
+      distdescription: "Ubuntu 16.04.1 LTS"
209
+      distrelease: "16.04"
210
+      majdistrelease: "16.04"
211
+  fqdn: ctrl1.domain.tld
212
+  lsbdistid: Ubuntu
213
+  physicalprocessorcount: 1
214
+  rubyplatform: x86_64-linux-gnu
215
+  rubyversion: "2.3.1"
216
+  network_br_ex: "172.16.0.0"
217
+  network_br_fw_admin: "10.20.0.0"
218
+  network_br_mgmt: "192.168.0.0"
219
+  network_br_storage: "192.168.1.0"
220
+  network_hapr_host: "240.0.0.0"
221
+  network_lo: "127.0.0.0"
222
+  network_vr_host_base: "240.0.0.4"
223
+  operatingsystemrelease: "16.04"
224
+  kernelrelease: "4.4.0-34-generic"
225
+  rubysitedir: /usr/local/lib/site_ruby/2.3.0
226
+  osfamily: Debian
227
+  id: root
228
+  uptime_seconds: 11093
229
+  lsbdistcodename: xenial
230
+  processor0: "Intel(R) Core(TM) i5-4670 CPU @ 3.40GHz"
231
+  processorcount: 1
232
+  uniqueid: a8c00600
233
+  domain: domain.tld
234
+  operatingsystemmajrelease: "16.04"
235
+  kernelversion: "4.4.0"
236
+  lsbdistrelease: "16.04"
237
+  ipaddress: "172.16.0.5"
238
+  apache_version: "2.4.18"
239
+  mysql_server_id: 167011540
240
+  package_provider: apt
241
+  openssl_version: "1.0.2g-fips"
242
+  libvirt_package_version: "1.3.1-1ubuntu10.1"
243
+  apt_reboot_required: false
244
+  l23_os: ubuntu
245
+  ip6tables_version: "1.6.0"
246
+  acpid_version: "2"
247
+  iptables_persistent_version: "1.0.4"
248
+  l3_fqdn_hostname: ctrl1.domain.tld
249
+  root_home: /root
250
+  rabbitmq_version: "3.6.1"
251
+  netrings: 
252
+    enp0s3: 
253
+      maximums: 
254
+        RX: "4096"
255
+        TX: "4096"
256
+      current: 
257
+        RX: "4096"
258
+        TX: "4096"
259
+    enp0s8: 
260
+      maximums: 
261
+        RX: "4096"
262
+        TX: "4096"
263
+      current: 
264
+        RX: "4096"
265
+        TX: "4096"
266
+    enp0s9: 
267
+      maximums: 
268
+        RX: "4096"
269
+        TX: "4096"
270
+      current: 
271
+        RX: "256"
272
+        TX: "256"
273
+  rsyslog_version: "8.16.0-1ubuntu3"
274
+  iptables_version: "1.6.0"
275
+  pcmk_node_name: ctrl1.domain.tld
276
+  kern_module_ovs_loaded: false
277
+  kern_module_bridge_loaded: true
278
+  allocated_hugepages: "{\x221G\x22:false,\x222M\x22:false}"
279
+  osd_devices_list: ""
280
+  acpi_event: false
281
+  staging_http_get: curl
282
+  ssh_server_version_full: "7.2p2"
283
+  ssh_server_version_major: "7.2"
284
+  ssh_server_version_release: "7.2"
285
+  apt_update_last_success: 1471611612
286
+  haproxy_version: "1.6.3"
287
+  mysql_version: "5.6.30"
288
+  mounts: 
289
+    - /
290
+    - /boot
291
+    - /var/lib/mysql
292
+    - /var/log
293
+    - /var/lib/horizon
294
+    - /var/lib/glance
295
+  ssh_client_version_full: "7.2p2"
296
+  ssh_client_version_major: "7.2"
297
+  ssh_client_version_release: "7.2"
298
+  l2_ovs_vlan_splinters_need_for: ""
299
+  is_pe: false

+ 1
- 1
lib/noop/config/facts.rb View File

@@ -30,7 +30,7 @@ module Noop
30 30
     end
31 31
 
32 32
     def self.default_facts_file_name
33
-      Pathname.new 'ubuntu.yaml'
33
+      Pathname.new 'ubuntu14.yaml'
34 34
     end
35 35
   end
36 36
 end

+ 1
- 1
lib/noop/manager/options.rb View File

@@ -68,7 +68,7 @@ module Noop
68 68
         opts.on('-y', '--yamls YAML1,YAML2', Array, 'Run only these hiera yamls. Example: "controller.yaml,compute.yaml"') do |yamls|
69 69
           @options[:filter_hiera] = yamls
70 70
         end
71
-        opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu.yaml,centos.yaml"') do |yamls|
71
+        opts.on('-f', '--facts FACTS1,FACTS2', Array, 'Run only these facts yamls. Example: "ubuntu14.yaml,centos7.yaml"') do |yamls|
72 72
           @options[:filter_facts] = yamls
73 73
         end
74 74
         # opts.on('-e', '--examples STR1,STR2', Array, 'Run only these spec examples. Example: "should compile"') do |examples|

+ 3
- 3
spec/lib/task_spec.rb View File

@@ -55,7 +55,7 @@ describe Noop::Task do
55 55
     end
56 56
 
57 57
     it 'should have inspect' do
58
-      expect(subject.inspect).to eq 'Task[Manifest: my/test.pp Spec: my/test_spec.rb Hiera: novanet-primary-controller.yaml Facts: ubuntu.yaml Status: pending]'
58
+      expect(subject.inspect).to eq 'Task[Manifest: my/test.pp Spec: my/test_spec.rb Hiera: novanet-primary-controller.yaml Facts: ubuntu14.yaml Status: pending]'
59 59
     end
60 60
   end
61 61
 
@@ -96,7 +96,7 @@ describe Noop::Task do
96 96
   context 'facts' do
97 97
     it 'has file_name_facts' do
98 98
       expect(subject.file_name_facts).to be_a Pathname
99
-      expect(subject.file_name_facts.to_s).to eq 'ubuntu.yaml'
99
+      expect(subject.file_name_facts.to_s).to eq 'ubuntu14.yaml'
100 100
     end
101 101
 
102 102
     it 'can set file_name_facts' do
@@ -113,7 +113,7 @@ describe Noop::Task do
113 113
 
114 114
     it 'has file_path_facts' do
115 115
       expect(subject.file_path_facts).to be_a Pathname
116
-      expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu.yaml"
116
+      expect(subject.file_path_facts.to_s).to eq "#{root}/facts/ubuntu14.yaml"
117 117
     end
118 118
 
119 119
     it 'has file_name_facts_override' do

Loading…
Cancel
Save