From a811f4ee807f476de66dcde5a299c2af6648b89b Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Wed, 25 Oct 2017 21:14:33 +0800 Subject: [PATCH] remove unnecessary part Change-Id: I04f4fb184bb7e1bacb9db4fd1d1280c5e0933639 Issue-ID: VFC-544 Signed-off-by: yufei_zhou --- nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore | 1 - nokia/vnfmdriver/vfcadaptorservice/deployment/pom.xml | 9 +++------ .../deployment/src/main/release/conf/server.p12 | Bin 2661 -> 0 bytes .../deployment/src/main/release/conf/trust.jks | Bin 1321 -> 0 bytes .../deployment/src/main/release/conf/web.xml | 5 ++++- nokia/vnfmdriver/vfcadaptorservice/docker/Dockerfile | 5 ----- .../vfcadaptorservice/docker/instance-config.sh | 2 -- .../vnfmdriver/vfcadaptorservice/docker/instance-init.sh | 9 +++------ 8 files changed, 10 insertions(+), 21 deletions(-) delete mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/.gitignore delete mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 delete mode 100644 nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks 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 @@ + org.codehaus.mojo build-helper-maven-plugin diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/server.p12 deleted file mode 100644 index 5bc1b7a970c62bd70dabed468b84df7ae6625b23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2661 zcmV-r3YzsWf(l^*0Ru3C3MU2$Duzgg_YDCD0ic2k7zBa}6flAc5HNxS#|8;1hDe6@ z4FLxRpn?RrFoFcM0s#Opf&{Gw2`Yw2hW8Bt2LUh~1_~;MNQUGPVHoOPpcfoK`bZ&v8$d>t*J?N zH)Hb`A>k=c?ZeRPW^$|bKjNCsFWtZ^h8PSv$48(F>E?OFu?cR`;{mN9l0ObOE+jN- z*aw}Xr{6jfXFqKhvAO%v(p7&ch%3}kPdCj%M0>`LDnC#?4+cHIb4J)%YR-peQ-Cl= zFlG@6FNZy8r|$DEr{&1)?sT_Xa~r73Mucvi2!W}+n4g(<0XK+bfR#>Qs2?4+XZeG? zd2ztfK&wv?v~ix4e28#lKe-og+0wnH>zY7eRHo5V9+SzQ>XG{g*cEA0oPjnVyL4d~5a>;%N5ll`gDSUh(T+EQ=rm`;8k>M;j z;f)HLku_VGMbTbR+Z2edld$nQolv_GDhTd;4L7^`gar&GO53}S6qo}T)@+oAlxdTq z(sh0lVfS6&vG5N2_u%jTw0wPzE=!UDhZgVV4SA_H2!I$D`C8XLm0qGW5jatND56^# zFw~It61s%lTgNB5{(1EB8ej)L z{RcUL9_GTz)S)G{bwaxI3;e4`x*S#qzV?Lno;gt?{d#(4n0 z#_fH6jV#jopM$zjgQHXQ3Pn1hTlMO4Cspb-h+>b7CxPeq{~q}BO30O{#o8x!PC<)X#EB~%xJn3=6;v&2UWawnCnZcSt$^VuS`#;7bG8qgIF*p+w1T%yy$G(-4DNW*Aj?zpDj zE>XUhxWuzujs5HtpkQpN-ny;&NR7*zv)V}aM$VB}vj??q6Bfv@((F2jirpnZ-z<<* zpG+0tBx^T8y2vD`k3OVk8L92uHP_I)CuQ$@2qB=^y~ua=PIZ(*<{-`)0P*m{H)n&C z6e+tmA(l_Vi%KdhTchF=;@eN3FoFd^1_>&LNQUT?3EykGp|DIf_(W)cJITu7PaNCvC{3f?+oU>$-O9D zr3D|I)Q)m;n_%2Xb;F_;A3mSuIjhm!+xCZQRljrB9(4J$u(|+rXLd=rBBaH003IKT zVCC&Wq#UeGk5BBnnBaUgUdsn%eML2iSWmILc3=Z;l=^T0HTcGad@ObtZ7bIQFr!1c zu+o8lz5#hsLB1zWUQ>c9$DZs}z~-gBeqh%v#b?$yfE7Bo zz^nL#y2>WHw(G-wWft(!>v$zbdu60A%wKQ&F{M6lD|Aa`t599FNJA*T6~=5ti8H+m zD#)?SvubK0u}abH^fJyipmLkW+&})ZE<&j~!=cXLW~x8lX8h92z&5kQfrIMD0OkZ0 zJ7$?Yajj|m!Hue_{$+&jMc+n%AYl9l zfgs%Bh`jhId=Ejo>%9Z&e0XG&2Jnik{f9wmCjswBPZ&6+9bw4=#_4SO+7G7skMdD+ zN%e95LS3+jhc3iFr*adjW)L`wAFM{%e5p>1N_oDj3~}523G&!Dop&O#A>X^u2Nb_%;xj?uB$51I8Vfk{>kO*Uzr5fYTCqm zwf-8aVc;f#mM@A7BJ(AOH@Qv_Xx+_GW?UDKfyeIR%J8Z1mo*(iD%9W|xXCdM;uTO! zzv38LBPFq2g@-7}ZXYZ05)nk3TV|0zF_3}6afL0H-XRZql;Ib}M{Xq+p=5K!zddgw z_~cbJqdJcP&t$zIzo_DhX`Yr z(Y2V3w8{>aTI##uk_w7(z<3z`6Nlc|K|J3V7_91@yCK%fB3=R z3-v&U5o9rzIb2JbAhCXvl5?Bp`#lk%VpE}6E8cv({Cn;n=k3hV2Dy74=`@cs^2N3Q z4Yaznuq3tM!i@RsufNkzSu@Ot30uh>F40SqmQ5*8x}7x2FL0~Ve5)FjYd1rbfEPxj z(`jQUw@^e-(j4d%Tz{G@O1J&Ot!OCU5l?%hrf=y1wwnab-##^by#Jh&X<&!{RE~&^ zM8QhUb;?u=O!ql8!pGxU9&upoAaL5uyh diff --git a/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks b/nokia/vnfmdriver/vfcadaptorservice/deployment/src/main/release/conf/trust.jks deleted file mode 100644 index 30b62ce8077a956fbbf4a57568ead6c67d87d57e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1321 zcmezO_TO6u1_mY|W(3o$xs}$7)N1o+`_9YA$j!=NU}MN_z{$oO%EBhh2M%63R6wCSbanfeOfUZeiK*%%aqs)Z$_VztocQ{Gx1yfTH}A(&Q2apUk{e zLu~_1h%1z!uE41r=%^+}C1hVRvNA9?G4eA2#krW87#SH3nt#3AUYP!V;kmnpm+IHK zPFuKgiG;!Xto6II_pGvs@!vXYk6Z4yi+9^?m^OEca^F9;e$$kG?{{m~%_(H>U_T%> zb>+HsFZTRXZOz_%Os-*j!wn7LR~Ne4(r-pH#Zz@IRA;RdDH&wKb{|EYN;KP=hRmb-n*q+=Ic9)8$Xc5|1|H<@%h zu7y?yL|rbmHs6@@R>e8_QqEMTRlDmF@;CP!$}e5`=A1*K*B;L&&$`WCxE%U-ps{ko zRiW@dLK1n$_+{6qST_D(eelnSC!6W}thi&W%UjbFsvH^)Zq`ZM7*oekS^k`fnUR5U zapM|;#+3&0z+jbCW|1%uYY@@;ArPtFU@E`7W|#GRttVcqW>0!$;098lz+!J;YhcaB z0%S567#kR}acHwKva+%>F^Z{Xl#~=$>FXDl78K+cmFQ)F(~VwoelAQ%zaTr)fFERz zFbjtP8zbX?CPoGWK9B%Eki)_POsZ@KvLHSmix`VYT!HwV{3Yxj%;xR?Y_}X&xMsHF z0&;``lPz--&6p}}=Qg_pX3I2P4EwM0>vu`c;sQmzGoOQ29NW3( zN96OzS6OG>XZ!W*+U%!`FUPKa>FdEI7GAb+)*ALi@dEvyS4uKhag~Q1*ElOOWzOV? z^Ltw558ODR-uEuJJg*>Nz1t=0h0WV9euzG`YqtJE`P${XH$C#tU#6NhOO_O)le8+vPo04rzrwbm~^5)`n?Qhj*qW*=tS}1Z} z?NPq;gZ1|n*^tZC8cl+rY zugCw?+a1Jfedh$74PH@l@BY`0()DXk`L^6GIAVSHl)$g~ysixu%S;UPBbmI5&x=cj z#hotBt(jx<;?|l9VX@G)|L*uZZ@Ky0kSVL{g6PWfkKb>}Ph*~*n)66&Nri5FID0_h zcEcy0#f#czn;btn`OWLQyMA2#RMPX*fa|EwmKhn^d1lL;Z*_U^eHzxV=eNhIUt3nh zDm{oeZTm>#HjkQB44>jU_1T;Do#nH=y=+0$$t&yDy5(Qc$eR2A%F_1Qdkcd8?5ty$ z5^?K)x6s!6H9IApqgRWvI?i}@PTQf2>09;_`8r?59pajq@w%&yx`*w&!9C%I&dF!< z^J~Q7{Q7rBKbBc_IEPEQi{+_)&Gl~^D=H4KiWLbtPpAp2y!A`^m0q4o=e)(t>blNL E08f$|_5c6? 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 @@ - + + + + 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 -- 2.16.6