Permalink
Browse files

Proper git proposal requirement tracking

  • Loading branch information...
1 parent 4e48bde commit bc1ff20e8d032d36fb938859eda586f54d064e89 @ninja-cat ninja-cat committed Oct 12, 2012
@@ -9,7 +9,8 @@
package("python-setuptools")
package("python-pip")
if cnode[cbook][:use_gitbarclamp]
- gitserver = search(:node, "roles:git").first
+ env_filter = " AND git_config_environment:git-config-#{cnode[cbook][:git_instance]}"
+ gitserver = search(:node, "roles:git#{env_filter}").first
git_url = "git@#{gitserver[:fqdn]}:#{cbook}/#{comp_name}.git"
else
git_url = cnode[cbook][:gitrepo]
View
@@ -40,6 +40,7 @@ locale_additions:
git_refspec: refspec (branch, tag, commit, etc.)
use_gitbarclamp: Use barclamp git for pull from source
use_gitrepo: Use pull from source
+ git_instance: Git instance
deps: Pull from source dependencies list sepatared by a semicolon
use_pip_cache: Use cached pip packages
@@ -14,6 +14,9 @@
%label{ :for => :use_gitrepo }= t('.use_gitrepo')
= select_tag :use_gitrepo, options_for_select([['true','true'], ['false', 'false']], @proposal.raw_data['attributes'][@proposal.barclamp]["use_gitrepo"].to_s), :onchange => "update_value('use_gitrepo', 'use_gitrepo', 'boolean')"
%p
+ %label{ :for => :git_instance }= t('.git_instance')
+ = instance_selector("git", :git_instance, "git_instance", @proposal)
+%p
%label{ :for => :deps }= t('.deps')
%textarea{ :id => "pfs_deps", :onchange => "update_deps()"}
= @proposal.raw_data['attributes'][@proposal.barclamp]["pfs_deps"].join('; ')

0 comments on commit bc1ff20

Please sign in to comment.