aboutsummaryrefslogtreecommitdiffstats
path: root/moonv4
diff options
context:
space:
mode:
authorRuan HE <ruan.he@orange.com>2017-12-09 14:16:43 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-09 14:16:43 +0000
commit05a6304565bbf435f138dee8e83f89e8daf3e784 (patch)
treeb07fe34dd6ddb56f6c898b684be1b3612d5ccd1c /moonv4
parentf9c21c3a0f37e92474500b8aa8b460678a6098f8 (diff)
parent607467c3903601526621b9496bbbe130ffe293d1 (diff)
Merge "Fix some configuration issues"
Diffstat (limited to 'moonv4')
-rw-r--r--moonv4/conf/moon.conf2
-rw-r--r--moonv4/kubernetes/templates/db.yaml2
-rw-r--r--moonv4/kubernetes/templates/moon_configuration.yaml2
-rw-r--r--moonv4/templates/moonforming/moon.conf2
4 files changed, 5 insertions, 3 deletions
diff --git a/moonv4/conf/moon.conf b/moonv4/conf/moon.conf
index e807b1d3..dc498e34 100644
--- a/moonv4/conf/moon.conf
+++ b/moonv4/conf/moon.conf
@@ -29,7 +29,7 @@ components:
orchestrator:
port: 8083
bind: 0.0.0.0
- hostname: interface
+ hostname: orchestrator
container: wukongsun/moon_orchestrator:v4.3
wrapper:
port: 8080
diff --git a/moonv4/kubernetes/templates/db.yaml b/moonv4/kubernetes/templates/db.yaml
index 0a62c077..38418643 100644
--- a/moonv4/kubernetes/templates/db.yaml
+++ b/moonv4/kubernetes/templates/db.yaml
@@ -31,6 +31,7 @@
apiVersion: apps/v1beta1
kind: Deployment
metadata:
+ namespace: moon
name: db
spec:
replicas: 1
@@ -73,6 +74,7 @@ spec:
apiVersion: v1
kind: Service
metadata:
+ namespace: moon
name: db
spec:
ports:
diff --git a/moonv4/kubernetes/templates/moon_configuration.yaml b/moonv4/kubernetes/templates/moon_configuration.yaml
index 14234cc1..3bcaa533 100644
--- a/moonv4/kubernetes/templates/moon_configuration.yaml
+++ b/moonv4/kubernetes/templates/moon_configuration.yaml
@@ -10,7 +10,7 @@ spec:
spec:
containers:
- name: moonforming
- image: asteroide/moonforming:v1.2
+ image: asteroide/moonforming:v1.3
env:
- name: POPULATE_ARGS
value: "--verbose" # debug mode: --debug
diff --git a/moonv4/templates/moonforming/moon.conf b/moonv4/templates/moonforming/moon.conf
index e807b1d3..dc498e34 100644
--- a/moonv4/templates/moonforming/moon.conf
+++ b/moonv4/templates/moonforming/moon.conf
@@ -29,7 +29,7 @@ components:
orchestrator:
port: 8083
bind: 0.0.0.0
- hostname: interface
+ hostname: orchestrator
container: wukongsun/moon_orchestrator:v4.3
wrapper:
port: 8080