aboutsummaryrefslogtreecommitdiffstats
path: root/boot
diff options
context:
space:
mode:
Diffstat (limited to 'boot')
-rw-r--r--boot/bind_zones1
-rw-r--r--boot/bind_zones_onap1
-rw-r--r--boot/cli_install.sh1
-rw-r--r--boot/dcae2_install.sh35
-rwxr-xr-xboot/portal_vm_init.sh4
5 files changed, 23 insertions, 19 deletions
diff --git a/boot/bind_zones b/boot/bind_zones
index 83b66e2f..3823aa66 100644
--- a/boot/bind_zones
+++ b/boot/bind_zones
@@ -141,3 +141,4 @@ mvim.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.or
vnfsdk.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org.
vfc.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org.
uui.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org.
+esr.api.simpledemo.openecomp.org. IN CNAME vm1.openo.simpledemo.openecomp.org.
diff --git a/boot/bind_zones_onap b/boot/bind_zones_onap
index 30bc38a0..29891646 100644
--- a/boot/bind_zones_onap
+++ b/boot/bind_zones_onap
@@ -141,3 +141,4 @@ mvim.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
vnfsdk.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
vfc.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
uui.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org.
+esr.api.simpledemo.onap.org. IN CNAME vm1.openo.simpledemo.onap.org. \ No newline at end of file
diff --git a/boot/cli_install.sh b/boot/cli_install.sh
index d167a1a5..c5ec4216 100644
--- a/boot/cli_install.sh
+++ b/boot/cli_install.sh
@@ -21,6 +21,7 @@ CLI_INSTALL_DIR=/opt/onap/cli
CLI_ZIP=cli.zip
CLI_BIN=/usr/bin/onap
export ONAP_CLI_HOME=$CLI_INSTALL_DIR
+export CLI_PRODUCT_VERSION=onap-1.1
#create install dir
if [ -d $CLI_INSTALL_DIR ]
diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh
index df1d513c..f6041728 100644
--- a/boot/dcae2_install.sh
+++ b/boot/dcae2_install.sh
@@ -24,25 +24,26 @@ fi
# Some VM images don't add the private interface automatically, we have to do it during the component installation
if [[ $CLOUD_ENV == "openstack_nofloat" ]]
then
- CIDR=$(cat /opt/config/oam_network_cidr.txt)
- BITMASK=$(echo $CIDR | cut -d"/" -f2)
+ #CIDR=$(cat /opt/config/oam_network_cidr.txt)
+ #BITMASK=$(echo $CIDR | cut -d"/" -f2)
# Compute the netmask based on the network cidr
- if [[ $BITMASK == "8" ]]
- then
- NETMASK=255.0.0.0
- elif [[ $BITMASK == "16" ]]
- then
- NETMASK=255.255.0.0
- elif [[ $BITMASK == "24" ]]
- then
- NETMASK=255.255.255.0
- fi
+ #if [[ $BITMASK == "8" ]]
+ #then
+ # NETMASK=255.0.0.0
+ #elif [[ $BITMASK == "16" ]]
+ #then
+ # NETMASK=255.255.0.0
+ #elif [[ $BITMASK == "24" ]]
+ #then
+ # NETMASK=255.255.255.0
+ #fi
echo "auto eth1" >> /etc/network/interfaces
- echo "iface eth1 inet static" >> /etc/network/interfaces
- echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces
- echo " netmask $NETMASK" >> /etc/network/interfaces
+ #echo "iface eth1 inet static" >> /etc/network/interfaces
+ #echo " address $DCAE_IP_ADDR" >> /etc/network/interfaces
+ #echo " netmask $NETMASK" >> /etc/network/interfaces
+ echo "iface eth1 inet dhcp" >> /etc/network/interfaces
echo " mtu $MTU" >> /etc/network/interfaces
ifup eth1
fi
@@ -59,7 +60,7 @@ curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae2_serv.sh -o /opt/
chmod +x /opt/dcae2_vm_init.sh
chmod +x /opt/dcae2_serv.sh
mv /opt/dcae2_serv.sh /etc/init.d
-update-rc.d dcae_serv.sh defaults
+update-rc.d dcae2_serv.sh defaults
# Download and install docker-engine and docker-compose
echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" | sudo tee /etc/apt/sources.list.d/docker.list
@@ -125,7 +126,7 @@ openstack:
keypair: '$OPENSTACK_KEYNAME'
key_filename: '/opt/dcae/key'
location_prefix: '$ZONE'
-location_domain: 'onapdevlab.onap.org'
+location_domain: 'dcae.onapdevlab.onap.org'
codesource_url: 'https://nexus.onap.org/service/local/repositories/raw/content'
codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts'
EOF_CONFIG
diff --git a/boot/portal_vm_init.sh b/boot/portal_vm_init.sh
index d4fd88a5..7d1c5351 100755
--- a/boot/portal_vm_init.sh
+++ b/boot/portal_vm_init.sh
@@ -40,9 +40,9 @@ docker tag $NEXUS_DOCKER_REPO/$CLI_IMG_NAME:$CLI_DOCKER_VERSION $CLI_IMG_NAME:$P
export LOGS_DIR=./logs
mkdir -p $LOGS_DIR
-# Export variable for subdirectory with host-specific property files
+# Export variable for subdirectory with appropriate property files
# The leading "./" is required for docker-compose
-export PROPS_DIR=./properties_rackspace
+export PROPS_DIR=./properties_simpledemo
# docker-compose is not in /usr/bin
/opt/docker/docker-compose down