Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-11-27 15:10:58 -0500
committerGerrit Code Review @ Eclipse.org2013-11-28 17:00:53 -0500
commit5cdfcd364c152ce5f8fc823bf70be96a51586002 (patch)
tree77e8b6b75708a30f0dbd59960be63839cec2c6a0
parent3c647b341a579372b7f47a508a299ac9cd9c59af (diff)
downloadorg.eclipse.mylyn.tasks-5cdfcd364c152ce5f8fc823bf70be96a51586002.tar.gz
org.eclipse.mylyn.tasks-5cdfcd364c152ce5f8fc823bf70be96a51586002.tar.xz
org.eclipse.mylyn.tasks-5cdfcd364c152ce5f8fc823bf70be96a51586002.zip
414360: puppet changes (add type bugzillaREST)
Change-Id: I87f28c4d7fa082061b12dc8fd124e714a1e04cca Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=414360
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp4
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp1
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb18
3 files changed, 22 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index 53b3d4e7d..9e26a006d 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -79,6 +79,7 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
minor => "5",
branch => "trunk",
branchTag => "trunk",
+ envversion => "4.5.1+",
}
bugzilla::site { "bugzilla-rest-trunk":
@@ -86,8 +87,9 @@ bugzilla::site { "bugzilla-rest-trunk":
minor => "5",
branch => "trunk",
branchTag => "trunk",
- rest_enabled => true,
envversion => "4.5.1+",
+ envdefault_rest => true,
+ rest_enabled => true,
}
} \ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index d2523e288..64fdf3e05 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -29,6 +29,7 @@ define bugzilla::site (
$userGroup = $bugzilla::userGroup,
$envversion = "${major}.${minor}",
$envdefault = false,
+ $envdefault_rest = false,
$desciptorfile = " ",
$usebugaliases = false,
$clearMode = $bugzilla::clearMode,
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index e02e5ec6e..627d943ff 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -13,3 +13,21 @@
<% if @rest_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"rest_enabled": "<%= rest_enabled %>"<% end %>
}
}
+<% if @rest_enabled %>
+,{
+ "type": "bugzillaREST",
+ "url": "/<%= envid %>",
+ "version": "<%= envversion %>",
+ "info": "<%= envinfo %>",
+ <% propertyanz = 0 -%>
+ "properties":{
+<% if @envdefault_rest %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %>
+<% if @custom_wf %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf": "<%= custom_wf %>"<% end %>
+<% if @custom_wf_and_status %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf_and_status": "<%= custom_wf_and_status %>"<% end %>
+<% if !@xmlrpc_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"xmlrpc_enabled": "<%= xmlrpc_enabled %>"<% end %>
+<% if @desciptorfile > " " %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"desciptorfile": "<%= desciptorfile %>"<% end %>
+<% if @usebugaliases %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"usebugaliases": "<%= usebugaliases %>"<% end %>
+ <% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"rest_enabled": "<%= rest_enabled %>"
+ }
+}
+<% end %> \ No newline at end of file

Back to the top