diff options
Diffstat (limited to 'nokia/vnfmdriver')
8 files changed, 10 insertions, 21 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore b/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore deleted file mode 100644 index 4a811950..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vfcadaptor-deployment.iml diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml index c1255125..f0c4df7f 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml @@ -69,16 +69,12 @@ "${deployUnzip}/logs") System.out.println("******** start copying from ${basedir}/src/main/release to ${deployUnzip}. ************") - + ant.copy(todir: "${deployUnzip}") { fileset(dir: "${basedir}/src/main/release"){ exclude(name: "**/.gitignore") } - } - ant.copy(todir: "${deployUnzip}/docker") { - fileset(dir: "${basedir}/../docker"){ - exclude(name: "**/.gitignore") - } + } System.out.println("******** start copying from ${project.build.directory}/../../vfcadaptor/target/${package.name}-${project.version} to ${deployUnzip}/webapps/ROOT. ************") @@ -99,6 +95,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 Binary files differdeleted file mode 100644 index 5bc1b7a9..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 +++ /dev/null diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks Binary files differdeleted file mode 100644 index 30b62ce8..00000000 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks +++ /dev/null diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml index 793a8a88..c98ff28c 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml +++ b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/web.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="ISO-8859-1"?> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -238,6 +238,9 @@ <!-- attribute values, should the rules in JSP.1.6 --> <!-- for the escaping of quote characters be --> <!-- strictly applied? [true] --> + <!-- The default can be changed with the --> + <!-- org.apache.jasper.compiler.Parser. --> + <!-- STRICT_QUOTE_ESCAPING system property. --> <!-- --> <!-- quoteAttributeEL When EL is used in an attribute value on a --> <!-- JSP page should the rules for quoting of --> diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile index f538ccf2..05d261a9 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile @@ -10,10 +10,6 @@ FROM centos:7 RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo - -RUN rpm --rebuilddb -RUN yum clean all - RUN yum update -y RUN yum install -y wget unzip socat java-1.8.0-openjdk-headless @@ -29,7 +25,6 @@ RUN wget -q http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm && rp RUN yum -y update RUN yum -y install -y mysql-server RUN mysql_install_db --user=mysql --datadir=/var/lib/mysql -RUN chown mysql:mysql /var/lib/mysql -R EXPOSE 3306 RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/my.cnf COPY init-mysql.sh . diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh index 8bfc9b35..94f8d5bc 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-config.sh @@ -16,9 +16,7 @@ # # Config MSB address MSB_IP=`echo $MSB_ADDR | cut -d: -f 1` - sed -i "s|127\.0\.0\.1|${MSB_IP}|" etc/conf/restclient.json - cat etc/conf/restclient.json # Set self IP diff --git a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh index 1b55e980..69e2b25d 100755 --- a/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh +++ b/nokia/vnfmdriver/vfcadaptorservice/docker/instance-init.sh @@ -17,12 +17,9 @@ # Config mysql credentials function start_mysql { - echo "start mysql in instance_init ... " - service mysql start > myout_instance_init.file 2>&1 - cat myout_instance_init.file - service mysql status > myout_instance_init_mysql_status.file 2>&1 - cat myout_instance_init_mysql_status.file - sleep 5 + echo "start mysql ... " + service mysql start + sleep 1 } start_mysql |