Fixes for ingress DNS and kubernetes-proxy
Change-Id: Ic54da4bece1e9ca084aebc1b65845027b506d4c2
This commit is contained in:
parent
22e023aed8
commit
68a1cc973e
@ -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:
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
4
tools/gate/Jenkinsfile
vendored
4
tools/gate/Jenkinsfile
vendored
@ -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'
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user