projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v8.0'
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
d0418a8
..
f0f729e
100755
(executable)
--- a/
installers/charmed_install.sh
+++ b/
installers/charmed_install.sh
@@
-261,7
+261,8
@@
function deploy_charmed_osm(){
function check_osm_deployed() {
TIME_TO_WAIT=600
start_time="$(date -u +%s)"
function check_osm_deployed() {
TIME_TO_WAIT=600
start_time="$(date -u +%s)"
- total_service_count=14
+ total_service_count=15
+ previous_count=0
while true
do
service_count=$(juju status | grep kubernetes | grep active | wc -l)
while true
do
service_count=$(juju status | grep kubernetes | grep active | wc -l)
@@
-269,6
+270,10
@@
function check_osm_deployed() {
if [ $service_count -eq $total_service_count ]; then
break
fi
if [ $service_count -eq $total_service_count ]; then
break
fi
+ if [ $service_count -ne $previous_count ]; then
+ previous_count=$service_count
+ start_time="$(date -u +%s)"
+ fi
now="$(date -u +%s)"
if [[ $(( now - start_time )) -gt $TIME_TO_WAIT ]];then
echo "Timed out waiting for OSM services to become ready"
now="$(date -u +%s)"
if [[ $(( now - start_time )) -gt $TIME_TO_WAIT ]];then
echo "Timed out waiting for OSM services to become ready"
@@
-403,14
+408,16
@@
if [ -v MICROSTACK ]; then
install_microstack
fi
install_microstack
fi
+OSM_HOSTNAME=$(juju config nbi-k8s juju-external-hostname):443
+
echo "Your installation is now complete, follow these steps for configuring the osmclient:"
echo
echo "1. Create the OSM_HOSTNAME environment variable with the NBI IP"
echo
echo "Your installation is now complete, follow these steps for configuring the osmclient:"
echo
echo "1. Create the OSM_HOSTNAME environment variable with the NBI IP"
echo
-echo "export OSM_HOSTNAME=
nbi.$API_SERVER.xip.io:443
"
+echo "export OSM_HOSTNAME=
$OSM_HOSTNAME
"
echo
echo "2. Add the previous command to your .bashrc for other Shell sessions"
echo
echo
echo "2. Add the previous command to your .bashrc for other Shell sessions"
echo
-echo "echo \"export OSM_HOSTNAME=
nbi.$API_SERVER.xip.io:443
\" >> ~/.bashrc"
+echo "echo \"export OSM_HOSTNAME=
$OSM_HOSTNAME
\" >> ~/.bashrc"
echo
echo "DONE"
echo
echo "DONE"