From 68a1cc973e89c8e88ce74fdb0e5c6e2b149a29a7 Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@gmail.com>
Date: Wed, 10 Oct 2018 14:11:27 -0500
Subject: [PATCH] Fixes for ingress DNS and kubernetes-proxy

Change-Id: Ic54da4bece1e9ca084aebc1b65845027b506d4c2
---
 global/software/config/versions.yaml                   | 2 +-
 site/airship-seaworthy/networks/common-addresses.yaml  | 2 +-
 site/airship-seaworthy/networks/physical/networks.yaml | 4 ++--
 tools/gate/Jenkinsfile                                 | 4 ++--
 tools/openstack                                        | 2 +-
 tools/tests.sh                                         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 2bd190720..7245adc99 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -85,7 +85,7 @@ data:
         type: git
       proxy:
         location: https://git.openstack.org/openstack/airship-promenade
-        reference: 6133b489d4605d70874a68791c7f27b77bf9e024
+        reference: 9f2e6b89e1882560273caa380fd7e49b4cff05e2
         subpath: charts/proxy
         type: git
       proxy-htk:
diff --git a/site/airship-seaworthy/networks/common-addresses.yaml b/site/airship-seaworthy/networks/common-addresses.yaml
index 89188a61c..41b2eaff1 100644
--- a/site/airship-seaworthy/networks/common-addresses.yaml
+++ b/site/airship-seaworthy/networks/common-addresses.yaml
@@ -43,7 +43,7 @@ data:
     # NEWSITE-CHANGEME: FQDN for ingress (i.e. "publicly facing" access point)
     # Choose FQDN according to the ingress/public FQDN naming conventions at
     # the top of this document.
-    ingress_domain: airship-seaworthy.atlantafoundry.com
+    ingress_domain: atlantafoundry.com
 
   genesis:
     # NEWSITE-CHANGEME: Update with the hostname for the node which will take on
diff --git a/site/airship-seaworthy/networks/physical/networks.yaml b/site/airship-seaworthy/networks/physical/networks.yaml
index ff14ba084..7a8fbce50 100644
--- a/site/airship-seaworthy/networks/physical/networks.yaml
+++ b/site/airship-seaworthy/networks/physical/networks.yaml
@@ -138,7 +138,7 @@ data:
     # NEWSITE-CHANGEME: FQDN for bare metal nodes.
     # Choose FQDN according to the node FQDN naming conventions at the top of
     # this document.
-    domain: airship-seaworthy.atlantafoundry.com
+    domain: atlantafoundry.com
     # List of upstream DNS forwards. Verify you can reach them from your
     # environment. If so, you should not need to change them.
     # TODO: This should be populated via substitution from common-addresses
@@ -211,7 +211,7 @@ data:
     # NEWSITE-CHANGEME: FQDN for bare metal nodes.
     # Choose FQDN according to the node FQDN naming conventions at the top of
     # this document.
-    domain: airship-seaworthy.atlantafoundry.com
+    domain: atlantafoundry.com
     # List of upstream DNS forwards. Verify you can reach them from your
     # environment. If so, you should not need to change them.
     # TODO: This should be populated via substitution from common-addresses
diff --git a/tools/gate/Jenkinsfile b/tools/gate/Jenkinsfile
index cb7a757d7..241e39a98 100644
--- a/tools/gate/Jenkinsfile
+++ b/tools/gate/Jenkinsfile
@@ -14,8 +14,8 @@ import groovy.json.JsonOutput
 
 PEGLEG_IMAGE = 'quay.io/airshipit/pegleg:73fbf264ca99b1a80c9e29e21048451716b630e7'
 
-KEYSTONE_URL = 'http://iam.airship-seaworthy.atlantafoundry.com/v3/auth/tokens'
-SHIPYARD_URL = 'http://shipyard.airship-seaworthy.atlantafoundry.com/api/v1.0'
+KEYSTONE_URL = 'http://iam.atlantafoundry.com/v3/auth/tokens'
+SHIPYARD_URL = 'http://shipyard.atlantafoundry.com/api/v1.0'
 
 SITE_NAME='airship-seaworthy'
 IPMI_CREDS = 'airship-seaworthy-ipmi'
diff --git a/tools/openstack b/tools/openstack
index 3c02b7ab8..22b271e37 100755
--- a/tools/openstack
+++ b/tools/openstack
@@ -26,7 +26,7 @@ clouds:
      project_name: 'admin'
      project_domain_name: 'default'
      user_domain_name: 'default'
-     auth_url: 'http://identity.airship-seaworthy.atlantafoundry.com/v3'
+     auth_url: 'http://identity.atlantafoundry.com/v3'
 EOF
 fi
 
diff --git a/tools/tests.sh b/tools/tests.sh
index b6d55ae82..b34b012e8 100755
--- a/tools/tests.sh
+++ b/tools/tests.sh
@@ -97,7 +97,7 @@ ssh -i ${OSH_VM_KEY_STACK} cirros@${FLOATING_IP} ping -q -c 1 -W 2 ${OSH_EXT_GAT
 ssh -i ${OSH_VM_KEY_STACK} cirros@${FLOATING_IP} curl --verbose --connect-timeout 5 169.254.169.254
 
 # Check the VM can reach the keystone server
-ssh -i ${OSH_VM_KEY_STACK} cirros@${FLOATING_IP} curl --verbose --connect-timeout 5 identity.airship-seaworthy.atlantafoundry.com
+ssh -i ${OSH_VM_KEY_STACK} cirros@${FLOATING_IP} curl --verbose --connect-timeout 5 identity.atlantafoundry.com
 
 # Check to see if cinder has been deployed, if it has then perform a volume attach.
 if tools/openstack service list -f value -c Type | grep -q "^volume"; then