summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Doucerain <jerome.doucerain@bell.ca>2018-03-17 16:03:08 -0400
committerJerome Doucerain <jerome.doucerain@bell.ca>2018-03-17 16:06:36 -0400
commit96bebdcf842ef0e6c1c65713930331f0c72d1d55 (patch)
tree62cdf02606e8e752f0702fdd194ad77ad40a8cad
parentaa56bbc3f170f6d4b417354a111ad2c50d79d53a (diff)
SO endpoints and service update
updated the endpoints and service in a single namespace onap deployment prospective updated the parameters order for the image source to allow override Issue-ID: OOM-743 Change-Id: I6a379ec4661d465f95478b383d60c3b2eecc0f72 Signed-off-by: Jerome Doucerain <jerome.doucerain@bell.ca>
-rwxr-xr-xkubernetes/so/resources/config/mso/mso-docker.json73
-rw-r--r--kubernetes/so/templates/deployment.yaml3
-rw-r--r--kubernetes/so/templates/service.yaml5
3 files changed, 42 insertions, 39 deletions
diff --git a/kubernetes/so/resources/config/mso/mso-docker.json b/kubernetes/so/resources/config/mso/mso-docker.json
index 7a0c579a97..17f01931a6 100755
--- a/kubernetes/so/resources/config/mso/mso-docker.json
+++ b/kubernetes/so/resources/config/mso/mso-docker.json
@@ -9,9 +9,9 @@
"mso-api-handler-infra-config":
{
- "bpelURL": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080",
+ "bpelURL": "http://so:8080",
"bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1",
- "camundaURL": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080",
+ "camundaURL": "http://so:8080",
"camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
},
@@ -23,7 +23,7 @@
"consumerGroup": "sdc-OpenSource-Env1",
"consumerId": "sdc-COpenSource-Env11",
"environmentName": "{{ .Values.config.dmaapTopic }}",
- "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443",
+ "asdcAddress": "sdc-be:8443",
"password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247",
"pollingInterval": 60,
"pollingTimeout": 60,
@@ -38,20 +38,20 @@
{
"sdncurls":
[
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/config",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:",
- "http://sdnhost.{{ .Release.Name }}-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
+ "http://sdnhost:8282/restconf/operations/L3SDN-API:",
+ "http://sdnhost:8282/restconf/config/L3SDN-API:",
+ "http://sdnhost:8282/restconf/operations/Firewall-API:",
+ "http://sdnhost:8282/restconf/config",
+ "http://sdnhost:8282/restconf/operations/VNF-API:",
+ "http://sdnhost:8282/restconf/operations/NBNC-API:",
+ "http://sdnhost:8282/restconf/operations/NORTHBOUND-API:service-topology-operation",
+ "http://sdnhost:8282/restconf/operations/GENERIC-RESOURCE-API:",
+ "http://sdnhost:8282/restconf/operations/VNFTOPOLOGYAIC-API:"
],
- "bpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
- "restbpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage",
- "myurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify",
+ "bpelurl": "http://so:8080/mso/SDNCAdapterCallbackService",
+ "restbpelurl": "http://so:8080/mso/WorkflowMessage",
+ "myurl": "http://so:8080/adapters/rest/SDNCNotify",
"sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73",
"bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1",
"sdncconnecttime": "5000"
@@ -92,7 +92,7 @@
"mso-workflow-message-adapter-config":
{
- "wmbpelurl": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage",
+ "wmbpelurl": "http://so:8080/mso/WorkflowMessage",
"wmbpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1"
},
@@ -128,37 +128,37 @@
"versionIdL3ToHigherLayerDeleteBonding": "52dbec20-47aa-42e4-936c-331d8e350d44",
"infraCustomerId": "21014aa2-526b-11e6-beb8-9e71128cae77",
"sniroAuth": "test:testpwd",
- "sniroEndpoint": "http://sniro-emulator.{{ .Release.Name }}-mock.svc.cluster.local:8080/sniro/api/v2/placement",
+ "sniroEndpoint": "http://sniro-emulator:8080/sniro/api/v2/placement",
"sniroTimeout": "PT30M",
- "serviceAgnosticSniroHost": "http://sniro-emulator.{{ .Release.Name }}-mock.svc.cluster.local:8080",
+ "serviceAgnosticSniroHost": "http://sniro-emulator:8080",
"serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement",
- "aaiEndpoint": "https://aai-service.{{ .Release.Name }}-aai.svc.cluster.local:8443",
+ "aaiEndpoint": "https://aai-service:8443",
"aaiAuth": "2630606608347B7124C244AB0FE34F6F",
"adaptersNamespace": "http://org.openecomp.mso",
- "adaptersCompletemsoprocessEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/CompleteMsoProcess",
- "adaptersDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/dbadapters/MsoRequestsDbAdapter",
- "adaptersOpenecompDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/dbadapters/RequestsDbAdapter",
- "catalogDbEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/ecomp/mso/catalog",
- "adaptersSdncEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/SDNCAdapter",
- "adaptersSdncRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/adapters/rest/v1/sdnc",
- "adaptersTenantEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/tenants/TenantAdapter",
+ "adaptersCompletemsoprocessEndpoint": "http://so:8080/CompleteMsoProcess",
+ "adaptersDbEndpoint": "http://so:8080/dbadapters/MsoRequestsDbAdapter",
+ "adaptersOpenecompDbEndpoint": "http://so:8080/dbadapters/RequestsDbAdapter",
+ "catalogDbEndpoint": "http://so:8080/ecomp/mso/catalog",
+ "adaptersSdncEndpoint": "http://so:8080/adapters/SDNCAdapter",
+ "adaptersSdncRestEndpoint": "http://so:8080/adapters/rest/v1/sdnc",
+ "adaptersTenantEndpoint": "http://so:8080/tenants/TenantAdapter",
"adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
- "adaptersWorkflowMessageEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/workflows/messages/message",
- "workflowMessageEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/WorkflowMessage",
- "workflowSdncAdapterCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService",
+ "adaptersWorkflowMessageEndpoint": "http://so:8080/workflows/messages/message",
+ "workflowMessageEndpoint": "http://so:8080/mso/WorkflowMessage",
+ "workflowSdncAdapterCallback": "http://so:8080/mso/SDNCAdapterCallbackService",
"workflowSdncReplicationDelay": "PT5S",
"workflowAaiDistributionDelay": "PT30S",
"msoKey": "07a7159d3bf51a0e53be7a8f89699be7",
"adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74",
"sdncTimeout": "PT5M",
"rollback": "true",
- "adaptersNetworkEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/networks/NetworkAdapter",
- "adaptersNetworkRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/networks/rest/v1/networks",
- "adaptersVnfAsyncEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/vnfs/VnfAdapterAsync",
- "workflowVnfAdapterDeleteCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
- "workflowVnfAdapterCreateCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify",
- "adaptersVnfRestEndpoint": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/vnfs/rest/v1/vnfs",
- "workflowVnfAdapterRestCallback": "http://mso.{{ .Release.Name }}-mso.svc.cluster.local:8080/mso/vnfAdapterRestNotify",
+ "adaptersNetworkEndpoint": "http://so:8080/networks/NetworkAdapter",
+ "adaptersNetworkRestEndpoint": "http://so:8080/networks/rest/v1/networks",
+ "adaptersVnfAsyncEndpoint": "http://so:8080/vnfs/VnfAdapterAsync",
+ "workflowVnfAdapterDeleteCallback": "http://so:8080/mso/vnfAdapterNotify",
+ "workflowVnfAdapterCreateCallback": "http://so:8080/mso/vnfAdapterNotify",
+ "adaptersVnfRestEndpoint": "http://so:8080/vnfs/rest/v1/vnfs",
+ "workflowVnfAdapterRestCallback": "http://so:8080/mso/vnfAdapterRestNotify",
"poTimeout": "PT5M",
"sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui",
"sdncFirewallYangModelVersion": "2015-05-15",
@@ -179,3 +179,4 @@
"mso-config": "~> 1.0.0"
}
}
+
diff --git a/kubernetes/so/templates/deployment.yaml b/kubernetes/so/templates/deployment.yaml
index 8706951467..0727ce80a3 100644
--- a/kubernetes/so/templates/deployment.yaml
+++ b/kubernetes/so/templates/deployment.yaml
@@ -49,7 +49,7 @@ spec:
- name: {{ .Chart.Name }}
command:
- /tmp/start-jboss-server.sh
- image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+ image: "{{ .Values.repository | default .Values.global.repository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -189,3 +189,4 @@ spec:
mode: 0755
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
+
diff --git a/kubernetes/so/templates/service.yaml b/kubernetes/so/templates/service.yaml
index de7e1c4a4c..63e41acc46 100644
--- a/kubernetes/so/templates/service.yaml
+++ b/kubernetes/so/templates/service.yaml
@@ -15,7 +15,7 @@
apiVersion: v1
kind: Service
metadata:
- name: {{ include "common.fullname" . }}
+ name: so
namespace: {{ include "common.namespace" . }}
labels:
app: {{ include "common.name" . }}
@@ -80,4 +80,5 @@ spec:
{{- end}}
selector:
app: {{ include "common.name" . }}
- release: {{ .Release.Name }} \ No newline at end of file
+ release: {{ .Release.Name }}
+