airship
/
shipyard
Code Issues Proposed changes

Update Ingress Controller namespace 

[0] allows namespace specific ingress controllers and a
cluster wide ingress controller that acts as the external
front door to the cluster.

As the codes in OSH have been merged, we are removing the
workaround that was previously put in place for UCP namespace.

[0] https://review.openstack.org/#/c/533271/

Change-Id: Ia1c3e85e55678d62a4eb8506841dffc547012ef0
This commit is contained in:
Anthony Lin 2018-01-15 15:48:37 +00:00
parent c34f1986e0
commit 3d0d84688b
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/deckhand_load_yaml.sh
View File

@ -47,13 +47,7 @@ OS_PASSWORD="password"
OS_AUTH_URL="http://keystone.${namespace}:80/v3"
# Determine IP address of Ingress Controller
# Note that the Ingress Controller currently needs to be in the same
# namespace as the services that it is serving. The current workaround
# will be to remove the Ingress Controller from OSH and put the UCP one
# in the 'openstack' namespace. We should ideally have different Ingress
# Controller for OpenStack and UCP. This logic will be updated at a
# later date.
ingress_controller_ip=`sudo kubectl get pods -n openstack -o wide | grep ingress-api | awk '{print $6}'`
ingress_controller_ip=`sudo kubectl get pods -n ${namespace} -o wide | grep -v ingress-error-pages | grep -m 1 ingress | awk '{print $6}'`
# Update /etc/hosts with the IP of the ingress controller
# Note that these values would need to be set in the case

11
tools/run_shipyard.sh
View File

@ -22,15 +22,10 @@ set -x
# $ ./tools/run_shipyard.sh get actions
#
# NOTE: The Ingress Controller currently needs to be in the same
# namespace as the services that it is serving. The current workaround
# will be to remove the Ingress Controller from OSH and put the UCP one
# in the 'openstack' namespace. We should ideally have different Ingress
# Controller for OpenStack and UCP. This logic will be updated at a
# later date. User can retrieve the IP of the ingress_controller_ip by
# executing the following command:
# NOTE: User can retrieve the IP of the ingress_controller_ip by executing
# the following command:
#
# ingress_controller_ip=`sudo kubectl get pods -n openstack -o wide | grep ingress-api | awk '{print $6}'`
# ingress_controller_ip=`sudo kubectl get pods -n ucp -o wide | grep -v ingress-error-pages | grep -m 1 ingress | awk '{print $6}'`
#
# NOTE: User should update /etc/hosts with the IP of the ingress