summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexis de Talhouƫt <alexis.de_talhouet@bell.ca>2018-09-19 15:15:41 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-19 15:15:41 +0000
commit4a40070985b3bb6ffa7df7c11d53c9547697899e (patch)
tree27239099e256acf1a34f00f3aa3eeda4ab6d4dc4
parent99376a6310f40aa32c5ba9398b01a77add925346 (diff)
parent8858ebd399b321fcb60f1026dc4cfa7d3badcdac (diff)
Merge "Refactor MC windirver plugin namespace"
-rw-r--r--kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json2
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml16
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/values.yaml4
-rw-r--r--kubernetes/multicloud/resources/config/provider-plugin.json4
5 files changed, 22 insertions, 6 deletions
diff --git a/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json b/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
index 3757f4a6ac..8e19b3172e 100644
--- a/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
+++ b/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
@@ -47,7 +47,7 @@
{
"id": "multicloud-windriver",
"name": "Multicloud Windriver Health Check",
- "http": "http://multicloud-windriver:9005/api/multicloud-titanium_cloud/v0/swagger.json",
+ "http": "http://multicloud-windriver:9005/api/multicloud-titaniumcloud/v1/swagger.json",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index 2e89974fd1..3dfe72c607 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -73,7 +73,7 @@ spec:
{{ if .Values.liveness.enabled }}
livenessProbe:
httpGet:
- path: /api/multicloud-titanium_cloud/v0/swagger.json
+ path: /api/multicloud-titaniumcloud/v1/swagger.json
port: {{ .Values.service.internalPort }}
scheme: HTTP
initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
index d8c0196e6f..f876bb97ac 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/service.yaml
@@ -34,6 +34,22 @@ metadata:
"protocol": "REST",
"port": "{{ .Values.service.internalPort }}",
"visualRange": "1"
+ },
+ {
+ "serviceName": "multicloud-titaniumcloud",
+ "version": "v0",
+ "url": "/api/multicloud-titaniumcloud/v0",
+ "protocol": "REST",
+ "port": "{{ .Values.service.internalPort }}",
+ "visualRange": "1"
+ },
+ {
+ "serviceName": "multicloud-titaniumcloud",
+ "version": "v1",
+ "url": "/api/multicloud-titaniumcloud/v1",
+ "protocol": "REST",
+ "port": "{{ .Values.service.internalPort }}",
+ "visualRange": "1"
}
]'
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
index dce2343507..91d2d2e67f 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/values.yaml
@@ -24,7 +24,7 @@ global:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/multicloud/openstack-windriver:1.1.2
+image: onap/multicloud/openstack-windriver:1.2.0-STAGING
pullPolicy: Always
#Istio sidecar injection policy
@@ -42,7 +42,7 @@ config:
service:
type: NodePort
- name: multicloud-windriver
+ name: multicloud-titaniumcloud
externalPort: 9005
internalPort: 9005
nodePort: 94
diff --git a/kubernetes/multicloud/resources/config/provider-plugin.json b/kubernetes/multicloud/resources/config/provider-plugin.json
index 0ac4701aa9..2f799e5cdb 100644
--- a/kubernetes/multicloud/resources/config/provider-plugin.json
+++ b/kubernetes/multicloud/resources/config/provider-plugin.json
@@ -5,7 +5,7 @@
"titanium_cloud": {
"version": "titanium_cloud",
"extra_info_hint": "",
- "provider_plugin": "multicloud-titanium_cloud"
+ "provider_plugin": "multicloud-titaniumcloud"
},
"ocata": {
"version": "ocata",
@@ -26,4 +26,4 @@
},
"provider_plugin": "multicloud-vio"
}
-} \ No newline at end of file
+}