Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
Puppet Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Platform
Infrastructure
Puppet
Puppet Environment
Commits
b9324027
Commit
b9324027
authored
5 years ago
by
Nicolas Dandrimont
Browse files
Options
Downloads
Patches
Plain Diff
octocatalog-diff: Add an IN_OCTOCATALOG_DIFF envvar passed to puppet
parent
38e4d1db
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bin/octocatalog-diff
+4
-2
4 additions, 2 deletions
bin/octocatalog-diff
octocatalog-diff/octocatalog-diff.config.rb
+1
-1
1 addition, 1 deletion
octocatalog-diff/octocatalog-diff.config.rb
with
5 additions
and
3 deletions
bin/octocatalog-diff
+
4
−
2
View file @
b9324027
...
...
@@ -120,8 +120,10 @@ fi
function
run-octocatalog-diff
{
host
=
$1
PUPPET_FACT_DIR
=
$FACTS_DIR
\
OCTOCATALOG_DIFF_CONFIG_FILE
=
$OCD_BASE
/octocatalog-diff.config.rb
\
env
\
PUPPET_FACT_DIR
=
$FACTS_DIR
\
OCTOCATALOG_DIFF_CONFIG_FILE
=
$OCD_BASE
/octocatalog-diff.config.rb
\
IN_OCTOCATALOG_DIFF
=
yes
\
octocatalog-diff
\
--bootstrapped-from-dir
$TMPDIR
/environments/
$FROM
\
--bootstrapped-to-dir
$TMPDIR
/environments/
$TO
\
...
...
This diff is collapsed.
Click to expand it.
octocatalog-diff/octocatalog-diff.config.rb
+
1
−
1
View file @
b9324027
...
...
@@ -174,7 +174,7 @@ module OctocatalogDiff
# specify them here. The return value must be an array.
##############################################################################################
#
settings[:pass_env_vars] = %w(
AUTH_USERNAME AUTH_TOKEN
)
settings
[
:pass_env_vars
]
=
%w(
IN_OCTOCATALOG_DIFF
)
##############################################################################################
# puppet_binary
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment