Skip to content

Commit 6949383

Browse files
author
Kevin Paulisse
committed
Documentation auto-generate update
1 parent 7ccf46a commit 6949383

1 file changed

Lines changed: 43 additions & 29 deletions

File tree

‎doc/optionsref.md‎

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,52 +67,53 @@ Usage: octocatalog-diff [command line options]
6767
--puppet-binary STRING Full path to puppet binary globally
6868
--to-puppet-binary STRING Full path to puppet binary for the to branch
6969
--from-puppet-binary STRING Full path to puppet binary for the from branch
70-
--[no-]from-puppetdb Pull "from" catalog from PuppetDB instead of compiling
7170
--[no-]parallel Enable or disable parallel processing
72-
--puppetdb-ssl-ca FILENAME CA certificate that signed the PuppetDB certificate
73-
--puppetdb-ssl-client-cert FILENAME
74-
SSL client certificate to connect to PuppetDB
71+
--[no-]from-puppetdb Pull "from" catalog from PuppetDB instead of compiling
7572
--puppetdb-ssl-client-password-file FILENAME
7673
Read password for SSL client key from a file
7774
--puppetdb-ssl-client-password PASSWORD
7875
Password for SSL client key to connect to PuppetDB
79-
--facts-terminus STRING Facts terminus: one of yaml, facter
80-
--puppetdb-url URL PuppetDB base URL
8176
--puppetdb-ssl-client-key FILENAME
8277
SSL client key to connect to PuppetDB
83-
--puppet-master-ssl-client-key STRING
84-
Full path to key file for SSL client auth to Puppet Master globally
85-
--to-puppet-master-ssl-client-key STRING
86-
Full path to key file for SSL client auth to Puppet Master for the to branch
87-
--from-puppet-master-ssl-client-key STRING
88-
Full path to key file for SSL client auth to Puppet Master for the from branch
89-
--puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master globally
90-
--to-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the to branch
91-
--from-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the from branch
92-
--puppet-master-api-version STRING
93-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
94-
--to-puppet-master-api-version STRING
95-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
96-
--from-puppet-master-api-version STRING
97-
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
78+
--puppetdb-ssl-ca FILENAME CA certificate that signed the PuppetDB certificate
79+
--puppetdb-ssl-client-cert FILENAME
80+
SSL client certificate to connect to PuppetDB
81+
--facts-terminus STRING Facts terminus: one of yaml, facter
82+
--puppetdb-url URL PuppetDB base URL
83+
--puppetdb-api-version N Version of PuppetDB API (3 or 4)
9884
--puppet-master-ssl-ca STRING
9985
Full path to CA certificate that signed the Puppet Master certificate globally
10086
--to-puppet-master-ssl-ca STRING
10187
Full path to CA certificate that signed the Puppet Master certificate for the to branch
10288
--from-puppet-master-ssl-ca STRING
10389
Full path to CA certificate that signed the Puppet Master certificate for the from branch
104-
--puppet-master-ssl-client-cert STRING
105-
Full path to certificate file for SSL client auth to Puppet Master globally
106-
--to-puppet-master-ssl-client-cert STRING
107-
Full path to certificate file for SSL client auth to Puppet Master for the to branch
108-
--from-puppet-master-ssl-client-cert STRING
109-
Full path to certificate file for SSL client auth to Puppet Master for the from branch
90+
--puppet-master-ssl-client-key STRING
91+
Full path to key file for SSL client auth to Puppet Master globally
92+
--to-puppet-master-ssl-client-key STRING
93+
Full path to key file for SSL client auth to Puppet Master for the to branch
94+
--from-puppet-master-ssl-client-key STRING
95+
Full path to key file for SSL client auth to Puppet Master for the from branch
11096
--fact-override STRING1[,STRING2[,...]]
11197
Override fact globally
11298
--to-fact-override STRING1[,STRING2[,...]]
11399
Override fact for the to branch
114100
--from-fact-override STRING1[,STRING2[,...]]
115101
Override fact for the from branch
102+
--puppet-master-ssl-client-cert STRING
103+
Full path to certificate file for SSL client auth to Puppet Master globally
104+
--to-puppet-master-ssl-client-cert STRING
105+
Full path to certificate file for SSL client auth to Puppet Master for the to branch
106+
--from-puppet-master-ssl-client-cert STRING
107+
Full path to certificate file for SSL client auth to Puppet Master for the from branch
108+
--puppet-master-api-version STRING
109+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) globally
110+
--to-puppet-master-api-version STRING
111+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the to branch
112+
--from-puppet-master-api-version STRING
113+
Puppet Master API version (2 for Puppet 3.x, 3 for Puppet 4.x) for the from branch
114+
--puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master globally
115+
--to-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the to branch
116+
--from-puppet-master STRING Hostname or Hostname:PortNumber for Puppet Master for the from branch
116117
--pe-enc-url URL Base URL for Puppet Enterprise ENC endpoint
117118
--pe-enc-token-file PATH Path containing token for PE node classifier, relative or absolute
118119
--pe-enc-token TOKEN Token to access the Puppet Enterprise ENC API
@@ -124,10 +125,10 @@ Usage: octocatalog-diff [command line options]
124125
--no-ignore-tags Disable ignoring based on tags
125126
--ignore-tags STRING1[,STRING2[,...]]
126127
Specify tags to ignore
127-
--[no-]suppress-absent-file-details
128-
Suppress certain attributes of absent files
129128
--pass-env-vars VAR1[,VAR2[,...]]
130129
Environment variables to pass
130+
--[no-]suppress-absent-file-details
131+
Suppress certain attributes of absent files
131132
132133
```
133134

@@ -828,6 +829,19 @@ https://your-pe-console-server:4433/classifier-api (<a href="../lib/octocatalog-
828829
</td>
829830
</tr>
830831

832+
<tr>
833+
<td valign=top>
834+
<pre><code>--puppetdb-api-version N</code></pre>
835+
</td>
836+
<td valign=top>
837+
Version of PuppetDB API (3 or 4)
838+
</td>
839+
<td valign=top>
840+
Specify the API version to use for the PuppetDB. The current values supported are '3' or '4', and '4' is
841+
the default. (<a href="../lib/octocatalog-diff/catalog-diff/cli/options/puppetdb_api_version.rb">puppetdb_api_version.rb</a>)
842+
</td>
843+
</tr>
844+
831845
<tr>
832846
<td valign=top>
833847
<pre><code>--puppetdb-ssl-ca FILENAME</code></pre>

0 commit comments

Comments
 (0)