Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Send both ubuntu versions to Robot VM
[demo.git]
/
boot
/
so_vm_init.sh
diff --git
a/boot/so_vm_init.sh
b/boot/so_vm_init.sh
index
d767a14
..
9cfba5e
100644
(file)
--- a/
boot/so_vm_init.sh
+++ b/
boot/so_vm_init.sh
@@
-8,6
+8,7
@@
OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt)
OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt)
export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt)
export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
+export OPENO_IP=$(cat /opt/config/openo_ip.txt)
# Deployments in OpenStack require a keystone file
if [ -e /opt/config/keystone.txt ]
# Deployments in OpenStack require a keystone file
if [ -e /opt/config/keystone.txt ]
@@
-76,7
+77,7
@@
read -d '' MSO_CONFIG_UPDATES <<-EOF
"identity_services":
[
{"dcp_clli": "$DCP_CLLI",
"identity_services":
[
{"dcp_clli": "$DCP_CLLI",
-
"identity_url": "$KEYSTONE_URL
",
+
"identity_url": "$KEYSTONE_URL/v2.0
",
"mso_id": "$OPENSTACK_USERNAME",
"mso_pass": "$OPENSTACK_APIKEY",
"admin_tenant": "service",
"mso_id": "$OPENSTACK_USERNAME",
"mso_pass": "$OPENSTACK_APIKEY",
"admin_tenant": "service",