diff options
author | fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 14:03:17 +0800 |
---|---|---|
committer | fujinhua <fu.jinhua@zte.com.cn> | 2018-08-08 14:11:14 +0800 |
commit | 35b5bb6b423691ed1819732bae4e41864112810e (patch) | |
tree | 452fde436a5688e77c802f4bcc469bfd6e034539 | |
parent | 007bfac568467b36154cb9cf43f83b38ad0e17d2 (diff) |
Remove DB and redis service from catalog
Change-Id: I55361edccd5464702e828975694017b27a4f4f79
Issue-ID: VFC-978
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r-- | assembly.xml | 8 | ||||
-rwxr-xr-x | docker/Dockerfile | 11 | ||||
-rwxr-xr-x | docker/docker-entrypoint.sh | 18 | ||||
-rwxr-xr-x | docker/instance_config.sh | 25 | ||||
-rwxr-xr-x | docker/instance_init.sh | 29 | ||||
-rwxr-xr-x | resources/bin/initDB.sh | 49 | ||||
-rw-r--r-- | resources/dbscripts/mysql/vfc-nfvo-catalog-createdb.sql | 31 | ||||
-rw-r--r-- | resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql | 44 |
8 files changed, 18 insertions, 197 deletions
diff --git a/assembly.xml b/assembly.xml index 23dc6363..310196b5 100644 --- a/assembly.xml +++ b/assembly.xml @@ -54,14 +54,6 @@ </includes> </fileSet> <fileSet> - <directory>resources</directory> - <outputDirectory>/resources</outputDirectory> - <includes> - <include>**/*.sh</include> - <include>**/*.sql</include> - </includes> - </fileSet> - <fileSet> <directory>.</directory> <outputDirectory>/</outputDirectory> <includes> diff --git a/docker/Dockerfile b/docker/Dockerfile index 7cf3008e..2c0359cd 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,9 +9,6 @@ ENV https_proxy $HTTPS_PROXY RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny RUN echo "set backspace=2" >> /etc/vim/vimrc.tiny -RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections -RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections - RUN apt-get update && \ apt-get install -y python-virtualenv && \ apt-get install -y python-setuptools && \ @@ -19,8 +16,6 @@ RUN apt-get update && \ apt-get install -y python-pip && \ apt-get install -y gcc && \ apt-get install -y libmysqlclient-dev && \ - apt-get install -y redis-server && \ - apt-get install -y mysql-server && \ apt-get install -y mysql-client && \ apt-get install -y wget && \ apt-get install -y unzip && \ @@ -37,16 +32,10 @@ RUN wget -q -O vfc-nfvo-catalog.zip 'https://nexus.onap.org/service/local/artifa unzip vfc-nfvo-catalog.zip && \ rm -rf vfc-nfvo-catalog.zip -RUN sed -i "s|bind-address.*|# bind-address = 127.0.0.1|" /etc/mysql/my.cnf - -VOLUME /var/lib/mysql - WORKDIR /service/vfc/nfvo/catalog RUN pip install --pre -r requirements.txt EXPOSE 8806 -EXPOSE 3306 -EXPOSE 6379 WORKDIR /service ENTRYPOINT vfc/nfvo/catalog/docker/docker-entrypoint.sh diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index f02c9cce..0a277fae 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -5,17 +5,18 @@ if [ -z "$SERVICE_IP" ]; then fi echo "SERVICE_IP=$SERVICE_IP" -if [ -z "$MYSQL_ROOT_PASSWORD" ]; then - export MYSQL_ROOT_PASSWORD="root" -fi -echo "MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD" - if [ -z "$MSB_ADDR" ]; then echo "Missing required variable MSB_ADDR: Microservices Service Bus address <ip>:<port>" exit 1 fi echo "MSB_ADDR=$MSB_ADDR" +if [ -z "$MYSQL_ADDR" ]; then + echo "Missing required variable MYSQL_ADDR: <ip>:<port>" + exit 1 +fi +echo "MYSQL_ADDR=$MYSQL_ADDR" + # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..5}; do @@ -23,6 +24,13 @@ for i in {1..5}; do sleep $i done +# Wait for DB initialization +echo "Wait for DB initialization" +for i in {1..5}; do + curl -sS -m 1 $MYSQL_ADDR > /dev/null && break + sleep $i +done + # Configure service based on docker environment variables vfc/nfvo/catalog/docker/instance_config.sh diff --git a/docker/instance_config.sh b/docker/instance_config.sh index 4e29dc96..04ec38e6 100755 --- a/docker/instance_config.sh +++ b/docker/instance_config.sh @@ -15,29 +15,12 @@ if [ $SERVICE_IP ]; then sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" vfc/nfvo/catalog/catalog/pub/config/config.py fi -if [ $REDIS_HOST ]; then - sed -i "s|REDIS_HOST.*|REDIS_HOST = '$REDIS_HOST'|" vfc/nfvo/catalog/catalog/pub/config/config.py -fi - -#if [ $SDC_BASE_URL ]; then -# sed -i "s|SDC_BASE_URL.*|SDC_BASE_URL = '$SDC_BASE_URL'|" vfc/nfvo/catalog/catalog/pub/config/config.py -#fi - -sed -i "s|DB_NAME.*|DB_NAME = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py -sed -i "s|DB_USER.*|DB_USER = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py -sed -i "s|DB_PASSWD.*|DB_PASSWD = 'nfvocatalog'|" vfc/nfvo/catalog/catalog/pub/config/config.py - -# Configure MYSQL -if [ -z "$MYSQL_ADDR" ]; then - export MYSQL_IP=127.0.0.1 - export MYSQL_PORT=3306 - export MYSQL_ADDR=$MYSQL_IP:$MYSQL_PORT -else - MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1` - MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2` -fi +MYSQL_IP=`echo $MYSQL_ADDR | cut -d: -f 1` +MYSQL_PORT=`echo $MYSQL_ADDR | cut -d: -f 2` echo "MYSQL_ADDR=$MYSQL_ADDR" + sed -i "s|DB_IP.*|DB_IP = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py sed -i "s|DB_PORT.*|DB_PORT = $MYSQL_PORT|" vfc/nfvo/catalog/catalog/pub/config/config.py +sed -i "s|REDIS_HOST.*|REDIS_HOST = '$MYSQL_IP'|" vfc/nfvo/catalog/catalog/pub/config/config.py cat vfc/nfvo/catalog/catalog/pub/config/config.py diff --git a/docker/instance_init.sh b/docker/instance_init.sh index c2401144..cfc9b0d5 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -1,29 +1,2 @@ #!/bin/bash - -function install_python_libs { - cd /service/vfc/nfvo/catalog/ - pip install -r requirements.txt -} - -function start_redis_server { - redis-server & -} - -function start_mysql { - service mysql start - sleep 1 -} - -function create_database { - cd /service/vfc/nfvo/catalog/resources/bin - if [ ! -f dbexist.txt ]; then - echo 1 > dbexist.txt - bash initDB.sh root $MYSQL_ROOT_PASSWORD 3306 127.0.0.1 - fi - cd /service -} - -install_python_libs -start_redis_server -start_mysql -create_database +echo "No service needs init." diff --git a/resources/bin/initDB.sh b/resources/bin/initDB.sh deleted file mode 100755 index b4fe39ec..00000000 --- a/resources/bin/initDB.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 ZTE Corporation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -user=$1 -password=$2 -port=$3 -host=$4 -echo "start create nfvocatalog db" -sql_path=$HOME/../ -mysql -u$user -p$password -P$port -h$host <$sql_path/dbscripts/mysql/vfc-nfvo-catalog-createdb.sql -sql_result=$? -if [ $sql_result != 0 ] ; then - echo "failed to create nfvocatalog database" - exit 1 -fi -fileFlag=*createobj.sql -location=$sql_path/dbscripts/mysql -fileName="" -for i in `ls $location` -do - if [[ $i == ${fileFlag} ]];then - fileName=${i}; - echo "start create table:${fileName}" - mysql -u$user -p$password -P$port -h$host <$sql_path/dbscripts/mysql/$fileName - sql_result=$? - if [ $sql_result != 0 ] ; then - echo "failed to init nfvocatalog table:${fileName}" - exit 1 - fi - fi -done -echo "init nfvocatalog database success!" -exit 0 diff --git a/resources/dbscripts/mysql/vfc-nfvo-catalog-createdb.sql b/resources/dbscripts/mysql/vfc-nfvo-catalog-createdb.sql deleted file mode 100644 index 5776db4a..00000000 --- a/resources/dbscripts/mysql/vfc-nfvo-catalog-createdb.sql +++ /dev/null @@ -1,31 +0,0 @@ --- --- Copyright 2017 ZTE Corporation. --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -/******************drop old database and user***************************/ -use mysql; -drop database IF EXISTS nfvocatalog; -delete from user where User='nfvocatalog'; -FLUSH PRIVILEGES; - -/******************create new database and user***************************/ -create database nfvocatalog CHARACTER SET utf8; - -GRANT ALL PRIVILEGES ON nfvocatalog.* TO 'nfvocatalog'@'%' IDENTIFIED BY 'nfvocatalog' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'nfvocatalog'@'%' IDENTIFIED BY 'nfvocatalog' WITH GRANT OPTION; - -GRANT ALL PRIVILEGES ON nfvocatalog.* TO 'nfvocatalog'@'localhost' IDENTIFIED BY 'nfvocatalog' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'nfvocatalog'@'localhost' IDENTIFIED BY 'nfvocatalog' WITH GRANT OPTION; -FLUSH PRIVILEGES; diff --git a/resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql b/resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql deleted file mode 100644 index 34130acb..00000000 --- a/resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql +++ /dev/null @@ -1,44 +0,0 @@ --- --- Copyright 2017 ZTE Corporation. --- --- Licensed under the Apache License, Version 2.0 (the "License"); --- you may not use this file except in compliance with the License. --- You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -use nfvocatalog; - -DROP TABLE IF EXISTS CATALOG_JOB; -DROP TABLE IF EXISTS CATALOG_JOB_STATUS; -DROP TABLE IF EXISTS CATALOG_NSPACKAGE; -DROP TABLE IF EXISTS CATALOG_SOFTWAREIMAGEMODEL; -DROP TABLE IF EXISTS CATALOG_VNFPACKAGE; - --- --- Create model JobModel --- -CREATE TABLE `CATALOG_JOB` (`JOBID` varchar(255) NOT NULL PRIMARY KEY, `JOBTYPE` varchar(255) NOT NULL, `JOBACTION` varchar(255) NOT NULL, `RESID` varchar(255) NOT NULL, `STATUS` integer NULL, `STARTTIME` varchar(255) NULL, `ENDTIME` varchar(255) NULL, `PROGRESS` integer NULL, `USER` varchar(255) NULL, `PARENTJOBID` varchar(255) NULL, `RESNAME` varchar(255) NULL); --- --- Create model JobStatusModel --- -CREATE TABLE `CATALOG_JOB_STATUS` (`id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, `INDEXID` integer NOT NULL, `JOBID` varchar(255) NOT NULL, `STATUS` varchar(255) NOT NULL, `PROGRESS` integer NULL, `DESCP` longtext NOT NULL, `ERRCODE` varchar(255) NULL, `ADDTIME` varchar(255) NULL); --- --- Create model NSPackageModel --- -CREATE TABLE `CATALOG_NSPACKAGE` (`NSPACKAGEID` varchar(50) NOT NULL PRIMARY KEY, `NSPACKAGEURI` varchar(300) NULL, `CHECKSUM` varchar(50) NULL, `SDCCSARID` varchar(50) NULL, `OPERATIONALSTATE` varchar(20) NULL, `USAGESTATE` varchar(20) NULL, `DELETIONPENDING` varchar(20) NULL, `NSDID` varchar(50) NULL, `NSDNAME` varchar(50) NULL, `NSDDESIGNER` varchar(50) NULL, `NSDDESCRIPTION` varchar(100) NULL, `NSDVERSION` varchar(20) NULL, `USERDEFINEDDATA` longtext NULL, `LOCALFILEPATH` varchar(300) NULL, `NSDMODEL` longtext NULL); --- --- Create model SoftwareImageModel --- -CREATE TABLE `CATALOG_SOFTWAREIMAGEMODEL` (`IMAGEID` varchar(50) NOT NULL PRIMARY KEY, `CONTAINERFORMAT` varchar(20) NOT NULL, `DISKFORMAT` varchar(20) NOT NULL, `MINDISK` varchar(20) NOT NULL, `MINRAM` varchar(20) NOT NULL, `USAERMETADATA` varchar(1024) NOT NULL, `VNFPACKAGEID` varchar(50) NOT NULL, `FILEPATH` varchar(300) NOT NULL, `STATUS` varchar(10) NOT NULL, `VIMID` varchar(50) NOT NULL); --- --- Create model VnfPackageModel --- -CREATE TABLE `CATALOG_VNFPACKAGE` (`VNFPACKAGEID` varchar(50) NOT NULL PRIMARY KEY, `VNFPACKAGEURI` varchar(300) NULL, `SDCCSARURI` varchar(300) NULL, `CHECKSUM` varchar(50) NULL, `OPERATIONALSTATE` varchar(20) NULL, `USAGESTATE` varchar(20) NULL, `DELETIONPENDING` varchar(20) NULL, `VNFDID` varchar(50) NULL, `VENDOR` varchar(50) NULL, `VNFDPRODUCTNAME` varchar(50) NULL, `VNFDVERSION` varchar(20) NULL, `VNFSOFTWAREVERSION` varchar(20) NULL, `USERDEFINEDDATA` longtext NULL, `LOCALFILEPATH` varchar(300) NULL, `VNFDMODEL` longtext NULL); |