Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
uphrh-sb-devops
Commits
63d40963
Commit
63d40963
authored
5 years ago
by
S M Y
Browse files
Options
Download
Plain Diff
Merge branch 'release-2.2.0' of github.com:project-sunbird/sunbird-devops into release-2.2.0
parents
ef73d126
5277659c
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ansible/roles/sunbird-auth-deploy/templates/keycloak-bootstrap.conf.j2
+1
-1
.../sunbird-auth-deploy/templates/keycloak-bootstrap.conf.j2
pipelines/upload/docker/Jenkinsfile
+1
-1
pipelines/upload/docker/Jenkinsfile
with
2 additions
and
2 deletions
+2
-2
ansible/roles/sunbird-auth-deploy/templates/keycloak-bootstrap.conf.j2
+
1
−
1
View file @
63d40963
...
...
@@ -9,6 +9,6 @@
"keycloak_api_management_user_email": "{{ keycloak_api_management_user_email }}",
"keycloak_api_management_user_first_name": "{{ keycloak_api_management_user_first_name }}",
"keycloak_api_management_user_last_name": "{{ keycloak_api_management_user_last_name }}",
"keycloak_api_management_user_password": "{{ keycloak_api_management_user_password }}"
"keycloak_api_management_user_password": "{{ keycloak_api_management_user_password }}"
,
"keycloak_clients": "/tmp/clients.json"
}
This diff is collapsed.
Click to expand it.
pipelines/upload/docker/Jenkinsfile
+
1
−
1
View file @
63d40963
...
...
@@ -11,7 +11,7 @@ node(){
if
(
params
.
artifact_source
==
"ArtifactRepo"
)
{
currentWs
=
sh
(
returnStdout:
true
,
script:
'pwd'
).
trim
()
ansiblePlaybook
=
"$currentWs/ansible/docker_image_push.yml"
ansibleExtraArgs
=
"--extra-vars \"hub_org=${hub_org} image_name=${values.image_name} image_tag=${values.image_tag}
\"
--vault-password-file /var/lib/jenkins/secrets/vault-pass"
ansibleExtraArgs
=
"--extra-vars \"hub_org=${hub_org} image_name=${values.image_name} image_tag=${values.image_tag} --vault-password-file /var/lib/jenkins/secrets/vault-pass"
values
.
put
(
'currentWs'
,
currentWs
)
values
.
put
(
'ansiblePlaybook'
,
ansiblePlaybook
)
values
.
put
(
'ansibleExtraArgs'
,
ansibleExtraArgs
)
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
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
Menu
Explore
Projects
Groups
Topics
Snippets