Skip to content

Commit f5c1098

Browse files
ahayworthahayworth
authored
Merge pull request #234 from github/ahayworth-bump-version
Update version and docs
2 parents 5483382 + 38c65a1 commit f5c1098

File tree

3 files changed

+137
-7
lines changed

3 files changed

+137
-7
lines changed

‎.version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.0
1+
2.0.0

‎doc/CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@
88
</tr>
99
</thead><tbody>
1010

11+
<tr valign=top>
12+
<td>2.0.0</td>
13+
<td>2020-01-12</td>
14+
<li><a href="https://github.com/github/octocatalog-diff/pull/226">#226</a>: (Enhancement) Add Puppet 6 support</li>
15+
<li><a href="https://github.com/github/octocatalog-diff/pull/228">#228</a>: (Enhancement) Add Puppetserver catalog v4 API support</li>
16+
<li><a href="https://github.com/github/octocatalog-diff/pull/229">#229</a>: (Enhancement) Add support for PE package inventory facts</li>
17+
<li><a href="https://github.com/github/octocatalog-diff/pull/230">#230</a>: (Enhancement) Add set quality comparison to ignore filter</li>
18+
</td>
19+
</tr>
20+
1121
<tr valign=top>
1222
<td>1.6.0</td>
1323
<td>2019-10-31</td>

‎doc/optionsref.md

+126-6
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Usage: octocatalog-diff [command line options]
3737
--fact-file STRING Override fact globally
3838
--to-fact-file STRING Override fact for the to branch
3939
--from-fact-file STRING Override fact for the from branch
40+
--[no-]puppetdb-package-inventory
41+
Include Puppet Enterprise package inventory data, if found
4042
--save-catalog STRING Save intermediate catalogs into files globally
4143
--to-save-catalog STRING Save intermediate catalogs into files for the to branch
4244
--from-save-catalog STRING Save intermediate catalogs into files for the from branch
@@ -87,7 +89,18 @@ Usage: octocatalog-diff [command line options]
8789
--puppet-binary STRING Full path to puppet binary globally
8890
--to-puppet-binary STRING Full path to puppet binary for the to branch
8991
--from-puppet-binary STRING Full path to puppet binary for the from branch
92+
--puppet-master-token-file STRING
93+
File containing PE RBAC token to authenticate to the Puppetserver API v4 globally
94+
--to-puppet-master-token-file STRING
95+
File containing PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
96+
--from-puppet-master-token-file STRING
97+
File containing PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
9098
--facts-terminus STRING Facts terminus: one of yaml, facter
99+
--puppet-master-token STRING PE RBAC token to authenticate to the Puppetserver API v4 globally
100+
--to-puppet-master-token STRING
101+
PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
102+
--from-puppet-master-token STRING
103+
PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
91104
--puppetdb-token TOKEN Token to access the PuppetDB API
92105
--puppetdb-token-file PATH Path containing token for PuppetDB API, relative or absolute
93106
--puppetdb-url URL PuppetDB base URL
@@ -111,11 +124,23 @@ Usage: octocatalog-diff [command line options]
111124
--to-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the to branch
112125
--from-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the from branch
113126
--puppet-master-api-version STRING
114-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
127+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) globally
115128
--to-puppet-master-api-version STRING
116-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
129+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the to branch
117130
--from-puppet-master-api-version STRING
118-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
131+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the from branch
132+
--[no-]puppet-master-update-catalog
133+
Update catalog in PuppetDB when using Puppetmaster API version 4 globally
134+
--[no-]to-puppet-master-update-catalog
135+
Update catalog in PuppetDB when using Puppetmaster API version 4 for the to branch
136+
--[no-]from-puppet-master-update-catalog
137+
Update catalog in PuppetDB when using Puppetmaster API version 4 for the from branch
138+
--[no-]puppet-master-update-facts
139+
Update facts in PuppetDB when using Puppetmaster API version 4 globally
140+
--[no-]to-puppet-master-update-facts
141+
Update facts in PuppetDB when using Puppetmaster API version 4 for the to branch
142+
--[no-]from-puppet-master-update-facts
143+
Update facts in PuppetDB when using Puppetmaster API version 4 for the from branch
119144
--puppet-master-ssl-ca STRING
120145
Full path to CA certificate that signed the Puppet Master certificate globally
121146
--to-puppet-master-ssl-ca STRING
@@ -719,7 +744,7 @@ Puppet control repo template, the value of this should be 'hieradata', which is
719744
<pre><code>--from-puppet-master-api-version STRING</code></pre>
720745
</td>
721746
<td valign=top>
722-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
747+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the from branch
723748
</td>
724749
<td valign=top>
725750
Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -781,6 +806,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
781806
</td>
782807
</tr>
783808

809+
<tr>
810+
<td valign=top>
811+
<pre><code>--from-puppet-master-token STRING</code></pre>
812+
</td>
813+
<td valign=top>
814+
PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
815+
</td>
816+
<td valign=top>
817+
Specify a PE RBAC token used to authenticate to Puppetserver for v4
818+
catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
819+
</td>
820+
</tr>
821+
822+
<tr>
823+
<td valign=top>
824+
<pre><code>--from-puppet-master-token-file STRING</code></pre>
825+
</td>
826+
<td valign=top>
827+
File containing PE RBAC token to authenticate to the Puppetserver API v4 for the from branch
828+
</td>
829+
<td valign=top>
830+
Specify a path to a file containing a PE RBAC token used to authenticate to the
831+
Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
832+
</td>
833+
</tr>
834+
784835
<tr>
785836
<td valign=top>
786837
<pre><code>--from-puppetdb
@@ -1239,7 +1290,7 @@ to work correctly. (<a href="../lib/octocatalog-diff/cli/options/preserve_enviro
12391290
<pre><code>--puppet-master-api-version STRING</code></pre>
12401291
</td>
12411292
<td valign=top>
1242-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
1293+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) globally
12431294
</td>
12441295
<td valign=top>
12451296
Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -1301,6 +1352,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
13011352
</td>
13021353
</tr>
13031354

1355+
<tr>
1356+
<td valign=top>
1357+
<pre><code>--puppet-master-token STRING</code></pre>
1358+
</td>
1359+
<td valign=top>
1360+
PE RBAC token to authenticate to the Puppetserver API v4 globally
1361+
</td>
1362+
<td valign=top>
1363+
Specify a PE RBAC token used to authenticate to Puppetserver for v4
1364+
catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
1365+
</td>
1366+
</tr>
1367+
1368+
<tr>
1369+
<td valign=top>
1370+
<pre><code>--puppet-master-token-file STRING</code></pre>
1371+
</td>
1372+
<td valign=top>
1373+
File containing PE RBAC token to authenticate to the Puppetserver API v4 globally
1374+
</td>
1375+
<td valign=top>
1376+
Specify a path to a file containing a PE RBAC token used to authenticate to the
1377+
Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
1378+
</td>
1379+
</tr>
1380+
13041381
<tr>
13051382
<td valign=top>
13061383
<pre><code>--puppetdb-api-version N</code></pre>
@@ -1314,6 +1391,23 @@ the default. (<a href="../lib/octocatalog-diff/cli/options/puppetdb_api_version.
13141391
</td>
13151392
</tr>
13161393

1394+
<tr>
1395+
<td valign=top>
1396+
<pre><code>--puppetdb-package-inventory
1397+
--no-puppetdb-package-inventory </code></pre>
1398+
</td>
1399+
<td valign=top>
1400+
Include Puppet Enterprise package inventory data, if found
1401+
</td>
1402+
<td valign=top>
1403+
When pulling facts from PuppetDB in a Puppet Enterprise environment, also include
1404+
the Puppet Enterprise Package Inventory data in the fact results, if available.
1405+
Generally you should not need to specify this, but including the package inventory
1406+
data will produce a more accurate set of input facts for environments using
1407+
package inventory. (<a href="../lib/octocatalog-diff/cli/options/puppetdb_package_inventory.rb">puppetdb_package_inventory.rb</a>)
1408+
</td>
1409+
</tr>
1410+
13171411
<tr>
13181412
<td valign=top>
13191413
<pre><code>--puppetdb-ssl-ca FILENAME</code></pre>
@@ -1687,7 +1781,7 @@ Puppet control repo template, the value of this should be 'hieradata', which is
16871781
<pre><code>--to-puppet-master-api-version STRING</code></pre>
16881782
</td>
16891783
<td valign=top>
1690-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
1784+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x, 4 for Puppet Server >= 6.3.0) for the to branch
16911785
</td>
16921786
<td valign=top>
16931787
Specify the API version to use for the Puppet Master. This makes it possible to authenticate to a
@@ -1749,6 +1843,32 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
17491843
</td>
17501844
</tr>
17511845

1846+
<tr>
1847+
<td valign=top>
1848+
<pre><code>--to-puppet-master-token STRING</code></pre>
1849+
</td>
1850+
<td valign=top>
1851+
PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
1852+
</td>
1853+
<td valign=top>
1854+
Specify a PE RBAC token used to authenticate to Puppetserver for v4
1855+
catalog API calls. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token.rb">puppet_master_token.rb</a>)
1856+
</td>
1857+
</tr>
1858+
1859+
<tr>
1860+
<td valign=top>
1861+
<pre><code>--to-puppet-master-token-file STRING</code></pre>
1862+
</td>
1863+
<td valign=top>
1864+
File containing PE RBAC token to authenticate to the Puppetserver API v4 for the to branch
1865+
</td>
1866+
<td valign=top>
1867+
Specify a path to a file containing a PE RBAC token used to authenticate to the
1868+
Puppetserver for a v4 catalog API call. (<a href="../lib/octocatalog-diff/cli/options/puppet_master_token_file.rb">puppet_master_token_file.rb</a>)
1869+
</td>
1870+
</tr>
1871+
17521872
<tr>
17531873
<td valign=top>
17541874
<pre><code>--to-save-catalog STRING</code></pre>

0 commit comments

Comments
 (0)