Feature #14712

[git] arv-git-httpd uses cluster config file

Added by Peter Amstutz 8 months ago. Updated 21 days ago.

Status:
Resolved
Priority:
Normal
Assigned To:
Category:
-
Target version:
Start date:
08/26/2019
Due date:
% Done:

100%

Estimated time:
(Total: 0.00 h)
Story points:
2.0

Description

See GitServer section of https://dev.arvados.org/projects/arvados/wiki/Config_migration_key_mapping for the canonical list of keys.

Does not include the git sync component which is part of the API Server.

Includes building the framework for config loading which knows how manage the fallback hierarchy of new vs old configuration data as well as how to warn on mismatches if both are present.


Subtasks

Task #15479: Review 14712-git-httpd-configResolvedEric Biagiotti


Related issues

Related to Arvados - Story #13648: [Epic] Use one cluster configuration file for all componentsNew

Associated revisions

Revision 5bbec701
Added by Eric Biagiotti 22 days ago

Merge branch '14712-git-httpd-config'

refs #14712

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <>

History

#1 Updated by Peter Amstutz 8 months ago

  • Status changed from New to In Progress

#2 Updated by Peter Amstutz 8 months ago

  • Status changed from In Progress to New

#3 Updated by Peter Amstutz 8 months ago

  • Related to Story #13648: [Epic] Use one cluster configuration file for all components added

#4 Updated by Peter Amstutz 8 months ago

  • Tracker changed from Bug to Feature

#5 Updated by Lucas Di Pentima 8 months ago

services/api/script/arvados-git-sync.rb config file: arvados-clients.yml

production:
  gitolite_url: /var/lib/arvados/git/repositories/gitolite-admin.git
  gitolite_tmp: /var/lib/arvados/git
  arvados_api_host: uuid_prefix.example.com
  arvados_api_token: "zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz" 
  arvados_api_host_insecure: false
  gitolite_arvados_git_user_key: "ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver" 

MAPPINGS

Repositories:
  Gitolite:
    AdminURL: /var/lib/arvados/git/repositories/gitolite-admin.git
    TmpDir: /var/lib/arvados/git
    SSHUserKey: ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver

arv-git-httpd config file: /etc/arvados/git-httpd/git-httpd.yml

Client:
  APIHost: uuid_prefix.your.domain
  Insecure: false
GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell
GitoliteHome: /var/lib/arvados/git
Listen: :9001
RepoRoot: /var/lib/arvados/git/repositories

MAPPINGS

Repositories:
  Gitolite:
    HomeDir: /var/lib/arvados/git
    RootDir: /var/lib/arvados/git/repositories
    HTTPAccess: :9001

#6 Updated by Lucas Di Pentima 8 months ago

Corrected version:

Clusters:
  xyzzy:
    SuperuserToken: zzzzzz
    GitServer:
      [...]
      AdminRepoURL: /var/lib/[...]/gitolite-admin.git              # arvados-git-sync.rb/gitolite_url
      SSHUserKey: ssh-rsa AAAAB[...]KztXLNLSbp git@gitserver       # arvados-git-sync.rb/gitolite_arvados_git_user_key
      TmpDir: /var/lib/arvados/git                                 # arvados-git-sync.rb/gitolite_tmp
      GitCommand: /var/lib/arvados/git/gitolite/src/gitolite-shell # arv-git-httpd/GitCommand
      GitoliteHomeDir: /var/lib/arvados/git                        # arv-git-httpd/GitoliteHome

#7 Updated by Lucas Di Pentima 8 months ago

TODO: Check SSHUserKey's real usage to see if that's an appropriate naming

#8 Updated by Tom Morris 7 months ago

  • Description updated (diff)
  • Target version changed from To Be Groomed to Arvados Future Sprints
  • Story points set to 2.0

#9 Updated by Tom Morris 2 months ago

  • Target version changed from Arvados Future Sprints to 2019-07-31 Sprint
  • Assigned To set to Eric Biagiotti

#10 Updated by Eric Biagiotti about 2 months ago

  • Target version changed from 2019-07-31 Sprint to 2019-08-14 Sprint

#11 Updated by Eric Biagiotti about 1 month ago

  • Target version changed from 2019-08-14 Sprint to 2019-08-28 Sprint

#12 Updated by Eric Biagiotti about 1 month ago

  • Status changed from New to In Progress

#13 Updated by Eric Biagiotti 23 days ago

Latest at 44a871434f648052a410f158fc8e09ec17c11339
Tests at https://ci.curoverse.com/view/Developer/job/developer-run-tests/1489/.

Manually tested using arvbox:
- Created in account in WB, added my ssh key, and ran git clone git@172.17.0.2:arvados.git from my terminal.
- Ran git clone https://172.17.0.2:9000/arvados.git from my terminal. Username is whateverYouWant and the password is the user token.

#14 Updated by Lucas Di Pentima 23 days ago

Just 2 minor comments:

  • At config.default.yml line 429, the comment seems to have a missing double.
  • At the install guide, file doc/install/install-arv-git-httpd.html.textile.liquid lines 280 & 291, I believe the services’ section should be GitHTTP instead of GitHttp.

Other than that it LGTM, thanks!

#15 Updated by Eric Biagiotti 21 days ago

Fixed in

Lucas Di Pentima wrote:

Just 2 minor comments:

  • At config.default.yml line 429, the comment seems to have a missing double.
  • At the install guide, file doc/install/install-arv-git-httpd.html.textile.liquid lines 280 & 291, I believe the services’ section should be GitHTTP instead of GitHttp.

Other than that it LGTM, thanks!

Fixed in 3c0e4dc35b5f2fc34e050fef304cdec0cebe51ae. Thanks!

#16 Updated by Eric Biagiotti 21 days ago

  • Status changed from In Progress to Resolved

Also available in: Atom PDF