Skip to content

Commit e6dbe2d

Browse files
committed
Doc bump with hiera configuration options
1 parent b999ccc commit e6dbe2d

File tree

1 file changed

+63
-8
lines changed

1 file changed

+63
-8
lines changed

doc/optionsref.md

Lines changed: 63 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,14 @@ Usage: octocatalog-diff [command line options]
4747
--to-hiera-config STRING Full or relative path to global Hiera configuration file for the to branch
4848
--from-hiera-config STRING Full or relative path to global Hiera configuration file for the from branch
4949
--no-hiera-config Disable hiera config file installation
50-
--hiera-path PATH Path to hiera data directory, relative to top directory of repository
50+
--hiera-path STRING Path to hiera data directory, relative to top directory of repository globally
51+
--to-hiera-path STRING Path to hiera data directory, relative to top directory of repository for the to branch
52+
--from-hiera-path STRING Path to hiera data directory, relative to top directory of repository for the from branch
5153
--no-hiera-path Do not use any default hiera path settings
52-
--hiera-path-strip PATH Path prefix to strip when munging hiera.yaml
54+
--hiera-path-strip STRING Path prefix to strip when munging hiera.yaml globally
55+
--to-hiera-path-strip STRING Path prefix to strip when munging hiera.yaml for the to branch
56+
--from-hiera-path-strip STRING
57+
Path prefix to strip when munging hiera.yaml for the from branch
5358
--no-hiera-path-strip Do not use any default hiera path strip settings
5459
--ignore-attr "attr1,attr2,..."
5560
Attributes to ignore
@@ -83,10 +88,10 @@ Usage: octocatalog-diff [command line options]
8388
--from-puppet-binary STRING Full path to puppet binary for the from branch
8489
--facts-terminus STRING Facts terminus: one of yaml, facter
8590
--puppetdb-ssl-ca FILENAME CA certificate that signed the PuppetDB certificate
86-
--puppetdb-ssl-client-password PASSWORD
87-
Password for SSL client key to connect to PuppetDB
8891
--puppetdb-ssl-client-cert FILENAME
8992
SSL client certificate to connect to PuppetDB
93+
--puppetdb-ssl-client-password PASSWORD
94+
Password for SSL client key to connect to PuppetDB
9095
--puppetdb-ssl-client-key FILENAME
9196
SSL client key to connect to PuppetDB
9297
--puppetdb-ssl-client-password-file FILENAME
@@ -657,6 +662,31 @@ by permitting a data type specification as well. (<a href="../lib/octocatalog-di
657662
</td>
658663
</tr>
659664

665+
<tr>
666+
<td valign=top>
667+
<pre><code>--from-hiera-path STRING</code></pre>
668+
</td>
669+
<td valign=top>
670+
Path to hiera data directory, relative to top directory of repository for the from branch
671+
</td>
672+
<td valign=top>
673+
Specify the path to the Hiera data directory (relative to the top level Puppet checkout). For Puppet Enterprise and the
674+
Puppet control repo template, the value of this should be 'hieradata', which is the default. (<a href="../lib/octocatalog-diff/cli/options/hiera_path.rb">hiera_path.rb</a>)
675+
</td>
676+
</tr>
677+
678+
<tr>
679+
<td valign=top>
680+
<pre><code>--from-hiera-path-strip STRING</code></pre>
681+
</td>
682+
<td valign=top>
683+
Path prefix to strip when munging hiera.yaml for the from branch
684+
</td>
685+
<td valign=top>
686+
Specify the path to strip off the datadir to munge hiera.yaml file (<a href="../lib/octocatalog-diff/cli/options/hiera_path_strip.rb">hiera_path_strip.rb</a>)
687+
</td>
688+
</tr>
689+
660690
<tr>
661691
<td valign=top>
662692
<pre><code>--from-puppet-binary STRING</code></pre>
@@ -799,10 +829,10 @@ This timeout is specified in seconds. (<a href="../lib/octocatalog-diff/cli/opti
799829

800830
<tr>
801831
<td valign=top>
802-
<pre><code>--hiera-path PATH</code></pre>
832+
<pre><code>--hiera-path STRING</code></pre>
803833
</td>
804834
<td valign=top>
805-
Path to hiera data directory, relative to top directory of repository
835+
Path to hiera data directory, relative to top directory of repository globally
806836
</td>
807837
<td valign=top>
808838
Specify the path to the Hiera data directory (relative to the top level Puppet checkout). For Puppet Enterprise and the
@@ -812,10 +842,10 @@ Puppet control repo template, the value of this should be 'hieradata', which is
812842

813843
<tr>
814844
<td valign=top>
815-
<pre><code>--hiera-path-strip PATH</code></pre>
845+
<pre><code>--hiera-path-strip STRING</code></pre>
816846
</td>
817847
<td valign=top>
818-
Path prefix to strip when munging hiera.yaml
848+
Path prefix to strip when munging hiera.yaml globally
819849
</td>
820850
<td valign=top>
821851
Specify the path to strip off the datadir to munge hiera.yaml file (<a href="../lib/octocatalog-diff/cli/options/hiera_path_strip.rb">hiera_path_strip.rb</a>)
@@ -1567,6 +1597,31 @@ by permitting a data type specification as well. (<a href="../lib/octocatalog-di
15671597
</td>
15681598
</tr>
15691599

1600+
<tr>
1601+
<td valign=top>
1602+
<pre><code>--to-hiera-path STRING</code></pre>
1603+
</td>
1604+
<td valign=top>
1605+
Path to hiera data directory, relative to top directory of repository for the to branch
1606+
</td>
1607+
<td valign=top>
1608+
Specify the path to the Hiera data directory (relative to the top level Puppet checkout). For Puppet Enterprise and the
1609+
Puppet control repo template, the value of this should be 'hieradata', which is the default. (<a href="../lib/octocatalog-diff/cli/options/hiera_path.rb">hiera_path.rb</a>)
1610+
</td>
1611+
</tr>
1612+
1613+
<tr>
1614+
<td valign=top>
1615+
<pre><code>--to-hiera-path-strip STRING</code></pre>
1616+
</td>
1617+
<td valign=top>
1618+
Path prefix to strip when munging hiera.yaml for the to branch
1619+
</td>
1620+
<td valign=top>
1621+
Specify the path to strip off the datadir to munge hiera.yaml file (<a href="../lib/octocatalog-diff/cli/options/hiera_path_strip.rb">hiera_path_strip.rb</a>)
1622+
</td>
1623+
</tr>
1624+
15701625
<tr>
15711626
<td valign=top>
15721627
<pre><code>--to-puppet-binary STRING</code></pre>

0 commit comments

Comments
 (0)