summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMandeep Khinda <Mandeep.Khinda@amdocs.com>2017-08-22 16:06:07 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-22 16:06:07 +0000
commit50275617c26dd7681308d5b814470d48ccb7c583 (patch)
treec466386c5aa0a1700b4825be07774680ba377acf
parentf207b665cffb368b43c9f8b98004ec1e156601de (diff)
parentaa5ea3e86b9337a6355e0692bb338424555a66bd (diff)
Merge "VID 1.1 work"
-rwxr-xr-xkubernetes/config/docker/init/src/config/vid/vid/lf_config/vid-pre-init.sql2
-rw-r--r--kubernetes/vid/vid-mariadb-deployment.yaml4
-rw-r--r--kubernetes/vid/vid-server-deployment.yaml4
3 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/config/docker/init/src/config/vid/vid/lf_config/vid-pre-init.sql b/kubernetes/config/docker/init/src/config/vid/vid/lf_config/vid-pre-init.sql
index ae1b5aaf01..57b797d03c 100755
--- a/kubernetes/config/docker/init/src/config/vid/vid/lf_config/vid-pre-init.sql
+++ b/kubernetes/config/docker/init/src/config/vid/vid/lf_config/vid-pre-init.sql
@@ -17,7 +17,7 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-CREATE TABLE IF NOT EXISTS `vid_openecomp`.`schema_info` (
+CREATE TABLE IF NOT EXISTS `vid_openecomp_epsdk`.`schema_info` (
`SCHEMA_ID` VARCHAR(25) NOT NULL,
`SCHEMA_DESC` VARCHAR(75) NOT NULL,
`DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
diff --git a/kubernetes/vid/vid-mariadb-deployment.yaml b/kubernetes/vid/vid-mariadb-deployment.yaml
index 93a798a04d..c34bce9c1b 100644
--- a/kubernetes/vid/vid-mariadb-deployment.yaml
+++ b/kubernetes/vid/vid-mariadb-deployment.yaml
@@ -15,11 +15,11 @@ spec:
name: vid-mariadb
spec:
containers:
- - image: mariadb:10
+ - image: nexus3.onap.org:10001/library/mariadb:10
name: vid-mariadb
env:
- name: MYSQL_DATABASE
- value: vid_openecomp
+ value: vid_openecomp_epsdk
- name: MYSQL_USER
value: vidadmin
- name: MYSQL_PASSWORD
diff --git a/kubernetes/vid/vid-server-deployment.yaml b/kubernetes/vid/vid-server-deployment.yaml
index 1e6e9de80d..5028297f5e 100644
--- a/kubernetes/vid/vid-server-deployment.yaml
+++ b/kubernetes/vid/vid-server-deployment.yaml
@@ -75,14 +75,14 @@ spec:
- name: VID_MYSQL_PORT
value: "3306"
- name: VID_MYSQL_DBNAME
- value: vid_openecomp
+ value: vid_openecomp_epsdk
- name: VID_MYSQL_USER
value: vidadmin
- name: VID_MYSQL_PASS
value: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
- name: VID_MYSQL_MAXCONNECTIONS
value: "5"
- image: nexus3.onap.org:10001/openecomp/vid:1.0-STAGING-latest
+ image: nexus3.onap.org:10001/openecomp/vid:1.1-STAGING-latest
name: vid-server
ports:
- containerPort: 8080