Merge "Revert "Change prod & sandbox to public IPs for Ingress/Gerrit""

diff --cc jenkins-config/global-vars-production.sh
index 5bdc7e0,69a5513..f0724f4
--- 1/jenkins-config/global-vars-production.sh
--- 2/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@@ -1,11 -1,13 +1,11 @@@
  DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/
- GERRIT_URL=git://162.253.54.31/mirror/$PROJECT
- GIT_BASE=git://162.253.54.31/mirror/$PROJECT
- GIT_URL=git://162.253.54.31/mirror
+ GERRIT_URL=git://10.30.48.3/mirror/$PROJECT
+ GIT_BASE=git://10.30.48.3/mirror/$PROJECT
+ GIT_URL=git://10.30.48.3/mirror
  JENKINS_HOSTNAME=vex-yul-rot-jenkins-1
 -LOGS_SERVER=https://logs.fd.io
 -NEXUS_URL=https://nexus.fd.io
 -NEXUSPROXY=https://nexus.fd.io
  PACKAGECLOUDPROXY=https://packagecloud.io/fdio
  PCIO_CO=fdio
 -S3_BUCKET=
 +S3_BUCKET=fdio-logs-s3-cloudfront-index
 +CDN_URL=s3-logs.fd.io
  SIGUL_KEY=fdio-release-2018
  SILO=production

diff --cc jenkins-config/global-vars-sandbox.sh
index 97fddb7,79f2eb4..6c2057c
--- 1/jenkins-config/global-vars-sandbox.sh
--- 2/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@@ -1,11 -1,13 +1,11 @@@
  DOCKER_REGISTRY=https://jenkins.fd.io/sandbox/
- GERRIT_URL=git://162.253.54.31/mirror/$PROJECT
- GIT_BASE=git://162.253.54.31/mirror/$PROJECT
- GIT_URL=git://162.253.54.31/mirror
+ GERRIT_URL=git://10.30.48.3/mirror/$PROJECT
+ GIT_BASE=git://10.30.48.3/mirror/$PROJECT
+ GIT_URL=git://10.30.48.3/mirror
  JENKINS_HOSTNAME=vex-yul-rot-jenkins-2
 -LOGS_SERVER=https://logs.fd.io
 -NEXUS_URL=https://nexus.fd.io
 -NEXUSPROXY=https://nexus.fd.io
  PACKAGECLOUDPROXY=https://packagecloud.io/fdio
  PCIO_CO=fdio
 -S3_BUCKET=
 +S3_BUCKET=fdio-logs-s3-cloudfront-index
 +CDN_URL=s3-logs.fd.io
  SIGUL_KEY=fdio-sandbox
  SILO=sandbox