---
url:
  gateway_url: "http://%{hiera('fqdn')}"
  redmine_url: "http://redmine.%{hiera('fqdn')}:8083/redmine/"
  api_redmine_url: "http://api-redmine.%{hiera('fqdn')}:8083/redmine/"
  jenkins_url: "http://jenkins.%{hiera('fqdn')}:8081/jenkins/"
  # jenkins-job update needs this else it fails with
  # "jenkins.NotFoundException: Requested item could not be found"
  jenkins_jjb_url: "http://jenkins.%{hiera('fqdn')}:8080/jenkins/"
  zuul_url: "http://jenkins.%{hiera('fqdn')}:8084/"
  gerrit_url: "http://gerrit.%{hiera('fqdn')}:8000/r/"
  redmine_pub_url: "http://%{hiera('fqdn')}/redmine/"
  jenkins_pub_url: "http://%{hiera('fqdn')}/jenkins/"
  gerrit_pub_url: "http://%{hiera('fqdn')}/r/"
  zuul_pub_url: "http://%{hiera('fqdn')}/zuul/"
  paste_pub_url: "http://%{hiera('fqdn')}/paste/"
  etherpad_pub_url: "http://%{hiera('fqdn')}/etherpad/"

---
url:
  gateway_url: "http://%{hiera('fqdn')}/"
  redmine_url: "http://redmine.%{hiera('fqdn')}:8083/redmine/"
  api_redmine_url: "http://api-redmine.%{hiera('fqdn')}:8083/redmine/"
  jenkins_url: "http://jenkins.%{hiera('fqdn')}:8081/jenkins/"
  # jenkins-job update needs this else it fails with
  # "jenkins.NotFoundException: Requested item could not be found"
  jenkins_jjb_url: "http://jenkins.%{hiera('fqdn')}:8080/jenkins/"
  zuul_url: "http://jenkins.%{hiera('fqdn')}:8084/"
  gerrit_url: "http://gerrit.%{hiera('fqdn')}:8000/r/"
  redmine_pub_url: "http://%{hiera('fqdn')}/redmine/"
  jenkins_pub_url: "http://%{hiera('fqdn')}/jenkins/"
  gerrit_pub_url: "http://%{hiera('fqdn')}/r/"
  zuul_pub_url: "http://%{hiera('fqdn')}/zuul/"
  paste_pub_url: "http://%{hiera('fqdn')}/paste/"
  etherpad_pub_url: "http://%{hiera('fqdn')}/etherpad/"

Fix Gerrit URL in puppet
Fix Gerrit URL in puppet

A trailing slash is missing in the gateway URL, and in case of managesf this
will finally fail because the Gerrit path is directly appended to the URL -
without a slash inbetween.

Change-Id: I3cffa8dd0f39fbbc48454509f67936c4be7a7fed
