summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot/sdc_ext_volume_partitions.txt (renamed from boot/asdc_ext_volume_partitions.txt)0
-rw-r--r--boot/sdc_install.sh (renamed from boot/asdc_install.sh)20
-rw-r--r--boot/sdc_serv.sh (renamed from boot/asdc_serv.sh)2
-rw-r--r--boot/sdc_vm_init.sh (renamed from boot/asdc_vm_init.sh)0
-rw-r--r--heat/ONAP/onap_openstack.yaml8
-rw-r--r--heat/ONAP/onap_openstack_float.yaml8
-rw-r--r--heat/ONAP/onap_openstack_nofloat.yaml8
-rw-r--r--heat/ONAP/onap_rackspace.yaml8
-rw-r--r--vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json4
9 files changed, 29 insertions, 29 deletions
diff --git a/boot/asdc_ext_volume_partitions.txt b/boot/sdc_ext_volume_partitions.txt
index b00c6ae2..b00c6ae2 100644
--- a/boot/asdc_ext_volume_partitions.txt
+++ b/boot/sdc_ext_volume_partitions.txt
diff --git a/boot/asdc_install.sh b/boot/sdc_install.sh
index 0400194c..b0b6bf15 100644
--- a/boot/asdc_install.sh
+++ b/boot/sdc_install.sh
@@ -53,12 +53,12 @@ apt-get update
apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
# Download scripts from Nexus
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_serv.sh -o /opt/asdc_serv.sh
-chmod +x /opt/asdc_vm_init.sh
-chmod +x /opt/asdc_serv.sh
-mv /opt/asdc_serv.sh /etc/init.d
-update-rc.d asdc_serv.sh defaults
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_vm_init.sh -o /opt/sdc_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_serv.sh -o /opt/sdc_serv.sh
+chmod +x /opt/sdc_vm_init.sh
+chmod +x /opt/sdc_serv.sh
+mv /opt/sdc_serv.sh /etc/init.d
+update-rc.d sdc_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
@@ -71,17 +71,17 @@ curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose
chmod +x /opt/docker/docker-compose
# Create partition and mount the external volume
-curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdc_ext_volume_partitions.txt -o /opt/sdc_ext_volume_partitions.txt
if [[ $CLOUD_ENV == "rackspace" ]]
then
DISK="xvdb"
else
DISK=$(ls /dev |grep -e '^.*db$')
- sed -i "s/xvdb/$DISK/g" /opt/asdc_ext_volume_partitions.txt
+ sed -i "s/xvdb/$DISK/g" /opt/sdc_ext_volume_partitions.txt
fi
-sfdisk /dev/$DISK < /opt/asdc_ext_volume_partitions.txt
+sfdisk /dev/$DISK < /opt/sdc_ext_volume_partitions.txt
mkfs -t ext4 /dev/$DISK"1"
mkdir -p /data
mount /dev/$DISK"1" /data
@@ -139,4 +139,4 @@ then
fi
# Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted
-./asdc_vm_init.sh
+./sdc_vm_init.sh
diff --git a/boot/asdc_serv.sh b/boot/sdc_serv.sh
index 7d2539eb..b48c8484 100644
--- a/boot/asdc_serv.sh
+++ b/boot/sdc_serv.sh
@@ -10,7 +10,7 @@
### END INIT INFO
dir="/opt"
-cmd="./asdc_vm_init.sh"
+cmd="./sdc_vm_init.sh"
user="root"
name=`basename $0`
diff --git a/boot/asdc_vm_init.sh b/boot/sdc_vm_init.sh
index dd15c0a1..dd15c0a1 100644
--- a/boot/asdc_vm_init.sh
+++ b/boot/sdc_vm_init.sh
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index a99054c1..af8ef76d 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1075,10 +1075,10 @@ resources:
echo "__sdc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
cd /opt
- chmod +x asdc_install.sh
- ./asdc_install.sh
+ chmod +x sdc_install.sh
+ ./sdc_install.sh
# PORTAL instantiation
@@ -1497,4 +1497,4 @@ resources:
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
cd /opt
chmod +x clamp_install.sh
- ./clamp_install.sh \ No newline at end of file
+ ./clamp_install.sh
diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml
index 74e24e46..ab9b560a 100644
--- a/heat/ONAP/onap_openstack_float.yaml
+++ b/heat/ONAP/onap_openstack_float.yaml
@@ -1153,10 +1153,10 @@ resources:
echo "__sdc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
cd /opt
- chmod +x asdc_install.sh
- ./asdc_install.sh
+ chmod +x sdc_install.sh
+ ./sdc_install.sh
# PORTAL instantiation
@@ -1580,4 +1580,4 @@ resources:
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
cd /opt
chmod +x clamp_install.sh
- ./clamp_install.sh \ No newline at end of file
+ ./clamp_install.sh
diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml
index 05ba2239..3dbea8e9 100644
--- a/heat/ONAP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
@@ -1024,10 +1024,10 @@ resources:
echo "__sdc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
cd /opt
- chmod +x asdc_install.sh
- ./asdc_install.sh
+ chmod +x sdc_install.sh
+ ./sdc_install.sh
# PORTAL instantiation
@@ -1423,4 +1423,4 @@ resources:
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
cd /opt
chmod +x clamp_install.sh
- ./clamp_install.sh \ No newline at end of file
+ ./clamp_install.sh
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index 260632c2..09c290e4 100644
--- a/heat/ONAP/onap_rackspace.yaml
+++ b/heat/ONAP/onap_rackspace.yaml
@@ -829,10 +829,10 @@ resources:
echo "__sdc_repo__" > /opt/config/remote_repo.txt
# Download and run install script
- curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
+ curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
cd /opt
- chmod +x asdc_install.sh
- ./asdc_install.sh
+ chmod +x sdc_install.sh
+ ./sdc_install.sh
# PORTAL instantiation
@@ -1196,4 +1196,4 @@ resources:
curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
cd /opt
chmod +x clamp_install.sh
- ./clamp_install.sh \ No newline at end of file
+ ./clamp_install.sh
diff --git a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
index 82339b0c..160add52 100644
--- a/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
+++ b/vnfs/VES5.0/evel/evel-test-collector/docs/att_interface_definition/event_format_updated.json
@@ -1693,11 +1693,11 @@
"type": "string"
},
"vfModuleName": {
- "description": "ASDC vfModuleName for the vfModule generating the event",
+ "description": "SDC vfModuleName for the vfModule generating the event",
"type": "string"
},
"vnfName": {
- "description": "ASDC modelName for the VNF generating the event",
+ "description": "SDC modelName for the VNF generating the event",
"type": "string"
}
},