Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nxcals
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Contributor 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
acc-logging-team
nxcals
Commits
e310c389
Commit
e310c389
authored
6 months ago
by
Jakub Wozniak
Browse files
Options
Downloads
Patches
Plain Diff
NXCALS-7814
- Lack of -u in ansible scripts run locally
parent
b3e754a7
No related branches found
No related tags found
1 merge request
!2046
NXCALS-7814 - Lack of -u in ansible scripts run locally
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ansible-local-install.sh
+1
-1
1 addition, 1 deletion
ansible-local-install.sh
ansible-playbook.sh
+1
-1
1 addition, 1 deletion
ansible-playbook.sh
test_utils.sh
+2
-2
2 additions, 2 deletions
test_utils.sh
with
4 additions
and
4 deletions
ansible-local-install.sh
+
1
−
1
View file @
e310c389
...
...
@@ -52,5 +52,5 @@ fi
cd
ansible
;
#Ansible treats values of the extra variables as strings. To pass values that are not strings, we need to use JSON format.
ansible-playbook
-i
$INVENTORY
$FILE
--vault-pass-file
.pass
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
;
ansible-playbook
-i
$INVENTORY
$FILE
--vault-pass-file
.pass
-u
$USER
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
;
cd
..
This diff is collapsed.
Click to expand it.
ansible-playbook.sh
+
1
−
1
View file @
e310c389
...
...
@@ -6,4 +6,4 @@ PYTIMBER_MAJOR_VERSION=$(cat gradle.properties | grep pytimberMajorVersion | awk
INVENTORY
=
"
${
INVENTORY
:-
inventory
/dev-
$USER
}
"
(
cd
ansible
&&
ansible-playbook
--inventory
=
"
$INVENTORY
"
--vault-password-file
=
.pass
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
"
$@
"
)
(
cd
ansible
&&
ansible-playbook
--inventory
=
"
$INVENTORY
"
--vault-password-file
=
.pass
-u
$USER
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
"
$@
"
)
This diff is collapsed.
Click to expand it.
test_utils.sh
+
2
−
2
View file @
e310c389
...
...
@@ -28,9 +28,9 @@ run_ansible() {
-----------------------------------------
EOF
../gradlew build
--refresh-dependencies
--no-daemon
--parallel
ansible-playbook
-i
"
$INVENTORY
"
"
$FILE
"
--vault-pass-file
"
$VAULT_PASS
"
-e
application_version
=
"
$PREVIOUS_VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
ansible-playbook
-i
"
$INVENTORY
"
"
$FILE
"
--vault-pass-file
"
$VAULT_PASS
"
-u
$USER
-e
application_version
=
"
$PREVIOUS_VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
else
ansible-playbook
-i
"
$INVENTORY
"
"
$FILE
"
--vault-pass-file
"
$VAULT_PASS
"
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
ansible-playbook
-i
"
$INVENTORY
"
"
$FILE
"
--vault-pass-file
"
$VAULT_PASS
"
-u
$USER
-e
application_version
=
"
$VERSION
"
-e
pytimber_major_version
=
"
$PYTIMBER_MAJOR_VERSION
"
$ANSIBLE_PARAMS_AUX
fi
cd
..
...
...
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