diff options
282 files changed, 2758 insertions, 978 deletions
diff --git a/kubernetes/aaf/templates/aaf-configmap.yaml b/kubernetes/aaf/templates/aaf-configmap.yaml index c8565f2d90..b6e494df46 100644 --- a/kubernetes/aaf/templates/aaf-configmap.yaml +++ b/kubernetes/aaf/templates/aaf-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aaf-data-configmap - namespace: {{ .Values.nsPrefix }}-aaf + namespace: {{ .Values.nsPrefix }} data: {{ (.Files.Glob "resources/config/aaf-data/*").AsConfig | indent 2 }} #{{ end }} diff --git a/kubernetes/aaf/templates/aaf-cs-deployment.yaml b/kubernetes/aaf/templates/aaf-cs-deployment.yaml index 55619b3280..be5f6c1c54 100644 --- a/kubernetes/aaf/templates/aaf-cs-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-cs-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aaf-cs - namespace: "{{ .Values.nsPrefix }}-aaf" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 1 selector: diff --git a/kubernetes/aaf/templates/aaf-deployment.yaml b/kubernetes/aaf/templates/aaf-deployment.yaml index 4f64048aad..50c3e5ad94 100644 --- a/kubernetes/aaf/templates/aaf-deployment.yaml +++ b/kubernetes/aaf/templates/aaf-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: aaf name: aaf - namespace: "{{ .Values.nsPrefix }}-aaf" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/aaf/templates/aaf-secret.yaml b/kubernetes/aaf/templates/aaf-secret.yaml index 705d05053c..4b6984ab38 100644 --- a/kubernetes/aaf/templates/aaf-secret.yaml +++ b/kubernetes/aaf/templates/aaf-secret.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: aaf-cs-data-secret - namespace: {{ .Values.nsPrefix }}-aaf + namespace: {{ .Values.nsPrefix }} type: Opaque data: {{ (.Files.Glob "resources/config/aaf-cs-data/*").AsSecrets | indent 2 }} diff --git a/kubernetes/aaf/templates/all-services.yaml b/kubernetes/aaf/templates/all-services.yaml index be04180089..0a06d1dd3c 100644 --- a/kubernetes/aaf/templates/all-services.yaml +++ b/kubernetes/aaf/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: aaf-cs - namespace: "{{ .Values.nsPrefix }}-aaf" + namespace: "{{ .Values.nsPrefix }}" labels: app: aaf-cs spec: @@ -26,7 +26,7 @@ apiVersion: v1 kind: Service metadata: name: aaf-authz-service - namespace: "{{ .Values.nsPrefix }}-aaf" + namespace: "{{ .Values.nsPrefix }}" labels: app: aaf-authz-service spec: diff --git a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json index 99edba2bed..7b299f7a39 100644 --- a/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json +++ b/kubernetes/aai/resources/config/aai-data/environments/simpledemo.json @@ -33,16 +33,16 @@ "PROJECT_HOME": "/opt/app/aai-traversal", "LOGROOT": "/opt/aai/logroot", "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64", - "AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/", - "AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/", - "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/", + "AAI_SERVER_URL_BASE": "https://aai-servicei.{{.Values.nsPrefix}}:8443/aai/", + "AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/", + "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/", "AAI_TRUSTSTORE_FILENAME": "aai_keystore", "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0", "AAI_KEYSTORE_FILENAME": "aai_keystore", "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0", - "APPLICATION_SERVERS": "aai-service.onap-aai", + "APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}", "AAI_DMAAP_PROTOCOL": "http", - "AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904", + "AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904", "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT", @@ -54,11 +54,11 @@ "AAI_NOTIFICATION_CURRENT_VERSION": "v11", "RESOURCE_VERSION_ENABLE_FLAG": "true", "TXN_HBASE_TABLE_NAME": "aailogging.dev", - "TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai", + "TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}", "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181", "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1", - "STORAGE_HOSTNAME": "hbase.onap-aai", + "STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}", "STORAGE_HBASE_TABLE": "aaigraph.dev", "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "DB_CACHE_CLEAN_WAIT": "20", @@ -85,16 +85,16 @@ "PROJECT_HOME": "/opt/app/aai-resources", "LOGROOT": "/opt/aai/logroot", "JAVA_HOME": "/usr/lib/jvm/java-8-openjdk-amd64", - "AAI_SERVER_URL_BASE": "https://aai-service.onap-aai:8443/aai/", - "AAI_SERVER_URL": "https://aai-service.onap-aai:8443/aai/v11/", - "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.onap-aai:8443/aai/", + "AAI_SERVER_URL_BASE": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/", + "AAI_SERVER_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/v11/", + "AAI_GLOBAL_CALLBACK_URL": "https://aai-service.{{.Values.nsPrefix}}:8443/aai/", "AAI_TRUSTSTORE_FILENAME": "aai_keystore", "AAI_TRUSTSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0", "AAI_KEYSTORE_FILENAME": "aai_keystore", "AAI_KEYSTORE_PASSWD_X": "OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0", - "APPLICATION_SERVERS": "aai-service.onap-aai", + "APPLICATION_SERVERS": "aai-service.{{.Values.nsPrefix}}", "AAI_DMAAP_PROTOCOL": "http", - "AAI_DMAAP_HOST_PORT": "dmaap.onap-message-router:3904", + "AAI_DMAAP_HOST_PORT": "dmaap.{{.Values.nsPrefix}}:3904", "AAI_DMAAP_TOPIC_NAME": "AAI-EVENT", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_STATUS": "UNPROCESSED", "AAI_NOTIFICATION_EVENT_DEFAULT_EVENT_TYPE": "AAI-EVENT", @@ -106,11 +106,11 @@ "AAI_NOTIFICATION_CURRENT_VERSION": "v11", "RESOURCE_VERSION_ENABLE_FLAG": "true", "TXN_HBASE_TABLE_NAME": "aailogging.dev", - "TXN_ZOOKEEPER_QUORUM": "hbase.onap-aai", + "TXN_ZOOKEEPER_QUORUM": "hbase.{{.Values.nsPrefix}}", "TXN_ZOOKEEPER_PROPERTY_CLIENTPORT": "2181", "TXN_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "AAI_WORKLOAD_PREFERRED_ROUTE_KEY": "MR1", - "STORAGE_HOSTNAME": "hbase.onap-aai", + "STORAGE_HOSTNAME": "hbase.{{.Values.nsPrefix}}", "STORAGE_HBASE_TABLE": "aaigraph.dev", "STORAGE_HBASE_ZOOKEEPER_ZNODE_PARENT": "/hbase", "DB_CACHE_CLEAN_WAIT": "20", diff --git a/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route b/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route index 81e1cf9877..293688ecd4 100644 --- a/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route +++ b/kubernetes/aai/resources/config/data-router/dynamic/routes/entity-event.route @@ -1,4 +1,4 @@ <route xmlns="http://camel.apache.org/schema/spring" trace="true"> - <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&groupName=datarouter&groupId=datarouter&url=http://dmaap.onap-message-router:3904"/> + <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&groupName=datarouter&groupId=datarouter&url=http://dmaap.{{.Values.nsPrefix}}:3904"/> <to uri="bean:entityEventPolicy?method=process"/> </route> diff --git a/kubernetes/aai/resources/config/haproxy/haproxy.cfg b/kubernetes/aai/resources/config/haproxy/haproxy.cfg index d7773270a4..6e6f489470 100644 --- a/kubernetes/aai/resources/config/haproxy/haproxy.cfg +++ b/kubernetes/aai/resources/config/haproxy/haproxy.cfg @@ -95,7 +95,7 @@ backend IST_Default_8447 balance roundrobin http-request set-header X-Forwarded-Port %[src_port] http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload; - server aai-resources.onap-aai aai-resources.onap-aai:8447 port 8447 ssl verify none + server aai-resources.{{.Values.nsPrefix}} aai-resources.{{.Values.nsPrefix}}:8447 port 8447 ssl verify none ####################### # BACKEND 8446######### @@ -105,7 +105,7 @@ backend IST_AAI_8446 balance roundrobin http-request set-header X-Forwarded-Port %[src_port] http-response set-header Strict-Transport-Security max-age=16000000;\ includeSubDomains;\ preload; - server aai-traversal.onap-aai aai-traversal.onap-aai:8446 port 8446 ssl verify none + server aai-traversal.{{.Values.nsPrefix}} aai-traversal.{{.Values.nsPrefix}}:8446 port 8446 ssl verify none listen IST_AAI_STATS mode http diff --git a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/aai/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/aai/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties b/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties index 58b80d8d98..5d61fbaaae 100644 --- a/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties +++ b/kubernetes/aai/resources/config/model-loader/appconfig/model-loader.properties @@ -1,6 +1,6 @@ # Model Loader Distribution Client Configuration ml.distribution.ACTIVE_SERVER_TLS_AUTH=false -ml.distribution.ASDC_ADDRESS=sdc-be.onap-sdc:8443 +ml.distribution.ASDC_ADDRESS=sdc-be.{{.Values.nsPrefix}}:8443 ml.distribution.CONSUMER_GROUP=aai-ml-group ml.distribution.CONSUMER_ID=aai-ml ml.distribution.ENVIRONMENT_NAME=AUTO @@ -13,7 +13,7 @@ ml.distribution.USER=aai ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG # Model Loader AAI REST Client Configuration -ml.aai.BASE_URL=https://aai-service.onap-aai:8443 +ml.aai.BASE_URL=https://aai-service.{{.Values.nsPrefix}}:8443 ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/ ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/ ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images diff --git a/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties index 006fc6ee02..c19667ad3c 100644 --- a/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties +++ b/kubernetes/aai/resources/config/search-data-service/appconfig/elastic-search.properties @@ -1,5 +1,5 @@ # ElasticSearch Configuration es.cluster-name=ES_AAI -es.ip-address=elasticsearch.onap-aai +es.ip-address=aai-elasticsearch.{{.Values.nsPrefix}} es.http-port=9200 diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties index 3b4542889e..aaca346760 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/aai.properties @@ -6,7 +6,7 @@ # # The ip address/hostname and port to the desired AAI instance # -aai.rest.host=aai-service.onap-aai +aai.rest.host=aai-service.{{.Values.nsPrefix}} aai.rest.port=8443 ############################## REST ############################## @@ -84,4 +84,4 @@ aai.ssl.truststore.type=jks aai.taskProcessor.maxConcurrentWorkers=5 aai.taskProcessor.transactionRateControllerEnabled=false aai.taskProcessor.numSamplesPerThreadForRunningAverage=100 -aai.taskProcessor.targetTPS=100
\ No newline at end of file +aai.taskProcessor.targetTPS=100 diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties index 82b5af39ab..99aea27d9e 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/elasticsearch.properties @@ -7,7 +7,7 @@ # The ip address/hostname and port to the desired AAI instance # For development it's recommended to use a local instance of ES # -elasticsearch.ipAddress=elasticsearch.onap-aai +elasticsearch.ipAddress=aai-elasticsearch.{{.Values.nsPrefix}} elasticsearch.httpPort=9200 elasticsearch.javaApiPort=8443 @@ -69,4 +69,4 @@ elasticsearch.taskProcessor.maxConcurrentWorkers=5 elasticsearch.taskProcessor.transactionRateControllerEnabled=false elasticsearch.taskProcessor.numSamplesPerThreadForRunningAverage=100 elasticsearch.taskProcessor.targetTPS=100 -elasticsearch.clusterName=ES_AAI_LOCALHOST
\ No newline at end of file +elasticsearch.clusterName=ES_AAI_LOCALHOST diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties index 33d91cf88a..90147362b0 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/portal/portal.properties @@ -7,10 +7,10 @@ portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServic # Instance of ECOMP Portal where the app has been on-boarded # use insecure http for dev purposes to avoid self-signed certificate -ecomp_rest_url = http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi +ecomp_rest_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi # Standard global logon page -ecomp_redirect_url = http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm +ecomp_redirect_url = http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm # Name of cookie to extract on login request csp_cookie_name = EPService diff --git a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties index 5f4985a5f2..57e34759d3 100644 --- a/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties +++ b/kubernetes/aai/resources/config/sparky-be/appconfig/search-service.properties @@ -6,7 +6,7 @@ # # The ip address/hostname and port to the desired Search Data Service instance # -search-service.ipAddress=search-data-service.onap-aai +search-service.ipAddress=search-data-service.{{.Values.nsPrefix}} search-service.httpPort=9509 ############################## Indexes ############################## @@ -29,4 +29,4 @@ search-service.type=default ############################## Certs ############################## search-service.ssl.cert-name=client-cert-onap.p12 search-service.ssl.keystore-password=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10 -search-service.ssl.keystore=tomcat_keystore
\ No newline at end of file +search-service.ssl.keystore=tomcat_keystore diff --git a/kubernetes/aai/templates/aai-deployment-configmap.yaml b/kubernetes/aai/templates/aai-deployment-configmap.yaml index 40d4909ebf..6684555bd0 100644 --- a/kubernetes/aai/templates/aai-deployment-configmap.yaml +++ b/kubernetes/aai/templates/aai-deployment-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-deployment-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/haproxy/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/aai-deployment.yaml b/kubernetes/aai/templates/aai-deployment.yaml index 4e8d82f42f..db6da6403c 100644 --- a/kubernetes/aai/templates/aai-deployment.yaml +++ b/kubernetes/aai/templates/aai-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aai-service - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.aaiServiceReplicas }} selector: diff --git a/kubernetes/aai/templates/aai-filebeat-configmap.yaml b/kubernetes/aai/templates/aai-filebeat-configmap.yaml index 5a123a54a0..2ca1ac2df5 100644 --- a/kubernetes/aai/templates/aai-filebeat-configmap.yaml +++ b/kubernetes/aai/templates/aai-filebeat-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/aai-resources-deployment.yaml b/kubernetes/aai/templates/aai-resources-deployment.yaml index dd7d7cc9d9..c07214d958 100644 --- a/kubernetes/aai/templates/aai-resources-deployment.yaml +++ b/kubernetes/aai/templates/aai-resources-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aai-resources - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.aaiResourceReplicas }} selector: diff --git a/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml index ebd69132a2..cdcaae6f64 100644 --- a/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml +++ b/kubernetes/aai/templates/aai-resources-traversal-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-chef-config-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/aai-data/chef-config/dev/.knife/solo.rb").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-resources-environments-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }} --- @@ -19,7 +19,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-resources-log-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/resources/logback.xml").AsConfig . | indent 2 }} --- @@ -27,7 +27,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-traversal-log-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/traversal/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml index 38e7fb0847..84a0d0f289 100644 --- a/kubernetes/aai/templates/aai-traversal-deployment.yaml +++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: aai-traversal - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.aaiTraversalReplicas }} selector: @@ -48,7 +48,7 @@ spec: - name: CHEF_GIT_URL value: http://gerrit.onap.org/r/aai - name: RESOURCES_HOSTNAME - value: aai-resources.{{ .Values.nsPrefix }}-aai + value: aai-resources.{{ .Values.nsPrefix }} volumeMounts: - mountPath: /etc/localtime name: localtime diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml index 77f7dc1f9b..01f24a7dd2 100644 --- a/kubernetes/aai/templates/all-services.yaml +++ b/kubernetes/aai/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: hbase - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: hbase spec: @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: name: aai-service - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: aai-service annotations: @@ -192,7 +192,7 @@ apiVersion: v1 kind: Service metadata: name: model-loader-service - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: model-loader-service spec: @@ -212,7 +212,7 @@ apiVersion: v1 kind: Service metadata: name: gremlin - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: gremlin spec: @@ -227,16 +227,16 @@ spec: apiVersion: v1 kind: Service metadata: - name: elasticsearch - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-elasticsearch + namespace: "{{ .Values.nsPrefix }}" labels: - app: elasticsearch + app: aai-elasticsearch spec: ports: - - name: "elasticsearch-port" + - name: "aai-elasticsearch-port" port: 9200 selector: - app: elasticsearch + app: aai-elasticsearch clusterIP: None #{{ end }} #{{ if not .Values.disableAaiSearchDataService }} @@ -245,7 +245,7 @@ apiVersion: v1 kind: Service metadata: name: search-data-service - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: search-data-service spec: @@ -262,7 +262,7 @@ apiVersion: v1 kind: Service metadata: name: aai-traversal - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: aai-traversal spec: @@ -281,7 +281,7 @@ apiVersion: v1 kind: Service metadata: name: aai-resources - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: aai-resources spec: @@ -300,7 +300,7 @@ apiVersion: v1 kind: Service metadata: name: sparky-be - namespace: "{{ .Values.nsPrefix }}-aai" + namespace: "{{ .Values.nsPrefix }}" labels: app: sparky-be spec: @@ -310,4 +310,4 @@ spec: selector: app: sparky-be clusterIP: None -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/aai/templates/data-router-configmap.yaml b/kubernetes/aai/templates/data-router-configmap.yaml index 57822135b2..3de38a740a 100644 --- a/kubernetes/aai/templates/data-router-configmap.yaml +++ b/kubernetes/aai/templates/data-router-configmap.yaml @@ -2,48 +2,48 @@ apiVersion: v1 kind: ConfigMap metadata: - name: data-router-prop-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-prop-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/data-router.properties").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: data-router-model-v8-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-model-v8-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v8.xml").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: data-router-model-v9-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-model-v9-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v9.xml").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: data-router-model-v10-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-model-v10-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v10.xml").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: data-router-model-v11-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-model-v11-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/model/aai_oxm_v11.xml").AsConfig . | indent 2 }} --- apiVersion: v1 kind: Secret metadata: - name: data-router-secret - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-secret + namespace: {{ .Values.nsPrefix }} type: Opaque data: {{ tpl (.Files.Glob "resources/config/data-router/appconfig/auth/*").AsSecrets . | indent 2 }} @@ -51,8 +51,8 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: data-router-dynamic-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-data-router-dynamic-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/data-router/dynamic/routes/entity-event.route").AsConfig . | indent 2 }} {{ tpl (.Files.Glob "resources/config/data-router/dynamic/conf/entity-event-policy.xml").AsConfig . | indent 2 }} diff --git a/kubernetes/aai/templates/data-router-deployment.yaml b/kubernetes/aai/templates/data-router-deployment.yaml index 6fb1751f1d..610ecb6e39 100644 --- a/kubernetes/aai/templates/data-router-deployment.yaml +++ b/kubernetes/aai/templates/data-router-deployment.yaml @@ -2,18 +2,18 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: data-router - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-data-router + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dataRouterReplicas }} selector: matchLabels: - app: data-router + app: aai-data-router template: metadata: labels: - app: data-router - name: data-router + app: aai-data-router + name: aai-data-router spec: initContainers: - command: @@ -35,10 +35,10 @@ spec: imagePullPolicy: {{ .Values.pullPolicy }} name: init-sysctl volumeMounts: - - name: data-router-logs + - name: aai-data-router-logs mountPath: /logroot/ containers: - - name: data-router + - name: aai-data-router image: "{{ .Values.image.dataRouterImage }}:{{ .Values.image.dataRouterVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} env: @@ -62,29 +62,29 @@ spec: readOnly: true - mountPath: /opt/app/data-router/config/model/aai_oxm_v8.xml subPath: aai_oxm_v8.xml - name: data-router-model-v8 + name: aai-data-router-model-v8 - mountPath: /opt/app/data-router/config/model/aai_oxm_v9.xml subPath: aai_oxm_v9.xml - name: data-router-model-v9 + name: aai-data-router-model-v9 - mountPath: /opt/app/data-router/config/model/aai_oxm_v10.xml subPath: aai_oxm_v10.xml - name: data-router-model-v10 + name: aai-data-router-model-v10 - mountPath: /opt/app/data-router/config/model/aai_oxm_v11.xml subPath: aai_oxm_v11.xml - name: data-router-model-v11 + name: aai-data-router-model-v11 - mountPath: /opt/app/data-router/config/auth - name: data-router-auth + name: aai-data-router-auth - mountPath: /opt/app/data-router/config/data-router.properties - name: data-router-properties + name: aai-data-router-properties subPath: data-router.properties - mountPath: /opt/app/data-router/dynamic/routes/entity-event.route subPath: entity-event.route - name: data-router-dynamic-route + name: aai-data-router-dynamic-route - mountPath: /opt/app/data-router/dynamic/conf/entity-event-policy.xml subPath: entity-event-policy.xml - name: data-router-dynamic-policy + name: aai-data-router-dynamic-policy - mountPath: /logs/ - name: data-router-logs + name: aai-data-router-logs ports: - containerPort: 9502 readinessProbe: @@ -96,31 +96,31 @@ spec: - name: localtime hostPath: path: /etc/localtime - - name: data-router-model-v8 + - name: aai-data-router-model-v8 configMap: - name: data-router-model-v8-configmap - - name: data-router-model-v9 + name: aai-data-router-model-v8-configmap + - name: aai-data-router-model-v9 configMap: - name: data-router-model-v9-configmap - - name: data-router-model-v10 + name: aai-data-router-model-v9-configmap + - name: aai-data-router-model-v10 configMap: - name: data-router-model-v10-configmap - - name: data-router-model-v11 + name: aai-data-router-model-v10-configmap + - name: aai-data-router-model-v11 configMap: - name: data-router-model-v11-configmap - - name: data-router-auth + name: aai-data-router-model-v11-configmap + - name: aai-data-router-auth secret: - secretName: data-router-secret - - name: data-router-properties + secretName: aai-data-router-secret + - name: aai-data-router-properties configMap: - name: data-router-prop-configmap - - name: data-router-dynamic-route + name: aai-data-router-prop-configmap + - name: aai-data-router-dynamic-route configMap: - name: data-router-dynamic-configmap - - name: data-router-dynamic-policy + name: aai-data-router-dynamic-configmap + - name: aai-data-router-dynamic-policy configMap: - name: data-router-dynamic-configmap - - name: data-router-logs + name: aai-data-router-dynamic-configmap + - name: aai-data-router-logs hostPath: path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/data-router/logs" restartPolicy: Always diff --git a/kubernetes/aai/templates/elasticsearch-configmap.yaml b/kubernetes/aai/templates/elasticsearch-configmap.yaml index 4a02346d9a..56b02529bc 100644 --- a/kubernetes/aai/templates/elasticsearch-configmap.yaml +++ b/kubernetes/aai/templates/elasticsearch-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-elasticsearch-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/elasticsearch/config/elasticsearch.yml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/elasticsearch-deployment.yaml b/kubernetes/aai/templates/elasticsearch-deployment.yaml index 7eae172c3b..1babb05897 100644 --- a/kubernetes/aai/templates/elasticsearch-deployment.yaml +++ b/kubernetes/aai/templates/elasticsearch-deployment.yaml @@ -2,18 +2,18 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: elasticsearch - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-elasticsearch + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.elasticsearchReplicas }} selector: matchLabels: - app: elasticsearch + app: aai-elasticsearch template: metadata: labels: - app: elasticsearch - name: elasticsearch + app: aai-elasticsearch + name: aai-elasticsearch spec: initContainers: - command: @@ -37,9 +37,9 @@ spec: volumeMounts: - name: elasticsearch-data mountPath: /logroot/ - hostname: elasticsearch + hostname: aai-elasticsearch containers: - - name: elasticsearch + - name: aai-elasticsearch image: "{{ .Values.image.elasticsearchImage }}:{{ .Values.image.elasticsearchVersion }}" imagePullPolicy: {{ .Values.pullPolicy }} ports: diff --git a/kubernetes/aai/templates/hbase-deployment.yaml b/kubernetes/aai/templates/hbase-deployment.yaml index 5b2a98cc89..f8ef61353c 100644 --- a/kubernetes/aai/templates/hbase-deployment.yaml +++ b/kubernetes/aai/templates/hbase-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: hbase - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-hbase + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.hbaseReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: hbase - name: hbase + name: aai-hbase spec: hostname: hbase containers: diff --git a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml index e5a59a124d..9337f551b8 100644 --- a/kubernetes/aai/templates/modelloader-deployment-configmap.yaml +++ b/kubernetes/aai/templates/modelloader-deployment-configmap.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: ConfigMap metadata: - name: model-loader-prop-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-model-loader-prop-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/model-loader.properties").AsConfig . | indent 2 }} --- apiVersion: v1 kind: Secret metadata: - name: model-loader-secret - namespace: {{ .Values.nsPrefix }}-aai + name: aai-model-loader-secret + namespace: {{ .Values.nsPrefix }} type: Opaque data: {{ tpl (.Files.Glob "resources/config/model-loader/appconfig/auth/*").AsSecrets . | indent 2 }} @@ -20,7 +20,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-model-loader-log-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/model-loader/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml index c5a788c287..e11df7c878 100644 --- a/kubernetes/aai/templates/modelloader-deployment.yaml +++ b/kubernetes/aai/templates/modelloader-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: model-loader-service - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-model-loader-service + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.modelLoaderReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: model-loader-service - name: model-loader-service + name: aai-model-loader-service spec: containers: - name: model-loader-service @@ -56,10 +56,10 @@ spec: path: /etc/localtime - name: aai-model-loader-prop-config configMap: - name: model-loader-prop-configmap + name: aai-model-loader-prop-configmap - name: aai-model-loader-auth-config secret: - secretName: model-loader-secret + secretName: aai-model-loader-secret - name: filebeat-conf configMap: name: aai-filebeat-configmap diff --git a/kubernetes/aai/templates/search-data-service-configmap.yaml b/kubernetes/aai/templates/search-data-service-configmap.yaml index 8f707d4ca3..43d9da02e2 100644 --- a/kubernetes/aai/templates/search-data-service-configmap.yaml +++ b/kubernetes/aai/templates/search-data-service-configmap.yaml @@ -2,16 +2,16 @@ apiVersion: v1 kind: ConfigMap metadata: - name: search-data-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-search-data-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: Secret metadata: - name: search-data-keystone-secret - namespace: {{ .Values.nsPrefix }}-aai + name: aai-search-data-keystone-secret + namespace: {{ .Values.nsPrefix }} type: Opaque data: {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/tomcat_keystore").AsSecrets . | indent 2 }} @@ -20,7 +20,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-search-policy-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/search-data-service/appconfig/auth/search_policy.json").AsSecrets . | indent 2 }} --- @@ -28,7 +28,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-search-data-service-log-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/search-data-service/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/search-data-service-deployment.yaml b/kubernetes/aai/templates/search-data-service-deployment.yaml index 7202e0d39c..fc5a0d2fe2 100644 --- a/kubernetes/aai/templates/search-data-service-deployment.yaml +++ b/kubernetes/aai/templates/search-data-service-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: search-data-service - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-search-data-service + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.searchDataServiceReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: search-data-service - name: search-data-service + name: aai-search-data-service spec: containers: - name: search-data-service @@ -74,10 +74,10 @@ spec: path: /etc/localtime - name: aai-search-data-service-config configMap: - name: search-data-configmap + name: aai-search-data-configmap - name: aai-search-data-service-auth-config secret: - secretName: search-data-keystone-secret + secretName: aai-search-data-keystone-secret - name: aai-search-data-search-policy-config configMap: name: aai-search-policy-configmap diff --git a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml index 590608b566..3a0c7fb556 100644 --- a/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment-configmap.yaml @@ -2,32 +2,32 @@ apiVersion: v1 kind: ConfigMap metadata: - name: sparky-be-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-sparky-be-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: sparky-be-model-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-sparky-be-model-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/model/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: sparky-be-portal-configmap - namespace: {{ .Values.nsPrefix }}-aai + name: aai-sparky-be-portal-configmap + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/portal/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: Secret metadata: - name: sparky-be-secret - namespace: {{ .Values.nsPrefix }}-aai + name: aai-sparky-be-secret + namespace: {{ .Values.nsPrefix }} type: Opaque data: {{ tpl (.Files.Glob "resources/config/sparky-be/appconfig/auth/*").AsSecrets . | indent 2 }} @@ -36,7 +36,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: aai-sparky-be-log-configmap - namespace: {{ .Values.nsPrefix }}-aai + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/sparky-be/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/aai/templates/sparky-be-deployment.yaml b/kubernetes/aai/templates/sparky-be-deployment.yaml index e5339283ab..e73c7b393b 100644 --- a/kubernetes/aai/templates/sparky-be-deployment.yaml +++ b/kubernetes/aai/templates/sparky-be-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: sparky-be - namespace: "{{ .Values.nsPrefix }}-aai" + name: aai-sparky-be + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.sparkyReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: sparky-be - name: sparky-be + name: aai-sparky-be spec: containers: - name: sparky-be @@ -83,16 +83,16 @@ spec: path: /etc/localtime - name: aai-sparky-be-config configMap: - name: sparky-be-configmap + name: aai-sparky-be-configmap - name: aai-sparky-be-model-config configMap: - name: sparky-be-model-configmap + name: aai-sparky-be-model-configmap - name: aai-sparky-be-portal-config configMap: - name: sparky-be-portal-configmap + name: aai-sparky-be-portal-configmap - name: aai-sparky-be-auth-config secret: - secretName: sparky-be-secret + secretName: aai-sparky-be-secret - name: filebeat-conf configMap: name: aai-filebeat-configmap diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/installSdncDb.sh b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/installSdncDb.sh new file mode 100755 index 0000000000..75680bd942 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/installSdncDb.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} + +SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} +SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma} +SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl} + + +# Create tablespace and user account +mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} mysql <<-END +CREATE DATABASE ${SDNC_DB_DATABASE}; +CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}'; +CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}'; +GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION; +commit; +END + +if [ -f ${SDNC_HOME}/data/odlsli.dump ] +then +mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/odlsli.dump +fi + diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/startODL.sh new file mode 100755 index 0000000000..87c95ee3b3 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/bin/startODL.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + + +# Install SDN-C platform components if not already installed and start container + +ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +SLEEP_TIME=${SLEEP_TIME:-120} +MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} + +# +# Wait for database +# +echo "Waiting for mysql" +until mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} mysql &> /dev/null +do + printf "." + sleep 1 +done +echo -e "\nmysql ready" + +if [ ! -f ${SDNC_HOME}/.installed ] +then + echo "Installing SDN-C database" + ${SDNC_HOME}/bin/installSdncDb.sh + echo "Starting OpenDaylight" + ${ODL_HOME}/bin/start + echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize" + sleep ${SLEEP_TIME} + echo "Installing SDN-C platform features" + ${SDNC_HOME}/bin/installFeatures.sh + if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] + then + echo "Installing directed graphs" + ${SDNC_HOME}/svclogic/bin/install.sh + fi + + + echo "Restarting OpenDaylight" + ${ODL_HOME}/bin/stop + echo "Installed at `date`" > ${SDNC_HOME}/.installed +fi + +exec ${ODL_HOME}/bin/karaf + diff --git a/kubernetes/appc/resources/config/conf/aaiclient.properties b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/aaiclient.properties index 67af3ff21c..9e29744bb3 100644 --- a/kubernetes/appc/resources/config/conf/aaiclient.properties +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/aaiclient.properties @@ -39,7 +39,7 @@ org.onap.ccsdk.sli.adaptors.aai.application=openECOMP # # Configuration file for A&AI Client # -org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.onap-aai:8443 +org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.{{.Values.nsPrefix}}:8443 # query @@ -133,8 +133,8 @@ org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v11/service-design-and # UBB Notify org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v11/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.onap-aai:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://aai-service.onap-aai:8443/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.{{.Values.nsPrefix}}:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://aai-service.{{.Values.nsPrefix}}:8443/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information # Service org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id} diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/dblib.properties b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/dblib.properties new file mode 100644 index 0000000000..6107a80416 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/dblib.properties @@ -0,0 +1,38 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +# dblib.properrties +org.onap.ccsdk.sli.dbtype=jdbc + +org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl +org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma +org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.jdbc.request.timeout=100 +org.onap.ccsdk.sli.jdbc.limit.init=10 +org.onap.ccsdk.sli.jdbc.limit.min=10 +org.onap.ccsdk.sli.jdbc.limit.max=20 +org.onap.dblib.connection.recovery=false + diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/svclogic.properties b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/svclogic.properties new file mode 100644 index 0000000000..2954bb00a5 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/data/properties/svclogic.properties @@ -0,0 +1,30 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +org.onap.ccsdk.sli.dbtype = dblib +#Note : the next 4 fields are only used if org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma + +org.xml.sax.driver=org.apache.xerces.parsers.SAXParser + diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh new file mode 100755 index 0000000000..ceeea5914f --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh @@ -0,0 +1,30 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +MYSQL_USER=${MYSQL_USER:-sdnctl} +MYSQL_PWD=${MYSQL_PWD:-gamma} +MYSQL_DB=${MYSQL_DB:-sdnctl} +MYSQL_HOST=${MYSQL_HOST:-appc-dbhost.{{.Values.nsPrefix}}} + +mysql --user=${MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB} <<-END +SELECT module, rpc, version, mode from SVC_LOGIC where active='Y'; +END + diff --git a/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/config/svclogic.properties b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/config/svclogic.properties new file mode 100644 index 0000000000..e1042450da --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/onap/sdnc/svclogic/config/svclogic.properties @@ -0,0 +1,27 @@ +### +# ============LICENSE_START======================================================= +# openECOMP : SDN-C +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights +# reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://appc-sdnctldb01:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database = sdnctl +org.onap.ccsdk.sli.jdbc.user = sdnctl +org.onap.ccsdk.sli.jdbc.password = gamma + diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/installAppcDb.sh b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/installAppcDb.sh new file mode 100755 index 0000000000..526d6f94ae --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/installAppcDb.sh @@ -0,0 +1,54 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +APPC_HOME=${APPC_HOME:-/opt/openecomp/appc} +MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} + +APPC_DB_USER=${APPC_DB_USER:-appcctl} +APPC_DB_PASSWD=${APPC_DB_PASSWD:-appcctl} +APPC_DB_DATABASE=${SDN_DB_DATABASE:-appcctl} + + +# Create tablespace and user account +mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} mysql <<-END +CREATE DATABASE ${APPC_DB_DATABASE}; +CREATE USER '${APPC_DB_USER}'@'localhost' IDENTIFIED BY '${APPC_DB_PASSWD}'; +CREATE USER '${APPC_DB_USER}'@'%' IDENTIFIED BY '${APPC_DB_PASSWD}'; +GRANT ALL PRIVILEGES ON ${APPC_DB_DATABASE}.* TO '${APPC_DB_USER}'@'localhost' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON ${APPC_DB_DATABASE}.* TO '${APPC_DB_USER}'@'%' WITH GRANT OPTION; +commit; +END + +if [ -f ${APPC_HOME}/data/appcctl.dump ] +then + mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} appcctl < ${APPC_HOME}/data/appcctl.dump +fi + +if [ -f ${APPC_HOME}/data/sdnctl.dump ] +then + mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} sdnctl < ${APPC_HOME}/data/sdnctl.dump +fi + +if [ -f ${APPC_HOME}/data/sqlData.dump ] +then + mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} sdnctl < ${APPC_HOME}/data/sqlData.dump +fi + diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/startODL.sh new file mode 100755 index 0000000000..ba4ff52147 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/bin/startODL.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +# +# This script takes care of installing the SDNC & APPC platform components +# if not already installed, and starts the APPC Docker Container +# + +ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} +ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} +SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} +APPC_HOME=${APPC_HOME:-/opt/openecomp/appc} +SLEEP_TIME=${SLEEP_TIME:-120} +MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} + +# +# Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties +# +DMAAP_TOPIC_ENV=${DMAAP_TOPIC_ENV} + +if [ -z "$DMAAP_TOPIC_ENV" ] + then + echo "DMAAP_TOPIC_ENV shell variable is empty. Adding default value OS-ETE-DFW" + DMAAP_TOPIC_ENV="OS-ETE-DFW" + else + echo "DMAAP_TOPIC_ENV shell variable exists and it's $DMAAP_TOPIC_ENV" +fi + +echo "Adding a value to property appc.asdc.env in appc.properties for appc-asdc-listener feature" +echo "" >> $APPC_HOME/data/properties/appc.properties +echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties +echo "" >> $APPC_HOME/data/properties/appc.properties + +# +# Wait for database to init properly +# +echo "Waiting for mysql" +until mysql -h appc-dbhost.{{.Values.nsPrefix}} -u root -p${MYSQL_PASSWD} mysql &> /dev/null +do + printf "." + sleep 1 +done +echo -e "\nmysql ready" + +if [ ! -f ${SDNC_HOME}/.installed ] +then + echo "Installing SDNC database" + ${SDNC_HOME}/bin/installSdncDb.sh + echo "Installing APPC database" + ${APPC_HOME}/bin/installAppcDb.sh + echo "Starting OpenDaylight" + ${ODL_HOME}/bin/start + echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize" + sleep ${SLEEP_TIME} + echo "Inserting modified installFeatures.sh for sdnc" + rm ${SDNC_HOME}/bin/installFeatures.sh + cp ${APPC_HOME}/data/sdncInstallFeatures.sh ${SDNC_HOME}/bin/installFeatures.sh + echo "Installing SDNC platform features" + ${SDNC_HOME}/bin/installFeatures.sh + if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] + then + echo "Installing directed graphs" + ${SDNC_HOME}/svclogic/bin/install.sh + fi + + echo "Installing APPC platform features" + ${APPC_HOME}/bin/installFeatures.sh + if [ -x ${APPC_HOME}/svclogic/bin/install.sh ] + then + echo "Installing APPC DGs using platform-logic" + ${APPC_HOME}/svclogic/bin/install.sh + fi + + if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ] + then + echo "Installing APPC JSON DGs converted to XML using dg-loader" + ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh + fi + + echo "Restarting OpenDaylight" + ${ODL_HOME}/bin/stop + echo "Installed at `date`" > ${SDNC_HOME}/.installed +fi + +exec ${ODL_HOME}/bin/karaf + diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/aaiclient.properties b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/aaiclient.properties new file mode 100644 index 0000000000..9e29744bb3 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/aaiclient.properties @@ -0,0 +1,248 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +# +# Configuration file for A&AI Client +# + +# +# Certificate keystore and truststore +# +org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/openecomp/appc/data/stores/truststore.openecomp.client.jks +org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin +org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true + +org.onap.ccsdk.sli.adaptors.aai.client.name=AAI +org.onap.ccsdk.sli.adaptors.aai.client.psswd=AAI + +org.onap.ccsdk.sli.adaptors.aai.application=openECOMP +#connection.timeout=1000 +#read.timeout=2000 + +# +# Configuration file for A&AI Client +# +org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.{{.Values.nsPrefix}}:8443 + + +# query +org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v11/search/sdn-zone-query +org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v11/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} +org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v11/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 + +# named query +org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query + + +#update +org.onap.ccsdk.sli.adaptors.aai.update=/aai/v11/actions/update + +# vce +org.onap.ccsdk.sli.adaptors.aai.path.vce =/aai/v11/network/vces/vce/ +org.onap.ccsdk.sli.adaptors.aai.path.vces=/aai/v11/network/vces/ + +# vpe +org.onap.ccsdk.sli.adaptors.aai.path.vpe =/aai/v11/network/vpes/vpe/ +org.onap.ccsdk.sli.adaptors.aai.path.vpes=/aai/v11/network/vpes/ + +# customer +org.onap.ccsdk.sli.adaptors.aai.path.customer=/aai/v11/business/customers/customer/{customer-id} + +# service subscription +org.onap.ccsdk.sli.adaptors.aai.path.service.subscription=/aai/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type} + +# service instance +org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v11/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances +org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v11/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance +org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} + +# complex +org.onap.ccsdk.sli.adaptors.aai.path.complexes=/aai/v11/cloud-infrastructure/complexes +org.onap.ccsdk.sli.adaptors.aai.path.complex=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id} + +# tenant +org.onap.ccsdk.sli.adaptors.aai.path.tenant=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id} +org.onap.ccsdk.sli.adaptors.aai.path.tenant.query=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name} + +# vservers +org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/ +org.onap.ccsdk.sli.adaptors.aai.path.vserver=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id} + +# vpls-pe +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pes=/aai/v11/network/vpls-pes/ +org.onap.ccsdk.sli.adaptors.aai.path.vpls.pe =/aai/v11/network/vpls-pes/vpls-pe/ + +# ctag-pool +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pools=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools +org.onap.ccsdk.sli.adaptors.aai.path.ctag.pool=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name} + +# +#-------------- 1510 ---------------------- +# + +# pservers +org.onap.ccsdk.sli.adaptors.aai.path.pservers=/aai/v11/cloud-infrastructure/pservers +org.onap.ccsdk.sli.adaptors.aai.path.pserver=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname} + +# generic-vnf +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v11/network/generic-vnfs +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id} + +# dvs-switch +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitches=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches +org.onap.ccsdk.sli.adaptors.aai.path.dvsswitch=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name} + +# L3 Networks +org.onap.ccsdk.sli.adaptors.aai.path.l3networks=/aai/v11/network/l3-networks +org.onap.ccsdk.sli.adaptors.aai.path.l3network=/aai/v11/network/l3-networks/l3-network/{network-id} +org.onap.ccsdk.sli.adaptors.aai.path.l3network.query.name=/aai/v11/network/l3-networks/l3-network?network-name={network-name} + +# P-Interfaces +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces +org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} + +# Physical Link +org.onap.ccsdk.sli.adaptors.aai.path.physical.links=/aai/v11/network/physical-links +org.onap.ccsdk.sli.adaptors.aai.path.physical.link=/aai/v11/network/physical-links/physical-link/{link-name} + +# VPN Bindings +org.onap.ccsdk.sli.adaptors.aai.path.vpn.bindings=/aai/v11/network/vpn-bindings/ +org.onap.ccsdk.sli.adaptors.aai.path.vpn.binding=/aai/v11/network/vpn-bindings/vpn-binding/{vpn-id} + +# VNF IMAGES +org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v11/service-design-and-creation/vnf-images +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v11/service-design-and-creation/vnf-images/vnf-image/{att-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v11/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} + +# UBB Notify +org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v11/actions/notify +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.{{.Values.nsPrefix}}:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://aai-service.{{.Values.nsPrefix}}:8443/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information + +# Service +org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id} +org.onap.ccsdk.sli.adaptors.aai.path.services=/aai/v11/service-design-and-creation/services + + +# +#-------------- 1604 ---------------------- +# + +# VNFC +org.onap.ccsdk.sli.adaptors.aai.path.vnfc=/aai/v11/network/vnfcs/vnfc/{vnfc-name} + +# class-of-service +org.onap.ccsdk.sli.adaptors.aai.path.class.of.service=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}/classes-of-service/class-of-service/{cos-id} + +# site-pair +org.onap.ccsdk.sli.adaptors.aai.path.site.pair=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id} + +# routing-instance +org.onap.ccsdk.sli.adaptors.aai.path.routing.instance=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id} + +# site-pair-set +org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id} + +# license key resource +org.onap.ccsdk.sli.adaptors.aai.path.license.acquire=/aai/v11/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid} +org.onap.ccsdk.sli.adaptors.aai.path.license=/aai/v11/license-management/license-key-resources/license-key-resource/{att-uuid} + +# logical-link +org.onap.ccsdk.sli.adaptors.aai.path.logical.link =/aai/v11/network/logical-links/logical-link/{link-name} + +# virtual-data-center +org.onap.ccsdk.sli.adaptors.aai.path.virtual.data.center=/aai/v11/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id} + +# wan-connector +org.onap.ccsdk.sli.adaptors.aai.path.wan.connector=/aai/v11/business/connectors/connector/{resource-instance-id} + +# l-interface +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# l-interface pnf +org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# subinterface +org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name} +org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name} + +# vlans +org.onap.ccsdk.sli.adaptors.aai.path.vlan=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.vlan=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface} + +# l3-interface-ipv4-address-list +org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# l3-interface-ipv6-address-list +org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} +org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} + +# ipsec-configuration +org.onap.ccsdk.sli.adaptors.aai.path.ipsec.configuration=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id} + +# vig server +org.onap.ccsdk.sli.adaptors.aai.path.vig.server=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type} + +# l3-network +org.onap.ccsdk.sli.adaptors.aai.path.l3.network=/aai/v11/network/l3-networks/l3-network/{network-id} + +# subnet +org.onap.ccsdk.sli.adaptors.aai.path.subnet=/aai/v11/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id} + +# multicast-configuration +org.onap.ccsdk.sli.adaptors.aai.path.multicast.configuration=/aai/v11/network/multicast-configurations/multicast-configuration/{multicast-configuration-id} + +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.vlan.ipv4.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address} + +# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv6.address.list +org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address} + +# volume.group +org.onap.ccsdk.sli.adaptors.aai.path.volume.group=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id} + +#cloud region +org.onap.ccsdk.sli.adaptors.aai.path.cloud.region=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id} + +# vf-module +org.onap.ccsdk.sli.adaptors.aai.path.vf.module=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id} + +# l-interface through generic-vnf +org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf.linterface=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name} + +# network-policy +org.onap.ccsdk.sli.adaptors.aai.path.network.policy=/aai/v11/network/network-policies/network-policy/{network-policy-id} + +# pnf +org.onap.ccsdk.sli.adaptors.aai.path.pnf=/aai/v11/network/pnfs/pnf/{pnf-name} + +# +# Formatting +# +org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s +org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type +org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id +org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type diff --git a/kubernetes/appc/resources/config/conf/appc.properties b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/appc.properties index 3ac5aaee0b..de577c43cb 100644 --- a/kubernetes/appc/resources/config/conf/appc.properties +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/appc.properties @@ -22,7 +22,7 @@ ### ### ### Properties for demo ### ### ### -appc.demo.poolMembers=dmaap.onap-message-router:3904 +appc.demo.poolMembers=dmaap.{{.Values.nsPrefix}}:3904 appc.demo.topic.read=APPC-CL appc.demo.topic.write=APPC-CL appc.demo.client.name=appcDemoEventListener @@ -33,7 +33,7 @@ appc.demo.threads.poolsize.max=2 appc.demo.provider.user=admin appc.demo.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U appc.demo.provider.url=http://localhost:8181/restconf/operations/appc-provider -appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@sdnhost.onap-appc:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ +appc.provider.vfodl.url=http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@appc-sdnhost.{{.Values.nsPrefix}}:8282/restconf/config/network-topology:network-topology/topology/topology-netconf/node/NODE_NAME/yang-ext:mount/sample-plugin:sample-plugin/pg-streams/ # The properties right below are needed to properly call the Master DG to serve demo purposes appc.service.logic.module.name=APPC @@ -41,11 +41,11 @@ appc.topology.dg.method=topology-operation-all appc.topology.dg.version=2.0.0 # TEMP - Properties that might be needed to make the AAI-APPC connection -org.openecomp.appc.db.url.appcctl=jdbc:mysql://dbhost:3306/appcctl +org.openecomp.appc.db.url.appcctl=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/appcctl org.openecomp.appc.db.user.appcctl=appcctl org.openecomp.appc.db.pass.appcctl=appcctl -org.openecomp.appc.db.url.sdnctl=jdbc:mysql://dbhost:3306/sdnctl +org.openecomp.appc.db.url.sdnctl=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl org.openecomp.appc.db.user.sdnctl=sdnctl org.openecomp.appc.db.pass.sdnctl=gamma @@ -74,11 +74,11 @@ provider1.tenant1.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U # Property below is valid in appc-command-executor-core, appc-license-manager-core, appc-lifecycle-management-core, # appc-request-handler-core, appc-workflow-management-core (all from the appc-dispatcher package). -dmaap.poolMembers=dmaap.onap-message-router:3904 +dmaap.poolMembers=dmaap.{{.Values.nsPrefix}}:3904 # appc-event-listener-bundle properties (only defined in src/test of default.properties) -appc.LCM.poolMembers=dmaap.onap-message-router:3904 +appc.LCM.poolMembers=dmaap.{{.Values.nsPrefix}}:3904 appc.LCM.topic.read=APPC-LCM-READ appc.LCM.topic.write=APPC-LCM-WRITE appc.LCM.client.name=APPC-EVENT-LISTENER-TEST @@ -87,8 +87,8 @@ appc.LCM.provider.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U appc.LCM.provider.url=http://localhost:8181/restconf/operations/appc-provider-lcm # properties from appc-netconf-adapter-bundle, appc-dg-common, appc-dmaap-adapter-bundle -poolMembers=dmaap.onap-message-router:3904 -event.pool.members=dmaap.onap-message-router:3904 +poolMembers=dmaap.{{.Values.nsPrefix}}:3904 +event.pool.members=dmaap.{{.Values.nsPrefix}}:3904 restconf.user=admin restconf.pass=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U @@ -106,7 +106,7 @@ test.url=http://api.appc.local/vm/9999999/test/99999999-9999-9999-9999-999999999 org.openecomp.appc.iaas.skiphypervisorcheck=true # Properties from default.properties in the src/test and src/main paths of appc-asdc-listener-bundle -appc.sdc.host=sdc-be.onap-sdc:8443 +appc.sdc.host=sdc-be.{{.Values.nsPrefix}}:8443 appc.sdc.env=APPC-ASDC-ENV appc.sdc.user=test appc.sdc.pass=test @@ -118,12 +118,12 @@ appc.sdc.provider.url=http://localhost:8181/restconf/operations/AsdcMessage:conf DCAE.dmaap.event.topic.write=EventSenderTest DCAE.dmaap.appc.username=test DCAE.dmaap.appc.password=test -DCAE.dmaap.event.pool.members=dmaap.onap-message-router:3904 +DCAE.dmaap.event.pool.members=dmaap.{{.Values.nsPrefix}}:3904 #OAM Listener appc.OAM.disabled=true appc.OAM.provider.url=http://localhost:8181/restconf/operations/appc-oam -appc.OAM.poolMembers=dmaap.onap-message-router:3904 +appc.OAM.poolMembers=dmaap.{{.Values.nsPrefix}}:3904 appc.OAM.service=ueb appc.OAM.topic.read=testOAM appc.OAM.topic.write=testOAM diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/dblib.properties b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/dblib.properties new file mode 100644 index 0000000000..888ee9f0d9 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/dblib.properties @@ -0,0 +1,37 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +# dblib.properrties +org.onap.ccsdk.sli.dbtype=jdbc + +org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl +org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma +org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.jdbc.request.timeout=100 +org.onap.ccsdk.sli.jdbc.limit.init=10 +org.onap.ccsdk.sli.jdbc.limit.min=10 +org.onap.ccsdk.sli.jdbc.limit.max=20 +org.onap.dblib.connection.recovery=false + diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/svclogic.properties b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/svclogic.properties new file mode 100644 index 0000000000..ea38616810 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/data/properties/svclogic.properties @@ -0,0 +1,29 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +### + +org.onap.ccsdk.sli.dbtype = dblib +#Note : the next 4 fields are only used if org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma + +org.xml.sax.driver=org.apache.xerces.parsers.SAXParser + diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh new file mode 100755 index 0000000000..5409d9e552 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh @@ -0,0 +1,29 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +MYSQL_USER=${MYSQL_USER:-sdnctl} +MYSQL_PWD=${MYSQL_PWD:-gamma} +MYSQL_DB=${MYSQL_DB:-sdnctl} +MYSQL_HOST=${MYSQL_HOST:-appc-dbhost.{{.Values.nsPrefix}}} + +mysql --user=${MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB} <<-END +SELECT module, rpc, version, mode from SVC_LOGIC where active='Y'; +END diff --git a/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/config/svclogic.properties b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/config/svclogic.properties new file mode 100644 index 0000000000..f161b2a4b0 --- /dev/null +++ b/kubernetes/appc/resources/config/appc/opt/openecomp/appc/svclogic/config/svclogic.properties @@ -0,0 +1,27 @@ +### +# ============LICENSE_START======================================================= +# APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# 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. +# ============LICENSE_END========================================================= +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +org.onap.ccsdk.sli.dbtype = jdbc +org.onap.ccsdk.sli.jdbc.url = jdbc:mysql://appc-sdnctldb01:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database = sdnctl +org.onap.ccsdk.sli.jdbc.user = sdnctl +org.onap.ccsdk.sli.jdbc.password = gamma + diff --git a/kubernetes/appc/resources/config/dgbuilder/svclogic.properties b/kubernetes/appc/resources/config/dgbuilder/svclogic.properties new file mode 100644 index 0000000000..8b0723b72b --- /dev/null +++ b/kubernetes/appc/resources/config/dgbuilder/svclogic.properties @@ -0,0 +1,5 @@ +org.onap.ccsdk.sli.dbtype=jdbc +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma diff --git a/kubernetes/appc/resources/config/log/filebeat/log4j/filebeat.yml b/kubernetes/appc/resources/config/log/filebeat/log4j/filebeat.yml index 79c9a08a79..2cd63e1d98 100644 --- a/kubernetes/appc/resources/config/log/filebeat/log4j/filebeat.yml +++ b/kubernetes/appc/resources/config/log/filebeat/log4j/filebeat.yml @@ -29,7 +29,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/appc/resources/scripts/dgbuilder/createReleaseDir.sh b/kubernetes/appc/resources/scripts/dgbuilder/createReleaseDir.sh new file mode 100755 index 0000000000..d63687a644 --- /dev/null +++ b/kubernetes/appc/resources/scripts/dgbuilder/createReleaseDir.sh @@ -0,0 +1,129 @@ +#!/bin/bash +export PATH=$PATH:. +appDir=$(pwd) +if [ "$#" != 3 -a "$#" != 4 ] +then + echo "Usage $0 releaseDir loginId emailAddress [gitLocalRepository]" + echo "Note: Specify the gitLocalRepository path if you would want to be able to import flows from your local git repository" + exit +fi +if [ ! -e "releases" ] +then + mkdir releases +fi +releaseDir="$1" +name="Release $releaseDir" +loginId="$2" +emailid="$3" +dbHost="appc-dbhost.{{.Values.nsPrefix}}" +dbPort="3306" +dbName="sdnctl" +dbUser="sdnctl" +dbPassword="gamma" +gitLocalRepository="$4" + +lastPort=$(find "releases/" -name "customSettings.js" |xargs grep uiPort|cut -d: -f2|sed -e s/,//|sort|tail -1) +echo $lastPort|grep uiPort >/dev/null 2>&1 +if [ "$?" == "0" ] +then +lastPort=$(find "releases/" -name "customSettings.js" |xargs grep uiPort|cut -d: -f3|sed -e s/,//|sort|tail -1) +fi +#echo $lastPort +if [ "${lastPort}" == "" ] +then + lastPort="3099" +fi +let nextPort=$(expr $lastPort+1) +#echo $nextPort +if [ ! -e "releases/$releaseDir" ] +then +mkdir releases/$releaseDir +cd releases/$releaseDir +mkdir flows +mkdir flows/shared +mkdir flows/shared/backups +mkdir html +mkdir xml +mkdir lib +mkdir lib/flows +mkdir logs +mkdir conf +mkdir codecloud +customSettingsFile="customSettings.js" +if [ ! -e "./$customSettingsFile" ] +then + echo "module.exports = {" >$customSettingsFile + echo " 'name' : '$name'," >>$customSettingsFile + echo " 'emailAddress' :'$emailid'," >>$customSettingsFile + echo " 'uiPort' :$nextPort," >>$customSettingsFile + echo " 'mqttReconnectTime': 15000," >>$customSettingsFile + echo " 'serialReconnectTime' : 15000," >>$customSettingsFile + echo " 'debugMaxLength': 1000," >>$customSettingsFile + echo " 'htmlPath': 'releases/$releaseDir/html/'," >>$customSettingsFile + echo " 'xmlPath': 'releases/$releaseDir/xml/'," >>$customSettingsFile + echo " 'flowFile' : 'releases/$releaseDir/flows/flows.json'," >>$customSettingsFile + echo " 'sharedDir': 'releases/$releaseDir/flows/shared'," >>$customSettingsFile + echo " 'userDir' : 'releases/$releaseDir'," >>$customSettingsFile + echo " 'httpAuth': {user:'$loginId',pass:'cc03e747a6afbbcbf8be7668acfebee5'}," >>$customSettingsFile + echo " 'dbHost': '$dbHost'," >>$customSettingsFile + echo " 'dbPort': '$dbPort'," >>$customSettingsFile + echo " 'dbName': '$dbName'," >>$customSettingsFile + echo " 'dbUser': '$dbUser'," >>$customSettingsFile + echo " 'dbPassword': '$dbPassword'," >>$customSettingsFile + echo " 'gitLocalRepository': '$gitLocalRepository'" >>$customSettingsFile + echo " }" >>$customSettingsFile +fi + #echo "Created custom settings file $customSettingsFile" + echo "Done ....." +else + echo "ERROR:customSettings file $customSettingsFile already exists for $releaseDir" + exit +fi +#echo "Content of custom settings file" +#echo "============================================================================" +# cat $customSettingsFile +#echo "============================================================================" +svclogicPropFile="./conf/svclogic.properties" +if [ ! -d "${appDir}/yangFiles" ] +then + mkdir -p "${appDir}/yangFiles" +fi +if [ ! -d "${appDir}/generatedJS" ] +then + mkdir -p "${appDir}/generatedJS" +fi + +if [ ! -e "./$svclogicPropFile" ] +then + echo "org.onap.ccsdk.sli.dbtype=jdbc" >$svclogicPropFile + echo "org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://appc-dbhost.{{.Values.nsPrefix}}:3306/sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.jdbc.database=sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.jdbc.user=sdnctl" >>$svclogicPropFile + echo "org.onap.ccsdk.sli.jdbc.password=gamma" >>$svclogicPropFile +fi +if [ ! -e "${appDir}/flowShareUsers.js" ] +then + echo "module.exports = {\"flowShareUsers\":" >${appDir}/flowShareUsers.js + echo " [" >>${appDir}/flowShareUsers.js + echo " ]" >>${appDir}/flowShareUsers.js + echo "}" >>${appDir}/flowShareUsers.js +fi +grep "$releaseDir" ${appDir}/flowShareUsers.js >/dev/null 2>&1 +if [ "$?" != "0" ] +then + num_of_lines=$(cat ${appDir}/flowShareUsers.js|wc -l) + if [ $num_of_lines -gt 4 ] + then + content=$(head -n -2 ${appDir}/flowShareUsers.js) + echo "${content}," > ${appDir}/flowShareUsers.js + else + content=$(head -n -2 ${appDir}/flowShareUsers.js) + echo "$content" > ${appDir}/flowShareUsers.js + fi + echo " {" >> ${appDir}/flowShareUsers.js + echo " \"name\" : \"$name\"," >> ${appDir}/flowShareUsers.js + echo " \"rootDir\" : \"$releaseDir\"" >> ${appDir}/flowShareUsers.js + echo " }" >> ${appDir}/flowShareUsers.js + echo " ]" >> ${appDir}/flowShareUsers.js + echo "}" >> ${appDir}/flowShareUsers.js +fi diff --git a/kubernetes/appc/resources/scripts/dgbuilder/customSettings.js b/kubernetes/appc/resources/scripts/dgbuilder/customSettings.js new file mode 100644 index 0000000000..40a624d44d --- /dev/null +++ b/kubernetes/appc/resources/scripts/dgbuilder/customSettings.js @@ -0,0 +1,38 @@ +module.exports={ + "name": "Release sdnc1.0", + "emailAddress": "dguser@onap.org", + "uiPort": 3100, + "mqttReconnectTime": 15000, + "serialReconnectTime": 15000, + "debugMaxLength": 1000, + "htmlPath": "releases/sdnc1.0/html/", + "xmlPath": "releases/sdnc1.0/xml/", + "flowFile": "releases/sdnc1.0/flows/flows.json", + "sharedDir": "releases/sdnc1.0/flows/shared", + "userDir": "releases/sdnc1.0", + "httpAuth": { + "user": "dguser", + "pass": "cc03e747a6afbbcbf8be7668acfebee5" + }, + "dbHost": "appc-dbhost.{{.Values.nsPrefix}}", + "dbPort": "3306", + "dbName": "sdnctl", + "dbUser": "sdnctl", + "dbPassword": "gamma", + "gitLocalRepository": "", + "httpRoot": "/", + "disableEditor": false, + "httpAdminRoot": "/", + "httpAdminAuth": { + "user": "dguser", + "pass": "cc03e747a6afbbcbf8be7668acfebee5" + }, + "httpNodeRoot": "/", + "httpNodeAuth": { + "user": "dguser", + "pass": "cc03e747a6afbbcbf8be7668acfebee5" + }, + "uiHost": "0.0.0.0", + "version": "0.9.1", + "performGitPull": "N" +} diff --git a/kubernetes/appc/templates/all-services.yaml b/kubernetes/appc/templates/all-services.yaml index 8f7ed19ae1..b6d40d75c0 100644 --- a/kubernetes/appc/templates/all-services.yaml +++ b/kubernetes/appc/templates/all-services.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Service metadata: - name: dbhost - namespace: "{{ .Values.nsPrefix }}-appc" + name: appc-dbhost + namespace: "{{ .Values.nsPrefix }}" labels: app: appc-dbhost spec: @@ -17,8 +17,8 @@ spec: apiVersion: v1 kind: Service metadata: - name: sdnctldb01 - namespace: "{{ .Values.nsPrefix }}-appc" + name: appc-sdnctldb01 + namespace: "{{ .Values.nsPrefix }}" labels: app: appc-dbhost spec: @@ -31,8 +31,8 @@ spec: apiVersion: v1 kind: Service metadata: - name: sdnctldb02 - namespace: "{{ .Values.nsPrefix }}-appc" + name: appc-sdnctldb02 + namespace: "{{ .Values.nsPrefix }}" labels: app: appc-dbhost spec: @@ -47,8 +47,8 @@ spec: apiVersion: v1 kind: Service metadata: - name: sdnhost - namespace: "{{ .Values.nsPrefix }}-appc" + name: appc-sdnhost + namespace: "{{ .Values.nsPrefix }}" labels: app: appc spec: @@ -70,7 +70,7 @@ apiVersion: v1 kind: Service metadata: name: dgbuilder - namespace: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" labels: app: appc-dgbuilder spec: @@ -82,4 +82,4 @@ spec: type: NodePort selector: app: appc-dgbuilder -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/appc/templates/appc-conf-configmap.yaml b/kubernetes/appc/templates/appc-conf-configmap.yaml deleted file mode 100644 index 0e418d1e7a..0000000000 --- a/kubernetes/appc/templates/appc-conf-configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -#{{ if not .Values.disableAppcAppc }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: appc-conf-configmap - namespace: {{ .Values.nsPrefix }}-appc -data: -{{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }} -#{{ end }} diff --git a/kubernetes/appc/templates/appc-configmap.yaml b/kubernetes/appc/templates/appc-configmap.yaml new file mode 100644 index 0000000000..8d00842183 --- /dev/null +++ b/kubernetes/appc/templates/appc-configmap.yaml @@ -0,0 +1,73 @@ +#{{ if not .Values.disableAppcAppc }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-openecomp-appc-data-properties-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/data/properties/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-openecomp-appc-svclogic-config-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/svclogic/config/svclogic.properties").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-openecomp-appc-svclogic-bin-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-openecomp-appc-bin-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/openecomp/appc/bin/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-onap-sdnc-data-properties-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/data/properties/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-onap-sdnc-svclogic-config-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/config/svclogic.properties").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-onap-sdnc-svclogic-bin-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-onap-sdnc-bin-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/appc/opt/onap/sdnc/bin/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-scripts-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/scripts/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml index 35e947093c..78bef5e22d 100644 --- a/kubernetes/appc/templates/appc-deployment.yaml +++ b/kubernetes/appc/templates/appc-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc - namespace: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.appcReplicas }} selector: @@ -42,6 +42,8 @@ spec: value: /opt/openecomp/appc/data/properties - name: DMAAP_TOPIC_ENV value: SUCCESS + - name: MYSQL_HOST + value: appc-dbhost image: {{ .Values.image.appc }} imagePullPolicy: {{ .Values.pullPolicy }} name: appc-controller-container @@ -49,15 +51,51 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - mountPath: /opt/openecomp/appc/data/properties/dblib.properties + name: appc-openecomp-appc-data-properties + subPath: dblib.properties + - mountPath: /opt/openecomp/appc/data/properties/svclogic.properties + name: appc-openecomp-appc-data-properties + subPath: svclogic.properties - mountPath: /opt/openecomp/appc/data/properties/appc.properties - name: appc-conf + name: appc-openecomp-appc-data-properties subPath: appc.properties - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties - name: appc-conf + name: appc-openecomp-appc-data-properties subPath: aaiclient.properties + - mountPath: /opt/openecomp/appc/svclogic/config/svclogic.properties + name: appc-openecomp-appc-svclogic-config + subPath: svclogic.properties + - mountPath: /opt/openecomp/appc/svclogic/bin/showActiveGraphs.sh + name: appc-openecomp-appc-svclogic-bin + subPath: showActiveGraphs.sh + - mountPath: /opt/openecomp/appc/bin/startODL.sh + name: appc-openecomp-appc-bin + subPath: startODL.sh + - mountPath: /opt/openecomp/appc/bin/installAppcDb.sh + name: appc-openecomp-appc-bin + subPath: installAppcDb.sh + - mountPath: /opt/onap/sdnc/data/properties/dblib.properties + name: appc-onap-sdnc-data-properties + subPath: dblib.properties + - mountPath: /opt/onap/sdnc/data/properties/svclogic.properties + name: appc-onap-sdnc-data-properties + subPath: svclogic.properties - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties - name: appc-conf + name: appc-onap-sdnc-data-properties subPath: aaiclient.properties + - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties + name: appc-onap-sdnc-svclogic-config + subPath: svclogic.properties + - mountPath: /opt/onap/sdnc/svclogic/bin/showActiveGraphs.sh + name: appc-onap-sdnc-svclogic-bin + subPath: showActiveGraphs.sh + - mountPath: /opt/onap/sdnc/bin/startODL.sh + name: appc-onap-sdnc-bin + subPath: startODL.sh + - mountPath: /opt/onap/sdnc/bin/installSdncDb.sh + name: appc-onap-sdnc-bin + subPath: installSdncDb.sh - mountPath: /var/log/onap name: appc-logs - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg @@ -96,9 +134,34 @@ spec: emptyDir: {} - name: appc-data-filebeat emptyDir: {} - - name: appc-conf + - name: appc-openecomp-appc-data-properties configMap: - name: appc-conf-configmap + name: appc-openecomp-appc-data-properties-configmap + - name: appc-openecomp-appc-svclogic-config + configMap: + name: appc-openecomp-appc-svclogic-config-configmap + - name: appc-openecomp-appc-svclogic-bin + configMap: + name: appc-openecomp-appc-svclogic-bin-configmap + defaultMode: 0755 + - name: appc-openecomp-appc-bin + configMap: + name: appc-openecomp-appc-bin-configmap + defaultMode: 0755 + - name: appc-onap-sdnc-data-properties + configMap: + name: appc-onap-sdnc-data-properties-configmap + - name: appc-onap-sdnc-svclogic-config + configMap: + name: appc-onap-sdnc-svclogic-config-configmap + - name: appc-onap-sdnc-svclogic-bin + configMap: + name: appc-onap-sdnc-svclogic-bin-configmap + defaultMode: 0755 + - name: appc-onap-sdnc-bin + configMap: + name: appc-onap-sdnc-bin-configmap + defaultMode: 0755 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml b/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml new file mode 100644 index 0000000000..f846c199a1 --- /dev/null +++ b/kubernetes/appc/templates/appc-dgbuilder-configmap.yaml @@ -0,0 +1,17 @@ +#{{ if not .Values.disableAppcAppc }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-dgbuilder-conf-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/dgbuilder/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: appc-dgbuilder-scripts-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/scripts/dgbuilder/*").AsConfig . | indent 2 }} +#{{ end }} diff --git a/kubernetes/appc/templates/appc-log-configmap.yaml b/kubernetes/appc/templates/appc-log-configmap.yaml index 323f852779..9e102e1b88 100644 --- a/kubernetes/appc/templates/appc-log-configmap.yaml +++ b/kubernetes/appc/templates/appc-log-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: appc-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-appc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: appc-logging-cfg-configmap - namespace: {{ .Values.nsPrefix }}-appc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml index bb2716cddb..ff0f89af49 100644 --- a/kubernetes/appc/templates/appc-pv-pvc.yaml +++ b/kubernetes/appc/templates/appc-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-appc-db" - namespace: "{{ .Values.nsPrefix }}-appc" + name: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-appc-db" + name: "{{ .Values.nsPrefix }}-appc" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: appc-db - namespace: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-appc-db" + name: "{{ .Values.nsPrefix }}-appc" #{{ end }} diff --git a/kubernetes/appc/templates/db-deployment.yaml b/kubernetes/appc/templates/db-deployment.yaml index 0b29393cb5..41d9d5b520 100644 --- a/kubernetes/appc/templates/db-deployment.yaml +++ b/kubernetes/appc/templates/db-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc-dbhost - namespace: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dbReplicas }} selector: diff --git a/kubernetes/appc/templates/dgbuilder-deployment.yaml b/kubernetes/appc/templates/dgbuilder-deployment.yaml index 3bbc6715aa..fe9a198aef 100644 --- a/kubernetes/appc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/appc/templates/dgbuilder-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: appc-dgbuilder - namespace: "{{ .Values.nsPrefix }}-appc" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dgbuilderReplicas }} selector: @@ -56,10 +56,29 @@ spec: - name: localtime mountPath: /etc/localtime readOnly: true + - name: dgbuilder-conf + mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/conf/svclogic.properties + subPath: svclogic.properties + - name: dgbuilder-conf + mountPath: /opt/onap/sdnc/dgbuilder/svclogic/svclogic.properties + subPath: svclogic.properties + - name: dgbuilder-scripts + mountPath: /opt/onap/sdnc/dgbuilder/createReleaseDir.sh + subPath: createReleaseDir.sh + - name: dgbuilder-scripts + mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/customSettings.js + subPath: customSettings.js volumes: - name: localtime hostPath: path: /etc/localtime + - name: dgbuilder-conf + configMap: + name: appc-dgbuilder-conf-configmap + - name: dgbuilder-scripts + configMap: + name: appc-dgbuilder-scripts-configmap + defaultMode: 0755 restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/clamp/templates/all-services.yaml b/kubernetes/clamp/templates/all-services.yaml index 163ed58aa9..b3b9c65f46 100644 --- a/kubernetes/clamp/templates/all-services.yaml +++ b/kubernetes/clamp/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: clamp-mariadb - namespace: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" labels: app: clamp-mariadb spec: @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: clamp - namespace: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: clamp diff --git a/kubernetes/clamp/templates/clamp-deployment.yaml b/kubernetes/clamp/templates/clamp-deployment.yaml index de9adaca81..f5dbdd1cf9 100644 --- a/kubernetes/clamp/templates/clamp-deployment.yaml +++ b/kubernetes/clamp/templates/clamp-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: clamp name: clamp - namespace: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -35,8 +35,8 @@ spec: - env: - name: SPRING_APPLICATION_JSON value: '{ - "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647", - "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}-clamp:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647" + "spring.datasource.camunda.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}:3306/camundabpm?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647", + "spring.datasource.cldsdb.url": "jdbc:mariadb:sequential://clamp-mariadb.{{ .Values.nsPrefix }}:3306/cldsdb4?verifyServerCertificate=false&useSSL=false&requireSSL=false&autoReconnect=true&retriesAllDown=2147483647&failoverLoopRetries=2147483647" }' image: {{ .Values.image.clampImage }}:{{ .Values.image.clampVersion }} imagePullPolicy: {{ .Values.pullPolicy }} diff --git a/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml b/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml index 1fdc155104..9a5fd8f284 100644 --- a/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml +++ b/kubernetes/clamp/templates/clamp-mariadb-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: clamp-entrypoint-initdb-configmap - namespace: {{ .Values.nsPrefix }}-clamp + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: clamp-entrypoint-drop-configmap - namespace: {{ .Values.nsPrefix }}-clamp + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/drop/*").AsConfig . | indent 2 }} --- @@ -19,7 +19,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: clamp-entrypoint-bulkload-configmap - namespace: {{ .Values.nsPrefix }}-clamp + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/bulkload/*").AsConfig . | indent 2 }} --- @@ -27,7 +27,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: clamp-mariadb-conf-configmap - namespace: {{ .Values.nsPrefix }}-clamp + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/conf.d/conf1/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml index 0566e504eb..762aa807e2 100644 --- a/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml +++ b/kubernetes/clamp/templates/clamp-mariadb-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: clamp-mariadb - namespace: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 1 selector: diff --git a/kubernetes/clamp/templates/clamp-pv-pvc.yaml b/kubernetes/clamp/templates/clamp-pv-pvc.yaml index f15ff33ae9..c542de6026 100644 --- a/kubernetes/clamp/templates/clamp-pv-pvc.yaml +++ b/kubernetes/clamp/templates/clamp-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-clamp-db" - namespace: "{{ .Values.nsPrefix }}-clamp" + name: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-clamp-db" + name: "{{ .Values.nsPrefix }}-clamp" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: clamp-db - namespace: "{{ .Values.nsPrefix }}-clamp" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-clamp-db" + name: "{{ .Values.nsPrefix }}-clamp" #{{ end }} diff --git a/kubernetes/cli/templates/all-service.yaml b/kubernetes/cli/templates/all-service.yaml index 24e19792e1..e928c67e6e 100644 --- a/kubernetes/cli/templates/all-service.yaml +++ b/kubernetes/cli/templates/all-service.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: cli - namespace: "{{ .Values.nsPrefix }}-cli" + namespace: "{{ .Values.nsPrefix }}" labels: app: cli spec: diff --git a/kubernetes/cli/templates/cli-deployment.yaml b/kubernetes/cli/templates/cli-deployment.yaml index 128c28a7f1..d4812fb783 100644 --- a/kubernetes/cli/templates/cli-deployment.yaml +++ b/kubernetes/cli/templates/cli-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: cli name: cli - namespace: "{{ .Values.nsPrefix }}-cli" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/config/docker/init/config-init.sh b/kubernetes/config/docker/init/config-init.sh index a0202f8e4e..0e5fae082a 100755 --- a/kubernetes/config/docker/init/config-init.sh +++ b/kubernetes/config/docker/init/config-init.sh @@ -93,8 +93,8 @@ echo "Substituting configuration parameters" # replace the default 'onap' namespace qualification of K8s hostnames within the config files SED_NS_PATHS="/config-init/$NAMESPACE/" SED_NS_STRINGS=( - "s/\.onap-/\.${NAMESPACE}-/g" - "s/kubectl -n onap/kubectl -n ${NAMESPACE}/g" + "s/\.namespace-placeholder/\.${NAMESPACE}/g" + "s/kubectl -n namespace-placeholder/kubectl -n ${NAMESPACE}/g" ) SED_NS_STRING=$(concat_array "${SED_NS_STRINGS[@]}") find $SED_NS_PATHS -type f -exec sed -i -e "${SED_NS_STRING}" {} \; diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json index 07828431fc..1d23b88e0f 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json @@ -5,7 +5,7 @@ { "id": "hbase-aai", "name": "HBase Health Check", - "http": "http://hbase.onap-aai:8080/status/cluster", + "http": "http://hbase.namespace-placeholder:8080/status/cluster", "method": "GET", "header": { "Cache-Control": ["no-cache"], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json index b1877c7424..bf8830f0df 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json @@ -5,7 +5,7 @@ { "id": "elasticsearch", "name": "Search Data Service Document Store", - "http": "http://elasticsearch.onap-aai:9200/_cat/indices?v", + "http": "http://aai-elasticsearch.namespace-placeholder:9200/_cat/indices?v", "interval": "15s", "timeout": "1s" }, @@ -18,7 +18,7 @@ { "id": "search-data-service-availability", "name": "Search Data Service Availability", - "script": "curl -k --cert /consul/config/certs/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.onap-aai:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'", + "script": "curl -k --cert /consul/config/certs/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.namespace-placeholder:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'", "interval": "15s" }, { diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json index 35f9371e8d..99d964e7d8 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json @@ -5,7 +5,7 @@ { "id": "aai-service", "name": "Core A&AI", - "http": "https://aai-service.onap-aai:8443/aai/util/echo", + "http": "https://aai-service.namespace-placeholder:8443/aai/util/echo", "header": { "Authorization": ["Basic QUFJOkFBSQ=="], "X-TransactionId": ["ConsulHealthCheck"], @@ -18,7 +18,7 @@ { "id": "aai-resources", "name": "Resources Microservice", - "http": "https://aai-resources.onap-aai:8447/aai/util/echo", + "http": "https://aai-resources.namespace-placeholder:8447/aai/util/echo", "header": { "Authorization": ["Basic QUFJOkFBSQ=="], "X-TransactionId": ["ConsulHealthCheck"], @@ -31,7 +31,7 @@ { "id": "aai-traversal", "name": "Traversal Microservice", - "http": "https://aai-traversal.onap-aai:8446/aai/util/echo", + "http": "https://aai-traversal.namespace-placeholder:8446/aai/util/echo", "header": { "Authorization": ["Basic QUFJOkFBSQ=="], "X-TransactionId": ["ConsulHealthCheck"], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json index ec5539060f..2763505f59 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json @@ -5,7 +5,7 @@ { "id": "appc-dgbuilder", "name": "APPC-Dgbuilder Server Health Check", - "http": "http://dgbuilder.onap-appc:3000/", + "http": "http://dgbuilder.namespace-placeholder:3000/", "method": "HEAD", "header": { "Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json index 52ffdc0b6d..31f1b253f6 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json @@ -3,9 +3,9 @@ "name": "Health Check: APPC-SDN-CTL-DB-01", "checks": [ { - "id": "sdnctldb01.onap-appc", + "id": "appc-sdnctldb01.namespace-placeholder", "name": "APPC SDNCTLDB01 Health Check", - "tcp": "sdnctldb01.onap-appc:3306", + "tcp": "appc-sdnctldb01.namespace-placeholder:3306", "interval": "10s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json index d6ac666ff4..60bdd228da 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json @@ -3,9 +3,9 @@ "name": "Health Check: APPC-SDN-CTL-DB-02", "checks": [ { - "id": "sdnctldb02.onap-appc", + "id": "sdnctldb02.namespace-placeholder", "name": "APPC SDNCTLDB02 Health Check", - "tcp": "sdnctldb02.onap-appc:3306", + "tcp": "sdnctldb02.namespace-placeholder:3306", "interval": "10s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json index c96a35a22c..09b50077d7 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json @@ -5,7 +5,7 @@ { "id": "appc-sdnhost", "name": "APPC SDN Host Health Check", - "http": "http://sdnhost.onap-appc:8282/apidoc/explorer/index.html", + "http": "http://appc-sdnhost.namespace-placeholder:8282/apidoc/explorer/index.html", "method": "HEAD", "header": { "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json index 7785502018..3586f58932 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json @@ -5,7 +5,7 @@ { "id": "log-elasticsearch-server", "name": "Log Elastic Search Health Check", - "http": "http://elasticsearch.onap-log:9200/_cluster/health?pretty", + "http": "http://elasticsearch.namespace-placeholder:9200/_cluster/health?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -14,7 +14,7 @@ { "id": "log-elasticsearch-tcp", "name": "Log Elastic Search TCP Health Check", - "tcp": "elasticsearchtcp.onap-log:9300", + "tcp": "elasticsearchtcp.namespace-placeholder:9300", "interval": "15s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json index 794fb4b260..7fda31f8c0 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json @@ -5,7 +5,7 @@ { "id": "log-kibana-server", "name": "Log kibana Health Check", - "http": "http://kibana.onap-log:5601/status", + "http": "http://kibana.namespace-placeholder:5601/status", "method": "HEAD", "tls_skip_verify": true, "interval": "15s", diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json index 3c0f450356..e8e6236359 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json @@ -5,7 +5,7 @@ { "id": "log-logstash-internal-server-gi", "name": "Log Stash Health Check - General Information", - "http": "http://logstashinternal.onap-log:9600/?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -14,7 +14,7 @@ { "id": "log-logstash-internal-server-node-info", "name": "Log Stash Health Check - Node Information", - "http": "http://logstashinternal.onap-log:9600/_node/?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -23,7 +23,7 @@ { "id": "log-logstash-internal-server-os-info", "name": "Log Stash Health Check - OS Information", - "http": "http://logstashinternal.onap-log:9600/_node/os?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/os?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -32,7 +32,7 @@ { "id": "log-logstash-internal-server-jvm-info", "name": "Log Stash Health Check - JVM Information", - "http": "http://logstashinternal.onap-log:9600/_node/jvm?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/jvm?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -41,7 +41,7 @@ { "id": "log-logstash-internal-server-plugin-info", "name": "Log Stash Health Check - Plugin Information", - "http": "http://logstashinternal.onap-log:9600/_node/plugins?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/plugins?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -50,7 +50,7 @@ { "id": "log-logstash-internal-server-node-stat", "name": "Log Stash Health Check - Node Stats", - "http": "http://logstashinternal.onap-log:9600/_node/stats?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/stats?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -59,7 +59,7 @@ { "id": "log-logstash-internal-server-jvm-stat", "name": "Log Stash Health Check - JVM Stats", - "http": "http://logstashinternal.onap-log:9600/_node/stats/jvm?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/stats/jvm?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -68,7 +68,7 @@ { "id": "log-logstash-internal-server-process-stat", "name": "Log Stash Health Check - Process Stats", - "http": "http://logstashinternal.onap-log:9600/_node/stats/process?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/stats/process?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -77,7 +77,7 @@ { "id": "log-logstash-internal-server-os-stat", "name": "Log Stash Health Check - OS Stats", - "http": "http://logstashinternal.onap-log:9600/_node/stats/os?pretty", + "http": "http://logstashinternal.namespace-placeholder:9600/_node/stats/os?pretty", "method": "GET", "tls_skip_verify": true, "interval": "15s", @@ -86,7 +86,7 @@ { "id": "log-logstash-tcp", "name": "Log Stash File Beat TCP Health Check", - "tcp": "logstash.onap-log:5044", + "tcp": "logstash.namespace-placeholder:5044", "interval": "15s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json index bd01bc5d95..dddd9692b9 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json @@ -2,7 +2,7 @@ "service": { "name": "Health Check: Message Router - DMaaP", "check": { - "http": "http://dmaap.onap-message-router:3904/topics", + "http": "http://dmaap.namespace-placeholder:3904/topics", "interval": "30s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json index a5738b3277..02e7dc47f4 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json @@ -3,34 +3,34 @@ "name": "Health Check: MSB", "checks": [ { - "id": "msb-eag.onap-msb", + "id": "msb-eag.namespace-placeholder", "name": "MSB eag Health Check", - "http": "http://msb-eag.onap-msb:80/iui/microservices/default.html", + "http": "http://msb-eag.namespace-placeholder:80/iui/microservices/default.html", "method": "HEAD", "tls_skip_verify": true, "interval": "15s", "timeout": "1s" }, { - "id": "msb-iag.onap-msb", + "id": "msb-iag.namespace-placeholder", "name": "MSB iag Health Check", - "http": "http://msb-iag.onap-msb:80/iui/microservices/default.html", + "http": "http://msb-iag.namespace-placeholder:80/iui/microservices/default.html", "method": "HEAD", "tls_skip_verify": true, "interval": "15s", "timeout": "1s" }, { - "id": "msb-consul.onap-msb", + "id": "msb-consul.namespace-placeholder", "name": "MSB consul Health Check", - "tcp": "msb-consul.onap-msb:8500", + "tcp": "msb-consul.namespace-placeholder:8500", "interval": "15s", "timeout": "1s" }, { - "id": "msb-discovery.onap-msb", + "id": "msb-discovery.namespace-placeholder", "name": "MSB discovery Health Check", - "tcp": "msb-discovery.onap-msb:10081", + "tcp": "msb-discovery.namespace-placeholder:10081", "interval": "15s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json index 843afa32bc..760077c543 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json @@ -5,7 +5,7 @@ { "id": "framework", "name": "Framework Health Check", - "http": "http://framework.onap-multicloud:9001/api/multicloud/v0/swagger.json", + "http": "http://framework.namespace-placeholder:9001/api/multicloud/v0/swagger.json", "method": "HEAD", "header": { "Cache-Control": ["no-cache"], @@ -19,7 +19,7 @@ { "id": "multicloud-ocata", "name": "Multicloud Ocata Health Check", - "http": "http://multicloud-ocata.onap-multicloud:9006/api/multicloud-ocata/v0/swagger.json", + "http": "http://multicloud-ocata.namespace-placeholder:9006/api/multicloud-ocata/v0/swagger.json", "method": "HEAD", "header": { "Cache-Control": ["no-cache"], @@ -33,7 +33,7 @@ { "id": "multicloud-vio", "name": "Multicloud Vio Health Check", - "http": "http://multicloud-vio.onap-multicloud:9004/api/multicloud-vio/v0/swagger.json", + "http": "http://multicloud-vio.namespace-placeholder:9004/api/multicloud-vio/v0/swagger.json", "method": "HEAD", "header": { "Cache-Control": ["no-cache"], @@ -47,7 +47,7 @@ { "id": "multicloud-windriver", "name": "Multicloud Windriver Health Check", - "http": "http://multicloud-windriver.onap-multicloud:9005/api/multicloud-titanium_cloud/v0/swagger.json", + "http": "http://multicloud-windriver.namespace-placeholder:9005/api/multicloud-titanium_cloud/v0/swagger.json", "method": "HEAD", "header": { "Cache-Control": ["no-cache"], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh index 26e13913a0..fce0a63015 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh @@ -1,6 +1,6 @@ -if curl -s -X PUT http://elasticsearch.onap-aai:9200/searchhealth/stats/testwrite -d @/consul/config/scripts/aai-search-storage-write-doc.txt | grep '\"created\":true'; then - if curl -s -X DELETE http://elasticsearch.onap-aai:9200/searchhealth/stats/testwrite | grep '\"failed\":0'; then - if curl -s -X GET http://elasticsearch.onap-aai:9200/searchhealth/stats/testwrite | grep '\"found\":false'; then +if curl -s -X PUT http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite -d @/consul/config/scripts/aai-search-storage-write-doc.txt | grep '\"created\":true'; then + if curl -s -X DELETE http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite | grep '\"failed\":0'; then + if curl -s -X GET http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite | grep '\"found\":false'; then echo Successful PUT, DELETE, GET from Search Document Storage 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh index 4a78c315ba..9abfd49ca7 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh @@ -1,6 +1,6 @@ -APPC_DBHOST_POD=$(/consul/config/bin/kubectl -n onap-appc get pod | grep -o "appc-dbhost-[^[:space:]]*") +APPC_DBHOST_POD=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "appc-dbhost-[^[:space:]]*") if [ -n "$APPC_DBHOST_POD" ]; then - if /consul/config/bin/kubectl -n onap-appc exec -it $APPC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $APPC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then echo Success. APPC DBHost is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh index 53cd5886f9..2c7a949987 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh @@ -1,8 +1,8 @@ -NAME=$(/consul/config/bin/kubectl -n onap-aai get pod | grep -o "data-router[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "data-router[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-aai exec -it $NAME -- ps -efww | grep 'java' | grep 'data-router' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- ps -efww | grep 'java' | grep 'data-router' > /dev/null; then echo Success. Synapse process is running. 2>&1 exit 0 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh index c1766f8a2a..e55c90fdc1 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh @@ -1,8 +1,8 @@ -NAME=$(/consul/config/bin/kubectl -n onap-aai get pod | grep -o "gremlin[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "gremlin[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-aai exec -it $NAME -- ps -efww | grep 'java' | grep 'gremlin-server' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- ps -efww | grep 'java' | grep 'gremlin-server' > /dev/null; then echo Success. Gremlin Server process is running. 2>&1 exit 0 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh index 1c93ecb38e..9f4f4a843d 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh @@ -1,8 +1,8 @@ -NAME=$(/consul/config/bin/kubectl -n onap-aai get pod | grep -o "model-loader[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "model-loader[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-aai exec -it $NAME -- ps -efww | grep 'java' | grep 'model-loader' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- ps -efww | grep 'java' | grep 'model-loader' > /dev/null; then echo Success. Model Loader process is running. 2>&1 exit 0 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh index 317c2a699c..cde6e8f335 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh @@ -1,6 +1,6 @@ -kafkapod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "global-kafka-[^[:space:]]*") +kafkapod=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "global-kafka-[^[:space:]]*") if [ -n "$kafkapod" ]; then - if /consul/config/bin/kubectl -n onap-message-router exec -it $kafkapod -- ps ef | grep -i kafka; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $kafkapod -- ps ef | grep -i kafka; then echo Success. Kafka process is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh index 3da456c05a..2534fcba9e 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh @@ -1,6 +1,6 @@ -zkpod=$(/consul/config/bin/kubectl -n onap-message-router get pod | grep -o "zookeeper-[^[:space:]]*") +zkpod=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "zookeeper-[^[:space:]]*") if [ -n "$zkpod" ]; then - if /consul/config/bin/kubectl -n onap-message-router exec -it $zkpod -- ps ef | grep -i zookeeper; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $zkpod -- ps ef | grep -i zookeeper; then echo Success. Zookeeper process is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh index ba0afc0dce..459d2e2b34 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/ecomp/mso/infra/healthcheck" +HEALTH_CHECK_ENDPOINT="http://mso.namespace-placeholder:8080/ecomp/mso/infra/healthcheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready") diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh index 254a0445ce..8342843dd8 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/mso/healthcheck" +HEALTH_CHECK_ENDPOINT="http://mso.namespace-placeholder:8080/mso/healthcheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready") diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh index 29ffd8fe4c..c88ebe5a49 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://mso.onap-mso.svc.cluster.local:8080/networks/rest/healthcheck" +HEALTH_CHECK_ENDPOINT="http://mso.namespace-placeholder:8080/networks/rest/healthcheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready") diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh index 84b22206e0..42e708ee02 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh @@ -1,7 +1,7 @@ -NAME=$(/consul/config/bin/kubectl -n onap-mso get pod | grep -o "mariadb[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "mariadb[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-mso exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then echo Success. mariadb process is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh index f460a3f116..66f35d9437 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://sdc-fe.onap-sdc:8181/sdc1/rest/healthCheck" +HEALTH_CHECK_ENDPOINT="http://sdc-fe.namespace-placeholder:8181/sdc1/rest/healthCheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) ## Strip out the ON_BOARDING section from the response XML (otherwise we will diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh index 31cd8d3fa6..cd50120581 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://sdc-fe.onap-sdc:8181/sdc1/rest/healthCheck" +HEALTH_CHECK_ENDPOINT="http://sdc-fe.namespace-placeholder:8181/sdc1/rest/healthCheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) ## Strip out the ON_BOARDING section from the response XML (otherwise we will diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh index 6a1d035ecd..9799c31201 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://sdc-fe.onap-sdc:8181/sdc1/rest/healthCheck" +HEALTH_CHECK_ENDPOINT="http://sdc-fe.namespace-placeholder:8181/sdc1/rest/healthCheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) ## Strip out the ON_BOARDING section from the response XML (otherwise we will diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh index 6993402653..bfa2068f29 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh @@ -1,5 +1,5 @@ ## Query the health check API. -HEALTH_CHECK_ENDPOINT="http://sdc-fe.onap-sdc:8181/sdc1/rest/healthCheck" +HEALTH_CHECK_ENDPOINT="http://sdc-fe.namespace-placeholder:8181/sdc1/rest/healthCheck" HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT) ## Strip out the ON_BOARDING section from the response XML (otherwise we will diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh index 6bb07f80eb..8a523ce0b5 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh @@ -1,6 +1,6 @@ -SDNC_DBHOST_POD=$(/consul/config/bin/kubectl -n onap-sdnc get pod | grep -o "sdnc-dbhost-[^[:space:]]*") +SDNC_DBHOST_POD=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "sdnc-dbhost-[^[:space:]]*") if [ -n "$SDNC_DBHOST_POD" ]; then - if /consul/config/bin/kubectl -n onap-sdnc exec -it $SDNC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $SDNC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then echo Success. SDNC DBHost is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh index fc0b04a72b..ef96cca6a3 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh @@ -1,6 +1,6 @@ #!/bin/sh -SEARCH_SERVICE_NAME="search-data-service.onap-aai" +SEARCH_SERVICE_NAME="search-data-service.namespace-placeholder" SEARCH_SERVICE_PORT=9509 HEALTH_CHECK_INDEX="healthcheck" diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh index fe265ba2b0..d7def2dd90 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh @@ -1,8 +1,8 @@ -NAME=$(/consul/config/bin/kubectl -n onap-aai get pod | grep -o "sparky-be[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "sparky-be[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-aai exec -it $NAME -- ps -efww | grep 'java' | grep 'sparky' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- ps -efww | grep 'java' | grep 'sparky' > /dev/null; then echo Success. UI Backend Service process is running. 2>&1 exit 0 diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh index da9d8a5d82..a3ac9b433b 100755 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh @@ -1,6 +1,6 @@ # Query the Hbase service for the cluster status. -GET_CLUSTER_STATUS_RESPONSE=$(curl -si -X GET -H "Accept: text/xml" http://hbase.onap-aai:8080/status/cluster) +GET_CLUSTER_STATUS_RESPONSE=$(curl -si -X GET -H "Accept: text/xml" http://hbase.namespace-placeholder:8080/status/cluster) if [ -z "$GET_CLUSTER_STATUS_RESPONSE" ]; then echo "Tabular store is unreachable." diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh index c87686f764..96c7969fac 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh @@ -1,7 +1,7 @@ -NAME=$(/consul/config/bin/kubectl -n onap-vid get pod | grep -o "vid-mariadb[^[:space:]]*") +NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "vid-mariadb[^[:space:]]*") if [ -n "$NAME" ]; then - if /consul/config/bin/kubectl -n onap-vid exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then + if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then echo Success. mariadb process is running. 2>&1 exit 0 else diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json index 849e199589..374dcdfd62 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json @@ -33,7 +33,7 @@ { "id": "sdc-catalog-healthcheck", "name": "SDC Catalog Health Check", - "http": "https://sdc-be.onap-sdc:8443/asdc/v1/catalog/services", + "http": "https://sdc-be.namespace-placeholder:8443/asdc/v1/catalog/services", "header": { "Authorization": ["Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="], "X-ECOMP-InstanceID": ["VID"], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json index 051c4abb3a..6c293995eb 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json @@ -5,7 +5,7 @@ { "id": "sdnc-dgbuilder", "name": "SDNC-DGbuilder Health Check", - "http": "http://sdnc-dgbuilder.onap-sdnc:3000/", + "http": "http://sdnc-dgbuilder.namespace-placeholder:3000/", "method": "HEAD", "header": { "Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json index fc26d2e192..a127aa1d27 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json @@ -5,7 +5,7 @@ { "id": "odl-api-healthcheck", "name": "SDNC API Health Check", - "http": "http://sdnhost.onap-sdnc:8282/restconf/operations/SLI-API:healthcheck", + "http": "http://sdnhost.namespace-placeholder:8282/restconf/operations/SLI-API:healthcheck", "method": "POST", "header": { "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json index 3ecc1b3f53..07f2bb7b95 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json @@ -5,7 +5,7 @@ { "id": "sdnc-portal", "name": "SDNC Portal Health Check", - "http": "http://sdnc-portal.onap-sdnc:8843/login", + "http": "http://sdnc-portal.namespace-placeholder:8843/login", "method": "HEAD", "header": { "Cache-Control": ["no-cache"], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json index 321852e805..6b859c0894 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json @@ -3,9 +3,9 @@ "name": "Health Check: SDNC-SDN-CTL-DB-01", "checks": [ { - "id": "sdnctldb01.onap-sdnc", + "id": "sdnctldb01.namespace-placeholder", "name": "SDNC SDNCTLDB01 Health Check", - "tcp": "sdnctldb01.onap-sdnc:3306", + "tcp": "sdnctldb01.namespace-placeholder:3306", "interval": "10s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json index 106a2069bb..c6ad3beb93 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json @@ -3,9 +3,9 @@ "name": "Health Check: SDNC-SDN-CTL-DB-02", "checks": [ { - "id": "sdnctldb02.onap-sdnc", + "id": "sdnctldb02.namespace-placeholder", "name": "SDNC SDNCTLDB02 Health Check", - "tcp": "sdnctldb02.onap-sdnc:3306", + "tcp": "sdnctldb02.namespace-placeholder:3306", "interval": "10s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json index 93d5b1a115..9494810081 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json @@ -5,7 +5,7 @@ { "id": "sdnc-sdnhost", "name": "SDNC SDN Host Health Check", - "http": "http://sdnhost.onap-sdnc:8282/apidoc/explorer/index.html", + "http": "http://sdnhost.namespace-placeholder:8282/apidoc/explorer/index.html", "method": "HEAD", "header": { "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="], diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json index c7f83a8bfe..abc9e7f6b4 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json @@ -3,107 +3,107 @@ "name": "Health Check: VFC", "checks": [ { - "id": "vfc-catalog.onap-vfc", + "id": "vfc-catalog.namespace-placeholder", "name": "VFC catalog Health Check", - "tcp": "vfc-catalog.onap-vfc:8806", + "tcp": "vfc-catalog.namespace-placeholder:8806", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-emsdriver.onap-vfc", + "id": "vfc-emsdriver.namespace-placeholder", "name": "VFC emsdriver Health Check", - "tcp": "vfc-emsdriver.onap-vfc:8206", + "tcp": "vfc-emsdriver.namespace-placeholder:8206", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-gvnfmdriver.onap-vfc", + "id": "vfc-gvnfmdriver.namespace-placeholder", "name": "VFC gvnfmdriver Health Check", - "tcp": "vfc-gvnfmdriver.onap-vfc:8484", + "tcp": "vfc-gvnfmdriver.namespace-placeholder:8484", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-hwvnfmdriver.onap-vfc", + "id": "vfc-hwvnfmdriver.namespace-placeholder", "name": "VFC hwvnfmdriver Health Check", - "tcp": "vfc-hwvnfmdriver.onap-vfc:8482", + "tcp": "vfc-hwvnfmdriver.namespace-placeholder:8482", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-jujudriver.onap-vfc", + "id": "vfc-jujudriver.namespace-placeholder", "name": "VFC jujudriver Health Check", - "tcp": "vfc-jujudriver.onap-vfc:8483", + "tcp": "vfc-jujudriver.namespace-placeholder:8483", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-nokiavnfmdriver.onap-vfc", + "id": "vfc-nokiavnfmdriver.namespace-placeholder", "name": "VFC nokiavnfmdriver Health Check", - "tcp": "vfc-nokiavnfmdriver.onap-vfc:8486", + "tcp": "vfc-nokiavnfmdriver.namespace-placeholder:8486", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-nslcm.onap-vfc", + "id": "vfc-nslcm.namespace-placeholder", "name": "VFC nslcm Health Check", - "tcp": "vfc-nslcm.onap-vfc:8403", + "tcp": "vfc-nslcm.namespace-placeholder:8403", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-resmgr.onap-vfc", + "id": "vfc-resmgr.namespace-placeholder", "name": "VFC resmgr Health Check", - "tcp": "vfc-resmgr.onap-vfc:8480", + "tcp": "vfc-resmgr.namespace-placeholder:8480", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-vnflcm.onap-vfc", + "id": "vfc-vnflcm.namespace-placeholder", "name": "VFC vnflcm Health Check", - "tcp": "vfc-vnflcm.onap-vfc:8801", + "tcp": "vfc-vnflcm.namespace-placeholder:8801", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-vnfmgr.onap-vfc", + "id": "vfc-vnfmgr.namespace-placeholder", "name": "VFC vnfmgr Health Check", - "tcp": "vfc-vnfmgr.onap-vfc:8803", + "tcp": "vfc-vnfmgr.namespace-placeholder:8803", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-vnfres.onap-vfc", + "id": "vfc-vnfres.namespace-placeholder", "name": "VFC vnfres Health Check", - "tcp": "vfc-vnfres.onap-vfc:8802", + "tcp": "vfc-vnfres.namespace-placeholder:8802", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-workflow.onap-vfc", + "id": "vfc-workflow.namespace-placeholder", "name": "VFC workflow Health Check", - "tcp": "vfc-workflow.onap-vfc:10550", + "tcp": "vfc-workflow.namespace-placeholder:10550", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-workflowengineactiviti.onap-vfc", + "id": "vfc-workflowengineactiviti.namespace-placeholder", "name": "VFC workflow-engine Health Check", - "tcp": "vfc-workflowengineactiviti.onap-vfc:8080", + "tcp": "vfc-workflowengineactiviti.namespace-placeholder:8080", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-ztesdncdriver.onap-vfc", + "id": "vfc-ztesdncdriver.namespace-placeholder", "name": "VFC ztesdncdriver Health Check", - "tcp": "vfc-ztesdncdriver.onap-vfc:8411", + "tcp": "vfc-ztesdncdriver.namespace-placeholder:8411", "interval": "15s", "timeout": "1s" }, { - "id": "vfc-ztevnfmdriver.onap-vfc", + "id": "vfc-ztevnfmdriver.namespace-placeholder", "name": "VFC ztevnfmdriver Health Check", - "tcp": "vfc-ztevnfmdriver.onap-vfc:8410", + "tcp": "vfc-ztevnfmdriver.namespace-placeholder:8410", "interval": "15s", "timeout": "1s" } diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json index 8a2a4dca9b..39d71c4e5e 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json @@ -5,7 +5,7 @@ { "id": "vid-server", "name": "VID Server Health Check", - "http": "http://vid-server.onap-vid:8080/vid/healthCheck", + "http": "http://vid-server.namespace-placeholder:8080/vid/healthCheck", "method": "GET", "header": { "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="], diff --git a/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties b/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties index 8c6f50dc67..2f37755d88 100644 --- a/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties +++ b/kubernetes/config/docker/init/src/config/dcae/message-router/dmaap/MsgRtrApi.properties @@ -15,9 +15,9 @@ ## ## Both Cambria and Kafka make use of Zookeeper. ## -config.zk.servers=zookeeper.onap-dcae:2181 +config.zk.servers=zookeeper.namespace-placeholder:2181 #config.zk.servers=172.17.0.1:2181 -#dmaap.onap-dcae:2181 +#dmaap.namespace-placeholder:2181 #10.208.128.229:2181 #config.zk.root=/fe3c/cambria/config @@ -30,9 +30,9 @@ config.zk.servers=zookeeper.onap-dcae:2181 ## configurations (after removing "kafka.") ## if you want to change request.required.acks it can take this one value #kafka.metadata.broker.list=localhost:9092,localhost:9093 -kafka.metadata.broker.list=kafka.onap-dcae:9092 +kafka.metadata.broker.list=kafka.namespace-placeholder:9092 #kafka.metadata.broker.list=172.17.0.1:9092 -#dmaap.onap-dcae:9092 +#dmaap.namespace-placeholder:9092 #10.208.128.229:9092 ##kafka.request.required.acks=-1 #kafka.client.zookeeper=${config.zk.servers} diff --git a/kubernetes/config/docker/init/src/config/log/filebeat/log4j/filebeat.yml b/kubernetes/config/docker/init/src/config/log/filebeat/log4j/filebeat.yml index 79c9a08a79..f15c2bb8e1 100644 --- a/kubernetes/config/docker/init/src/config/log/filebeat/log4j/filebeat.yml +++ b/kubernetes/config/docker/init/src/config/log/filebeat/log4j/filebeat.yml @@ -29,7 +29,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.namespace-placeholder:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/config/docker/init/src/config/log/filebeat/logback/filebeat.yml b/kubernetes/config/docker/init/src/config/log/filebeat/logback/filebeat.yml index f316b866af..7b78c9ba46 100644 --- a/kubernetes/config/docker/init/src/config/log/filebeat/logback/filebeat.yml +++ b/kubernetes/config/docker/init/src/config/log/filebeat/logback/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.namespace-placeholder:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/config/docker/init/src/config/message-router/dmaap/MsgRtrApi.properties b/kubernetes/config/docker/init/src/config/message-router/dmaap/MsgRtrApi.properties index d912179121..db8d911248 100755 --- a/kubernetes/config/docker/init/src/config/message-router/dmaap/MsgRtrApi.properties +++ b/kubernetes/config/docker/init/src/config/message-router/dmaap/MsgRtrApi.properties @@ -15,9 +15,9 @@ ## ## Both Cambria and Kafka make use of Zookeeper. ## -config.zk.servers=zookeeper.onap-message-router:2181 +config.zk.servers=zookeeper.namespace-placeholder:2181 #config.zk.servers=172.17.0.1:2181 -#dmaap.onap-message-router:2181 +#dmaap.namespace-placeholder:2181 #10.208.128.229:2181 #config.zk.root=/fe3c/cambria/config @@ -30,9 +30,9 @@ config.zk.servers=zookeeper.onap-message-router:2181 ## configurations (after removing "kafka.") ## if you want to change request.required.acks it can take this one value #kafka.metadata.broker.list=localhost:9092,localhost:9093 -kafka.metadata.broker.list=global-kafka.onap-message-router:9092 +kafka.metadata.broker.list=global-kafka.namespace-placeholder:9092 #kafka.metadata.broker.list=172.17.0.1:9092 -#dmaap.onap-message-router:9092 +#dmaap.namespace-placeholder:9092 #10.208.128.229:9092 ##kafka.request.required.acks=-1 #kafka.client.zookeeper=${config.zk.servers} diff --git a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py index 387a14451d..1b96b3a001 100755 --- a/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py +++ b/kubernetes/config/docker/init/src/config/robot/eteshare/config/vm_properties.py @@ -1,77 +1,77 @@ # File generated from /opt/config # -GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.onap-aai" +GLOBAL_INJECTED_AAI1_IP_ADDR = "aai-service.namespace-placeholder" GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" -GLOBAL_INJECTED_APPC_IP_ADDR = "sdnhost.onap-appc" +GLOBAL_INJECTED_APPC_IP_ADDR = "appc-sdnhost.namespace-placeholder" GLOBAL_INJECTED_ARTIFACTS_VERSION = "1.1.0-SNAPSHOT" -GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.onap-clamp" +GLOBAL_INJECTED_CLAMP_IP_ADDR = "clamp.namespace-placeholder" GLOBAL_INJECTED_CLOUD_ENV = "openstack" -GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.onap-dcae" +GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-controller.namespace-placeholder" GLOBAL_INJECTED_DNS_IP_ADDR = "10.0.100.1" GLOBAL_INJECTED_DOCKER_VERSION = "1.1-STAGING-latest" #GLOBAL_INJECTED_EXTERNAL_DNS = "N/A" GLOBAL_INJECTED_GERRIT_BRANCH = "master" GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE" -GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router" -GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso" +GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.namespace-placeholder" +GLOBAL_INJECTED_MSO_IP_ADDR = "mso.namespace-placeholder" GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE" GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" GLOBAL_INJECTED_NEXUS_USERNAME = "docker" -GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.onap-msb" +GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.namespace-placeholder" GLOBAL_INJECTED_OPENSTACK_PASSWORD = "OPENSTACK_PASSWORD_HERE" GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "OPENSTACK_TENANT_ID_HERE" GLOBAL_INJECTED_OPENSTACK_USERNAME = "OPENSTACK_USERNAME_HERE" -GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.onap-policy" -GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.onap-policy" -GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.onap-portal" +GLOBAL_INJECTED_POLICY_IP_ADDR = "pypdp.namespace-placeholder" +GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR = "drools.namespace-placeholder" +GLOBAL_INJECTED_PORTAL_IP_ADDR = "portalapps.namespace-placeholder" GLOBAL_INJECTED_REGION = "OPENSTACK_REGION_HERE" GLOBAL_INJECTED_REMOTE_REPO = "http://gerrit.onap.org/r/testsuite/properties.git" -GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.onap-sdc" -GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.onap-sdc" -GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.onap-sdnc" -GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.onap-sdnc" -GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso" -GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.onap-vid" +GLOBAL_INJECTED_SDC_IP_ADDR = "sdc-be.namespace-placeholder" +GLOBAL_INJECTED_SDC_FE_IP_ADDR = "sdc-fe.namespace-placeholder" +GLOBAL_INJECTED_SDC_BE_IP_ADDR = "sdc-be.namespace-placeholder" +GLOBAL_INJECTED_SDNC_IP_ADDR = "sdnhost.namespace-placeholder" +GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR = "sdnc-portal.namespace-placeholder" +GLOBAL_INJECTED_SO_IP_ADDR = "mso.namespace-placeholder" +GLOBAL_INJECTED_VID_IP_ADDR = "vid-server.namespace-placeholder" GLOBAL_INJECTED_VM_FLAVOR = "OPENSTACK_FLAVOUR_MEDIUM_HERE" GLOBAL_INJECTED_VM_IMAGE_NAME = "UBUNTU_14_IMAGE_NAME_HERE" GLOBAL_INJECTED_PUBLIC_NET_ID = "OPENSTACK_PUBLIC_NET_ID_HERE" GLOBAL_INJECTED_PROPERTIES = { - "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.onap-aai", - "GLOBAL_INJECTED_APPC_IP_ADDR" : "sdnhost.onap-appc", + "GLOBAL_INJECTED_AAI1_IP_ADDR" : "aai-service.namespace-placeholder", + "GLOBAL_INJECTED_APPC_IP_ADDR" : "appc-sdnhost.namespace-placeholder", "GLOBAL_INJECTED_ARTIFACTS_VERSION" : "1.1.0-SNAPSHOT", - "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.onap-clamp", + "GLOBAL_INJECTED_CLAMP_IP_ADDR" : "clamp.namespace-placeholder", "GLOBAL_INJECTED_CLOUD_ENV" : "openstack", - "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-controller.onap-dcae", + "GLOBAL_INJECTED_DCAE_IP_ADDR" : "dcae-controller.namespace-placeholder", "GLOBAL_INJECTED_DNS_IP_ADDR" : "10.0.100.1", "GLOBAL_INJECTED_DOCKER_VERSION" : "1.1-STAGING-latest", "GLOBAL_INJECTED_GERRIT_BRANCH" : "master", "GLOBAL_INJECTED_KEYSTONE" : "OPENSTACK_KEYSTONE_IP_HERE", - "GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.onap-message-router", - "GLOBAL_INJECTED_MSO_IP_ADDR" : "mso.onap-mso", + "GLOBAL_INJECTED_MR_IP_ADDR" : "dmaap.namespace-placeholder", + "GLOBAL_INJECTED_MSO_IP_ADDR" : "mso.namespace-placeholder", "GLOBAL_INJECTED_NETWORK" : "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE", "GLOBAL_INJECTED_NEXUS_DOCKER_REPO" : "nexus3.onap.org:10001", "GLOBAL_INJECTED_NEXUS_PASSWORD" : "docker", "GLOBAL_INJECTED_NEXUS_REPO" : "https://nexus.onap.org/content/sites/raw", "GLOBAL_INJECTED_NEXUS_USERNAME" : "docker", - "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.onap-msb", + "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.namespace-placeholder", "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "OPENSTACK_PASSWORD_HERE", "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "OPENSTACK_TENANT_ID_HERE", "GLOBAL_INJECTED_OPENSTACK_USERNAME" : "OPENSTACK_USERNAME_HERE", - "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pypdp.onap-policy", - "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.onap-policy", - "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.onap-portal", + "GLOBAL_INJECTED_POLICY_IP_ADDR" : "pypdp.namespace-placeholder", + "GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR" : "drools.namespace-placeholder", + "GLOBAL_INJECTED_PORTAL_IP_ADDR" : "portalapps.namespace-placeholder", "GLOBAL_INJECTED_REGION" : "OPENSTACK_REGION_HERE", "GLOBAL_INJECTED_REMOTE_REPO" : "http://gerrit.onap.org/r/testsuite/properties.git", - "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.onap-sdc", - "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.onap-sdc", - "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.onap-sdnc", - "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.onap-sdnc", - "GLOBAL_INJECTED_SO_IP_ADDR" : "mso.onap-mso", - "GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.onap-vid", + "GLOBAL_INJECTED_SDC_FE_IP_ADDR" : "sdc-fe.namespace-placeholder", + "GLOBAL_INJECTED_SDC_BE_IP_ADDR" : "sdc-be.namespace-placeholder", + "GLOBAL_INJECTED_SDNC_IP_ADDR" : "sdnhost.namespace-placeholder", + "GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR" : "sdnc-portal.namespace-placeholder", + "GLOBAL_INJECTED_SO_IP_ADDR" : "mso.namespace-placeholder", + "GLOBAL_INJECTED_VID_IP_ADDR" : "vid-server.namespace-placeholder", "GLOBAL_INJECTED_VM_FLAVOR" : "OPENSTACK_FLAVOUR_MEDIUM_HERE", "GLOBAL_INJECTED_VM_IMAGE_NAME" : "UBUNTU_14_IMAGE_NAME_HERE", "GLOBAL_INJECTED_PUBLIC_NET_ID" : "OPENSTACK_PUBLIC_NET_ID_HERE" diff --git a/kubernetes/config/onap-parameters.yaml b/kubernetes/config/onap-parameters.yaml index 6f84d0f354..3910b60786 100644 --- a/kubernetes/config/onap-parameters.yaml +++ b/kubernetes/config/onap-parameters.yaml @@ -12,4 +12,4 @@ OPENSTACK_KEYSTONE_URL: "" OPENSTACK_FLAVOUR_MEDIUM: "" OPENSTACK_SERVICE_TENANT_NAME: "" DMAAP_TOPIC: "" -DEMO_ARTIFACTS_VERSION: ""
\ No newline at end of file +DEMO_ARTIFACTS_VERSION: "" diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml index aa8e096f6a..81b16b54ca 100644 --- a/kubernetes/consul/templates/consul-agent-deployment.yaml +++ b/kubernetes/consul/templates/consul-agent-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: consul-agent name: consul-agent - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -19,7 +19,7 @@ spec: containers: - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" command: ["/usr/local/bin/docker-entrypoint.sh"] - args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}-consul"] + args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"] name: consul-server volumeMounts: - mountPath: /consul/config @@ -28,4 +28,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config name: consul-agent-config -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml index a2feb9f6a3..c9f2cfb372 100644 --- a/kubernetes/consul/templates/consul-server-deployment.yaml +++ b/kubernetes/consul/templates/consul-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: consul-server name: consul-server - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 3 selector: @@ -20,7 +20,7 @@ spec: containers: - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" command: ["/usr/local/bin/docker-entrypoint.sh"] - args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}-consul"] + args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}"] name: consul-server volumeMounts: - mountPath: /consul/config @@ -29,4 +29,4 @@ spec: - hostPath: path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config name: consul-server-config -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/consul/templates/consul-server-service.yaml b/kubernetes/consul/templates/consul-server-service.yaml index 3dd801664c..a1e0801eab 100644 --- a/kubernetes/consul/templates/consul-server-service.yaml +++ b/kubernetes/consul/templates/consul-server-service.yaml @@ -5,7 +5,7 @@ metadata: labels: app: consul-server name: consul-server - namespace: "{{ .Values.nsPrefix }}-consul" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: consul-ui diff --git a/kubernetes/dcae/templates/all-services.yaml b/kubernetes/dcae/templates/all-services.yaml index b0170734dd..9423e43560 100644 --- a/kubernetes/dcae/templates/all-services.yaml +++ b/kubernetes/dcae/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: zookeeper - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" labels: app: zookeeper spec: @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: kafka - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" labels: app: kafka spec: @@ -37,7 +37,7 @@ apiVersion: v1 kind: Service metadata: name: dmaap - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" labels: app: dmaap version: 1.1.0 @@ -60,7 +60,7 @@ apiVersion: v1 kind: Service metadata: name: zldciad4vipstg00 - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" labels: app: dcae-pgaas spec: @@ -82,7 +82,7 @@ metadata: app: dcae-collector-common-event version: latest name: dcae-collector-common-event - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: dcae-ce1 @@ -110,7 +110,7 @@ metadata: app: dcae-collector-dmaapbc version: latest name: dcae-collector-dmaapbc - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: dcae-bc1 diff --git a/kubernetes/dcae/templates/cdap0-dep.yaml b/kubernetes/dcae/templates/cdap0-dep.yaml index 37d7d58a16..208e1ef9a5 100644 --- a/kubernetes/dcae/templates/cdap0-dep.yaml +++ b/kubernetes/dcae/templates/cdap0-dep.yaml @@ -7,7 +7,7 @@ metadata: labels: app: cdap0 name: cdap0 - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/dcae/templates/cdap1-dep.yaml b/kubernetes/dcae/templates/cdap1-dep.yaml index 7529777038..8aa7721a0d 100644 --- a/kubernetes/dcae/templates/cdap1-dep.yaml +++ b/kubernetes/dcae/templates/cdap1-dep.yaml @@ -7,7 +7,7 @@ metadata: labels: app: cdap1 name: cdap1 - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/dcae/templates/cdap2-dep.yaml b/kubernetes/dcae/templates/cdap2-dep.yaml index d146894e56..119b8ff32c 100644 --- a/kubernetes/dcae/templates/cdap2-dep.yaml +++ b/kubernetes/dcae/templates/cdap2-dep.yaml @@ -7,7 +7,7 @@ metadata: labels: app: cdap2 name: cdap2 - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/dcae/templates/dcae-collector-common-event.yaml b/kubernetes/dcae/templates/dcae-collector-common-event.yaml index aa51f140ff..a370151695 100644 --- a/kubernetes/dcae/templates/dcae-collector-common-event.yaml +++ b/kubernetes/dcae/templates/dcae-collector-common-event.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dcae-collector-common-event - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -37,4 +37,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/common-event/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml index 5de893b867..85f671e998 100644 --- a/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml +++ b/kubernetes/dcae/templates/dcae-collector-dmaapbc.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dcae-collector-dmaapbc - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -36,4 +36,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dmaapbc/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/dcae-controller.yaml b/kubernetes/dcae/templates/dcae-controller.yaml index 30f3afb907..e4642c93ef 100644 --- a/kubernetes/dcae/templates/dcae-controller.yaml +++ b/kubernetes/dcae/templates/dcae-controller.yaml @@ -6,7 +6,7 @@ metadata: app: dcae-controller version: latest name: dcae-controller - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: dcae-con1 @@ -27,7 +27,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dcae-controller - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -60,4 +60,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/dcae-controller/config imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/dcae-dmaap.yaml b/kubernetes/dcae/templates/dcae-dmaap.yaml index 46c2e65b46..85453119a6 100644 --- a/kubernetes/dcae/templates/dcae-dmaap.yaml +++ b/kubernetes/dcae/templates/dcae-dmaap.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: dmaap - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/dcae/templates/dcae-kafka.yaml b/kubernetes/dcae/templates/dcae-kafka.yaml index de18137235..d2652721a1 100644 --- a/kubernetes/dcae/templates/dcae-kafka.yaml +++ b/kubernetes/dcae/templates/dcae-kafka.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: kafka - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -42,7 +42,7 @@ spec: periodSeconds: 10 env: - name: KAFKA_ZOOKEEPER_CONNECT - value: "zookeeper.{{ .Values.nsPrefix }}-dcae:2181" + value: "zookeeper.{{ .Values.nsPrefix }}" - name: KAFKA_ADVERTISED_HOST_NAME value: "kafka" - name: KAFKA_BROKER_ID diff --git a/kubernetes/dcae/templates/dcae-zookeeper.yaml b/kubernetes/dcae/templates/dcae-zookeeper.yaml index 189a03952d..9c2d8c7eba 100644 --- a/kubernetes/dcae/templates/dcae-zookeeper.yaml +++ b/kubernetes/dcae/templates/dcae-zookeeper.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: zookeeper - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -30,4 +30,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcae/templates/pgaas.yaml b/kubernetes/dcae/templates/pgaas.yaml index 788de60231..16abade9ea 100644 --- a/kubernetes/dcae/templates/pgaas.yaml +++ b/kubernetes/dcae/templates/pgaas.yaml @@ -7,7 +7,7 @@ metadata: labels: app: dcae-pgaas name: dcae-pgaas - namespace: "{{ .Values.nsPrefix }}-dcae" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 1 selector: @@ -46,4 +46,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/dcae/pgaas/tools imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/dcaegen2/templates/pod.yaml b/kubernetes/dcaegen2/templates/pod.yaml index ffb3716ecf..1cf5d9b08d 100644 --- a/kubernetes/dcaegen2/templates/pod.yaml +++ b/kubernetes/dcaegen2/templates/pod.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Pod metadata: name: {{ .Chart.Name }} - namespace: "{{ .Values.nsPrefix }}-dcaegen2" + namespace: "{{ .Values.nsPrefix }}" spec: containers: - name: {{ .Chart.Name }} @@ -27,4 +27,4 @@ spec: imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" restartPolicy: Never -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/esr/templates/all-services.yaml b/kubernetes/esr/templates/all-services.yaml index 68f0db7516..e0c5075e50 100644 --- a/kubernetes/esr/templates/all-services.yaml +++ b/kubernetes/esr/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: esr-esrserver name: esr-esrserver - namespace: "{{ .Values.nsPrefix }}-esr" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -32,7 +32,7 @@ metadata: labels: app: esr-esrgui name: esr-esrgui - namespace: "{{ .Values.nsPrefix }}-esr" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { diff --git a/kubernetes/esr/templates/esr-esrgui-deployment.yaml b/kubernetes/esr/templates/esr-esrgui-deployment.yaml index 6c3ddf404d..f9ec271515 100644 --- a/kubernetes/esr/templates/esr-esrgui-deployment.yaml +++ b/kubernetes/esr/templates/esr-esrgui-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: esr-esrgui name: esr-esrgui - namespace: "{{ .Values.nsPrefix }}-esr" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -22,7 +22,7 @@ spec: name: esr-esrgui env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.esrgui.port }} readinessProbe: @@ -32,4 +32,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/esr/templates/esr-esrserver-deployment.yaml b/kubernetes/esr/templates/esr-esrserver-deployment.yaml index 7724fa0d24..386d4014e4 100644 --- a/kubernetes/esr/templates/esr-esrserver-deployment.yaml +++ b/kubernetes/esr/templates/esr-esrserver-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: esr-esrserver name: esr-esrserver - namespace: "{{ .Values.nsPrefix }}-esr" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -22,7 +22,7 @@ spec: name: esr-esrserver env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.esrserver.port }} readinessProbe: @@ -32,4 +32,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/esr/values.yaml b/kubernetes/esr/values.yaml index 8cdc484ef2..b942672dfb 100644 --- a/kubernetes/esr/values.yaml +++ b/kubernetes/esr/values.yaml @@ -1,7 +1,7 @@ nsPrefix: onap pullPolicy: Always nodePortPrefix: 302 -msbaddr: msb-iag.onap-msb:80 +msbaddr: msb-iag.{{ .Values.nsPrefix }}:80 esrserver: image: nexus3.onap.org:10001/onap/aai/esr-server:v1.0.0 port: 9518 diff --git a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml index 9df3aa8fa5..d6b194008b 100644 --- a/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml +++ b/kubernetes/kube2msb/templates/kube2msb-registrator-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: kube2msb-registrator - namespace: "{{ .Values.nsPrefix }}-kube2msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 1 selector: @@ -26,8 +26,8 @@ spec: - name: AUTH_TOKEN value: {{ .Values.kubeMasterAuthToken }} - name: MSB_URL - value: {{ .Values.discoveryUrl }} + value: {{tpl $.Values.discoveryUrl .}} imagePullPolicy: {{ .Values.pullPolicy }} imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/kube2msb/values.yaml b/kubernetes/kube2msb/values.yaml index 2daccee4ae..92694482e8 100644 --- a/kubernetes/kube2msb/values.yaml +++ b/kubernetes/kube2msb/values.yaml @@ -3,4 +3,4 @@ pullPolicy: IfNotPresent image: kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb kubeMasterUrl: https://kubernetes.default.svc.cluster.local:443 -discoveryUrl: http://msb-discovery.onap-msb:10081 +discoveryUrl: http://msb-discovery.{{ .Values.nsPrefix }}:10081 diff --git a/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml b/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml index 0b579d0729..f038a10775 100644 --- a/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml +++ b/kubernetes/log/resources/elasticsearch/conf/elasticsearch.yml @@ -86,7 +86,7 @@ network.host: 0.0.0.0 # By default, Elasticsearch will bind to the available loopback addresses and will scan ports 9300 to 9305 to try # to connect to other nodes running on the same server. # -#discovery.zen.ping.unicast.hosts: ["elasticsearch.onap-log" +#discovery.zen.ping.unicast.hosts: ["elasticsearch.{{.Values.nsPrefix}}" #$discovery.zen.ping.unicast.hosts # # This setting tells Elasticsearch to not elect a master unless there are enough master-eligible nodes diff --git a/kubernetes/log/resources/kibana/conf/kibana.yml b/kubernetes/log/resources/kibana/conf/kibana.yml index 3b96bd33c2..df0d71abab 100644 --- a/kubernetes/log/resources/kibana/conf/kibana.yml +++ b/kubernetes/log/resources/kibana/conf/kibana.yml @@ -31,8 +31,8 @@ server.name: "Kibana" # The URL of the Elasticsearch instance to use for all your queries. # OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3 -elasticsearch.url: "http://elasticsearch.onap-log:9200" -#elasticsearch-service.onap-log:9200" +elasticsearch.url: "http://elasticsearch.{{.Values.nsPrefix}}:9200" +#elasticsearch-service.{{.Values.nsPrefix}}:9200" #elasticsearch.url: "http://10.247.47.3:9200" # When this setting's value is true Kibana uses the hostname specified in the server.host # setting. When the value of this setting is false, Kibana uses the hostname of the host diff --git a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf index 123ceb5f28..8289b49f6e 100644 --- a/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf +++ b/kubernetes/log/resources/logstash/pipeline/onap-pipeline.conf @@ -225,7 +225,7 @@ output { #can specify one or a list of hosts. If sniffing is set, one is enough and others will be auto-discovered ##Also protocol can be specified like ["http://10.247.186.12:9200"] ## OOM-427, OOM-441 hardcoded onap workspace to avoid helm upgrade past 2.3 - hosts => ["http://elasticsearch.onap-log:9200"] + hosts => ["http://elasticsearch.{{.Values.nsPrefix}}:9200"] ## This setting asks Elasticsearch for the list of all cluster nodes and adds them to the hosts list. Default is false. diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml index e8b6b816da..a40a4da0e8 100644 --- a/kubernetes/log/templates/all-services.yaml +++ b/kubernetes/log/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: elasticsearch name: elasticsearch - namespace: {{ .Values.nsPrefix }}-log + namespace: {{ .Values.nsPrefix }} spec: ports: - name: http @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: elasticsearchtcp - namespace: {{ .Values.nsPrefix }}-log + namespace: {{ .Values.nsPrefix }} labels: app: elasticsearch spec: @@ -37,7 +37,7 @@ apiVersion: v1 kind: Service metadata: name: logstashinternal - namespace: {{ .Values.nsPrefix }}-log + namespace: {{ .Values.nsPrefix }} labels: app: logstash spec: @@ -52,7 +52,7 @@ apiVersion: v1 kind: Service metadata: name: logstash - namespace: {{ .Values.nsPrefix }}-log + namespace: {{ .Values.nsPrefix }} labels: app: logstash spec: @@ -71,7 +71,7 @@ metadata: labels: app: kibana name: kibana - namespace: {{ .Values.nsPrefix }}-log + namespace: {{ .Values.nsPrefix }} spec: ports: - name: tcp-ks diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml index 85e57460bc..2b596d263a 100644 --- a/kubernetes/log/templates/elasticsearch-deployment.yaml +++ b/kubernetes/log/templates/elasticsearch-deployment.yaml @@ -4,8 +4,8 @@ kind: Deployment metadata: labels: app: elasticsearch - name: elasticsearch - namespace: {{ .Values.nsPrefix }}-log + name: log-elasticsearch + namespace: {{ .Values.nsPrefix }} spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: metadata: labels: app: elasticsearch - name: elasticsearch + name: log-elasticsearch spec: initContainers: - command: @@ -70,7 +70,7 @@ spec: path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/log/ - name: elasticsearch-conf configMap: - name: elasticsearch-configmap + name: log-elasticsearch-configmap items: - key: elasticsearch.yml path: elasticsearch.yml @@ -78,8 +78,8 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: elasticsearch-configmap - namespace: {{ .Values.nsPrefix }}-log + name: log-elasticsearch-configmap + namespace: {{ .Values.nsPrefix }} data: {{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }} #{{ end }} diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml index 2de825e516..f627a3c729 100644 --- a/kubernetes/log/templates/kibana-deployment.yaml +++ b/kubernetes/log/templates/kibana-deployment.yaml @@ -4,8 +4,8 @@ kind: Deployment metadata: labels: app: kibana - name: kibana - namespace: {{ .Values.nsPrefix }}-log + name: log-kibana + namespace: {{ .Values.nsPrefix }} spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: metadata: labels: app: kibana - name: kibana + name: log-kibana spec: initContainers: - command: @@ -47,7 +47,7 @@ spec: volumes: - name: kibana-conf configMap: - name: kibana-configmap + name: log-kibana-configmap items: - key: kibana.yml path: kibana.yml @@ -55,8 +55,8 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: kibana-configmap - namespace: {{ .Values.nsPrefix }}-log + name: log-kibana-configmap + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/log/templates/log-pv-pvc.yaml b/kubernetes/log/templates/log-pv-pvc.yaml index a5e5ff76e1..d0176a5462 100644 --- a/kubernetes/log/templates/log-pv-pvc.yaml +++ b/kubernetes/log/templates/log-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: elasticsearch-db - namespace: "{{ .Values.nsPrefix }}-log" + name: {{ .Values.nsPrefix }}-elasticsearch-db + namespace: "{{ .Values.nsPrefix }}" labels: - name: elasticsearch-db + name: {{ .Values.nsPrefix }}-elasticsearch-db spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: elasticsearch-db - namespace: "{{ .Values.nsPrefix }}-log" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: elasticsearch-db + name: {{ .Values.nsPrefix }}-elasticsearch-db #{{ end }} diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml index f99657a039..743108124c 100644 --- a/kubernetes/log/templates/logstash-deployment.yaml +++ b/kubernetes/log/templates/logstash-deployment.yaml @@ -4,8 +4,8 @@ kind: Deployment metadata: labels: app: logstash - name: logstash - namespace: {{ .Values.nsPrefix }}-log + name: log-logstash + namespace: {{ .Values.nsPrefix }} spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: metadata: labels: app: logstash - name: logstash + name: log-logstash spec: initContainers: - command: @@ -52,13 +52,13 @@ spec: volumes: - name: logstash-conf configMap: - name: logstash-configmap + name: log-logstash-configmap items: - key: logstash.yml path: logstash.yml - name: logstash-pipeline configMap: - name: logstash-configmap + name: log-logstash-configmap items: - key: onap-pipeline.conf path: onap-pipeline.conf @@ -67,9 +67,9 @@ spec: apiVersion: v1 kind: ConfigMap metadata: - name: logstash-configmap - namespace: {{ .Values.nsPrefix }}-log + name: log-logstash-configmap + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }} -{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig . | indent 2 }} +{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/message-router/templates/all-services.yaml b/kubernetes/message-router/templates/all-services.yaml index e76a1d9431..385b5f472d 100644 --- a/kubernetes/message-router/templates/all-services.yaml +++ b/kubernetes/message-router/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: zookeeper - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" labels: app: zookeeper spec: @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: global-kafka - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" labels: app: global-kafka spec: @@ -37,7 +37,7 @@ apiVersion: v1 kind: Service metadata: name: dmaap - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" labels: app: dmaap version: 1.0.0 diff --git a/kubernetes/message-router/templates/message-router-dmaap.yaml b/kubernetes/message-router/templates/message-router-dmaap.yaml index 1224e993ed..cc13a382da 100644 --- a/kubernetes/message-router/templates/message-router-dmaap.yaml +++ b/kubernetes/message-router/templates/message-router-dmaap.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: dmaap - namespace: "{{ .Values.nsPrefix }}-message-router" + name: message-router-dmaap + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dmaapReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: dmaap - name: dmaap + name: message-router-dmaap spec: initContainers: - command: diff --git a/kubernetes/message-router/templates/message-router-kafka.yaml b/kubernetes/message-router/templates/message-router-kafka.yaml index 94e01b31c0..ca38da414f 100644 --- a/kubernetes/message-router/templates/message-router-kafka.yaml +++ b/kubernetes/message-router/templates/message-router-kafka.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: global-kafka - namespace: "{{ .Values.nsPrefix }}-message-router" + name: message-router-global-kafka + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.kafkaReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: global-kafka - name: global-kafka + name: message-router-global-kafka spec: initContainers: - command: @@ -43,7 +43,7 @@ spec: periodSeconds: 10 env: - name: KAFKA_ZOOKEEPER_CONNECT - value: "zookeeper.{{ .Values.nsPrefix }}-message-router:2181" + value: "zookeeper.{{ .Values.nsPrefix }}:2181" - name: KAFKA_ADVERTISED_HOST_NAME value: "global-kafka" - name: KAFKA_BROKER_ID diff --git a/kubernetes/message-router/templates/message-router-pv-pvc.yaml b/kubernetes/message-router/templates/message-router-pv-pvc.yaml index 3b85a70b7e..1518913f31 100644 --- a/kubernetes/message-router/templates/message-router-pv-pvc.yaml +++ b/kubernetes/message-router/templates/message-router-pv-pvc.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: PersistentVolume metadata: name: "{{ .Values.nsPrefix }}-message-router-kafka" - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" labels: name: "{{ .Values.nsPrefix }}-message-router-kafka" spec: @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: message-router-kafka - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -36,7 +36,7 @@ apiVersion: v1 kind: PersistentVolume metadata: name: "{{ .Values.nsPrefix }}-message-router-zookeeper" - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" labels: name: "{{ .Values.nsPrefix }}-message-router-zookeeper" spec: @@ -52,7 +52,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: message-router-zookeeper - namespace: "{{ .Values.nsPrefix }}-message-router" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany diff --git a/kubernetes/message-router/templates/message-router-zookeeper.yaml b/kubernetes/message-router/templates/message-router-zookeeper.yaml index 5a5bc9f355..0dd8723ef0 100644 --- a/kubernetes/message-router/templates/message-router-zookeeper.yaml +++ b/kubernetes/message-router/templates/message-router-zookeeper.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: zookeeper - namespace: "{{ .Values.nsPrefix }}-message-router" + name: message-router-zookeeper + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.zookeeperReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: zookeeper - name: zookeeper + name: message-router-zookeeper spec: containers: - image: {{ .Values.image.zookeeper }} diff --git a/kubernetes/mock/templates/all-services.yaml b/kubernetes/mock/templates/all-services.yaml index a1b0f170de..a457d8ed9c 100644 --- a/kubernetes/mock/templates/all-services.yaml +++ b/kubernetes/mock/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: sniro-emulator - namespace: "{{ .Values.nsPrefix }}-mock" + namespace: "{{ .Values.nsPrefix }}" labels: app: sniro-emulator spec: diff --git a/kubernetes/mock/templates/sniroemulator-deployment.yaml b/kubernetes/mock/templates/sniroemulator-deployment.yaml index 5a1d483ae1..9397bfd807 100644 --- a/kubernetes/mock/templates/sniroemulator-deployment.yaml +++ b/kubernetes/mock/templates/sniroemulator-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sniro-emulator - namespace: "{{ .Values.nsPrefix }}-mock" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -24,4 +24,4 @@ spec: args: ["--verbose"] imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/msb/templates/all-services.yaml b/kubernetes/msb/templates/all-services.yaml index 8c6db30420..0ae94fc1bc 100644 --- a/kubernetes/msb/templates/all-services.yaml +++ b/kubernetes/msb/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: msb-consul - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-consul spec: @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: msb-discovery - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-discovery spec: @@ -38,7 +38,7 @@ apiVersion: v1 kind: Service metadata: name: msb-iag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-iag spec: @@ -59,7 +59,7 @@ apiVersion: v1 kind: Service metadata: name: msb-eag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" labels: app: msb-eag spec: diff --git a/kubernetes/msb/templates/msb-consul-deployment.yaml b/kubernetes/msb/templates/msb-consul-deployment.yaml index 4d462aa96f..850dd08439 100644 --- a/kubernetes/msb/templates/msb-consul-deployment.yaml +++ b/kubernetes/msb/templates/msb-consul-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-consul - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: 1 selector: diff --git a/kubernetes/msb/templates/msb-discovery-deployment.yaml b/kubernetes/msb/templates/msb-discovery-deployment.yaml index 5c01febd1e..280e6c39d0 100644 --- a/kubernetes/msb/templates/msb-discovery-deployment.yaml +++ b/kubernetes/msb/templates/msb-discovery-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-discovery - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.discoveryReplicas }} selector: @@ -37,7 +37,7 @@ spec: name: "msb-discovery" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} ports: - containerPort: {{ .Values.discoveryPort }} name: msb-discovery diff --git a/kubernetes/msb/templates/msb-eag-deployment.yaml b/kubernetes/msb/templates/msb-eag-deployment.yaml index 10cbbe115d..a24b3b012e 100644 --- a/kubernetes/msb/templates/msb-eag-deployment.yaml +++ b/kubernetes/msb/templates/msb-eag-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-eag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.eagReplicas }} selector: @@ -37,9 +37,9 @@ spec: name: "msb-eag" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} - name: SDCLIENT_IP - value: msb-discovery.{{ .Values.nsPrefix }}-msb + value: msb-discovery.{{ .Values.nsPrefix }} - name: ROUTE_LABELS value: "visualRange:0" ports: diff --git a/kubernetes/msb/templates/msb-iag-deployment.yaml b/kubernetes/msb/templates/msb-iag-deployment.yaml index 18dbc67f86..8a56a5f420 100644 --- a/kubernetes/msb/templates/msb-iag-deployment.yaml +++ b/kubernetes/msb/templates/msb-iag-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: msb-iag - namespace: "{{ .Values.nsPrefix }}-msb" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.iagReplicas }} selector: @@ -37,9 +37,9 @@ spec: name: "msb-iag" env: - name: CONSUL_IP - value: msb-consul.{{ .Values.nsPrefix }}-msb + value: msb-consul.{{ .Values.nsPrefix }} - name: SDCLIENT_IP - value: msb-discovery.{{ .Values.nsPrefix }}-msb + value: msb-discovery.{{ .Values.nsPrefix }} - name: ROUTE_LABELS value: "visualRange:1" ports: diff --git a/kubernetes/mso/resources/config/log/filebeat/filebeat.yml b/kubernetes/mso/resources/config/log/filebeat/filebeat.yml index 3229027a9a..89c6932577 100644 --- a/kubernetes/mso/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/mso/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.{{ .Values.nsPrefix }}-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/mso/resources/config/mso/jboss/standalone-full-ha-mso.xml b/kubernetes/mso/resources/config/mso/jboss/standalone-full-ha-mso.xml new file mode 100644 index 0000000000..135950daa0 --- /dev/null +++ b/kubernetes/mso/resources/config/mso/jboss/standalone-full-ha-mso.xml @@ -0,0 +1,609 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<server xmlns="urn:jboss:domain:4.2"> + + <extensions> + <extension module="org.jboss.as.clustering.infinispan"/> + <extension module="org.jboss.as.clustering.jgroups"/> + <extension module="org.jboss.as.connector"/> + <extension module="org.jboss.as.deployment-scanner"/> + <extension module="org.jboss.as.ee"/> + <extension module="org.jboss.as.ejb3"/> + <extension module="org.jboss.as.jaxrs"/> + <extension module="org.jboss.as.jdr"/> + <extension module="org.jboss.as.jmx"/> + <extension module="org.jboss.as.jpa"/> + <extension module="org.jboss.as.jsf"/> + <extension module="org.jboss.as.jsr77"/> + <extension module="org.jboss.as.logging"/> + <extension module="org.jboss.as.mail"/> + <extension module="org.jboss.as.modcluster"/> + <extension module="org.jboss.as.naming"/> + <extension module="org.jboss.as.pojo"/> + <extension module="org.jboss.as.remoting"/> + <extension module="org.jboss.as.sar"/> + <extension module="org.jboss.as.security"/> + <extension module="org.jboss.as.transactions"/> + <extension module="org.jboss.as.webservices"/> + <extension module="org.jboss.as.weld"/> + <extension module="org.wildfly.extension.batch.jberet"/> + <extension module="org.wildfly.extension.bean-validation"/> + <extension module="org.wildfly.extension.clustering.singleton"/> + <extension module="org.wildfly.extension.io"/> + <extension module="org.wildfly.extension.messaging-activemq"/> + <extension module="org.wildfly.extension.request-controller"/> + <extension module="org.wildfly.extension.security.manager"/> + <extension module="org.wildfly.extension.undertow"/> + <extension module="org.wildfly.iiop-openjdk"/> + </extensions> + + + <management> + <security-realms> + <security-realm name="ManagementRealm"> + <authentication> + <local default-user="$local" skip-group-loading="true"/> + <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + <authorization map-groups-to-roles="false"> + <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/> + </authorization> + </security-realm> + <security-realm name="ApplicationRealm"> + <server-identities> + <ssl> + <keystore path="application.keystore" relative-to="jboss.server.config.dir" keystore-password="password" alias="server" key-password="password" generate-self-signed-certificate-host="localhost"/> + </ssl> + </server-identities> + <authentication> + <local default-user="$local" allowed-users="*" skip-group-loading="true"/> + <properties path="application-users.properties" relative-to="jboss.server.config.dir"/> + </authentication> + <authorization> + <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/> + </authorization> + </security-realm> + </security-realms> + <audit-log> + <formatters> + <json-formatter name="json-formatter"/> + </formatters> + <handlers> + <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/> + </handlers> + <logger log-boot="true" log-read-only="false" enabled="false"> + <handlers> + <handler name="file"/> + </handlers> + </logger> + </audit-log> + <management-interfaces> + <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true"> + <socket-binding http="management-http"/> + </http-interface> + </management-interfaces> + <access-control provider="simple"> + <role-mapping> + <role name="SuperUser"> + <include> + <user name="$local"/> + </include> + </role> + </role-mapping> + </access-control> + </management> + + <profile> + <subsystem xmlns="urn:jboss:domain:logging:3.0"> + <console-handler name="CONSOLE"> + <level name="INFO"/> + <formatter> + <named-formatter name="COLOR-PATTERN"/> + </formatter> + </console-handler> + <periodic-rotating-file-handler name="FILE" autoflush="true"> + <formatter> + <named-formatter name="PATTERN"/> + </formatter> + <file relative-to="jboss.server.log.dir" path="server.log"/> + <suffix value=".yyyy-MM-dd"/> + <append value="true"/> + </periodic-rotating-file-handler> + <logger category="com.arjuna"> + <level name="WARN"/> + </logger> + <logger category="org.jboss.as.config"> + <level name="DEBUG"/> + </logger> + <logger category="sun.rmi"> + <level name="WARN"/> + </logger> + <root-logger> + <level name="INFO"/> + <handlers> + <handler name="CONSOLE"/> + <handler name="FILE"/> + </handlers> + </root-logger> + <formatter name="PATTERN"> + <pattern-formatter pattern="%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/> + </formatter> + <formatter name="COLOR-PATTERN"> + <pattern-formatter pattern="%K{level}%d{HH:mm:ss,SSS} %-5p [%c] (%t) %s%e%n"/> + </formatter> + </subsystem> + <subsystem xmlns="urn:jboss:domain:batch-jberet:1.0"> + <default-job-repository name="in-memory"/> + <default-thread-pool name="batch"/> + <job-repository name="in-memory"> + <in-memory/> + </job-repository> + <thread-pool name="batch"> + <max-threads count="10"/> + <keepalive-time time="30" unit="seconds"/> + </thread-pool> + </subsystem> + <subsystem xmlns="urn:jboss:domain:bean-validation:1.0"/> + <subsystem xmlns="urn:jboss:domain:datasources:4.0"> + <datasources> + <datasource jndi-name="java:jboss/datasources/mso-requests" pool-name="mso-requests" enabled="true" use-ccm="true"> + <connection-url>jdbc:mariadb://mso-mariadb:3306/mso_requests?autoReconnect=true&connectTimeout=60000&socketTimeout=60000</connection-url> + <driver>mariadb</driver> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <pool> + <min-pool-size>10</min-pool-size> + <max-pool-size>100</max-pool-size> + <prefill>true</prefill> + <use-strict-min>false</use-strict-min> + <flush-strategy>FailingConnectionOnly</flush-strategy> + </pool> + <security> + <user-name>mso</user-name> + <password>mso123</password> + </security> + <validation> + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/> + <validate-on-match>false</validate-on-match> + <background-validation>true</background-validation> + <background-validation-millis>20000</background-validation-millis> + <use-fast-fail>true</use-fast-fail> + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/> + </validation> + <timeout> + <idle-timeout-minutes>15</idle-timeout-minutes> + <query-timeout>30</query-timeout> + <allocation-retry>1</allocation-retry> + <allocation-retry-wait-millis>3000</allocation-retry-wait-millis> + </timeout> + </datasource> + <datasource jndi-name="java:jboss/datasources/mso-catalog" pool-name="mso-catalog" enabled="true" use-ccm="true"> + <connection-url>jdbc:mariadb://mso-mariadb:3306/mso_catalog?autoReconnect=true&connectTimeout=60000&socketTimeout=60000</connection-url> + <driver>mariadb</driver> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <pool> + <min-pool-size>10</min-pool-size> + <max-pool-size>100</max-pool-size> + <prefill>true</prefill> + <use-strict-min>false</use-strict-min> + <flush-strategy>FailingConnectionOnly</flush-strategy> + </pool> + <security> + <user-name>catalog</user-name> + <password>catalog123</password> + </security> + <validation> + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/> + <validate-on-match>false</validate-on-match> + <background-validation>true</background-validation> + <background-validation-millis>20000</background-validation-millis> + <use-fast-fail>true</use-fast-fail> + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/> + </validation> + <timeout> + <idle-timeout-minutes>15</idle-timeout-minutes> + <query-timeout>30</query-timeout> + <allocation-retry>1</allocation-retry> + <allocation-retry-wait-millis>3000</allocation-retry-wait-millis> + </timeout> + </datasource> + <datasource jta="true" jndi-name="java:jboss/datasources/ProcessEngine" pool-name="ProcessEngine" enabled="true" use-java-context="true" use-ccm="true"> + <connection-url>jdbc:mariadb://mso-mariadb:3306/camundabpmn?autoReconnect=true&connectTimeout=60000&socketTimeout=60000</connection-url> + <driver>mariadb</driver> + <new-connection-sql>set autocommit=1</new-connection-sql> + <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation> + <pool> + <min-pool-size>10</min-pool-size> + <max-pool-size>100</max-pool-size> + <prefill>true</prefill> + <use-strict-min>false</use-strict-min> + <flush-strategy>FailingConnectionOnly</flush-strategy> + </pool> + <security> + <user-name>camunda</user-name> + <password>camunda123</password> + </security> + <validation> + <valid-connection-checker class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"/> + <exception-sorter class-name="org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"/> + </validation> + <statement> + <prepared-statement-cache-size>32</prepared-statement-cache-size> + <share-prepared-statements>true</share-prepared-statements> + </statement> + </datasource> + <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="true" use-java-context="true"> + <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url> + <driver>h2</driver> + <security> + <user-name>sa</user-name> + <password>sa</password> + </security> + </datasource> + <drivers> + <driver name="h2" module="com.h2database.h2"> + <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class> + </driver> + <driver name="mariadb" module="mariadb"> + <xa-datasource-class>org.mariadb.jdbc.MySQLDataSource</xa-datasource-class> + </driver> + </drivers> + </datasources> + </subsystem> + <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0"> + <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000" runtime-failure-causes-rollback="${jboss.deployment.scanner.rollback.on.failure:false}"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ee:4.0"> + <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement> + <concurrent> + <context-services> + <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/> + </context-services> + <managed-thread-factories> + <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/> + </managed-thread-factories> + <managed-executor-services> + <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" keepalive-time="5000"/> + </managed-executor-services> + <managed-scheduled-executor-services> + <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" keepalive-time="3000"/> + </managed-scheduled-executor-services> + </concurrent> + <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:ejb3:4.0"> + <session-bean> + <stateless> + <bean-instance-pool-ref pool-name="slsb-strict-max-pool"/> + </stateless> + <stateful default-access-timeout="5000" cache-ref="distributable" passivation-disabled-cache-ref="simple"/> + <singleton default-access-timeout="5000"/> + </session-bean> + <mdb> + <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/> + <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> + </mdb> + <pools> + <bean-instance-pools> + <strict-max-pool name="slsb-strict-max-pool" derive-size="from-worker-pools" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + <strict-max-pool name="mdb-strict-max-pool" derive-size="from-cpu-count" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/> + </bean-instance-pools> + </pools> + <caches> + <cache name="simple"/> + <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/> + </caches> + <passivation-stores> + <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/> + </passivation-stores> + <async thread-pool-name="default"/> + <timer-service thread-pool-name="default" default-data-store="default-file-store"> + <data-stores> + <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/> + </data-stores> + </timer-service> + <remote connector-ref="http-remoting-connector" thread-pool-name="default"/> + <thread-pools> + <thread-pool name="default"> + <max-threads count="10"/> + <keepalive-time time="100" unit="milliseconds"/> + </thread-pool> + </thread-pools> + <iiop enable-by-default="false" use-qualified-name="false"/> + <default-security-domain value="other"/> + <default-missing-method-permissions-deny-access value="true"/> + <log-system-exceptions value="true"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:io:1.1"> + <worker name="default"/> + <buffer-pool name="default"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:infinispan:4.0"> + <cache-container name="server" aliases="singleton cluster" default-cache="default" module="org.wildfly.clustering.server"> + <transport lock-timeout="60000"/> + <replicated-cache name="default" mode="SYNC"> + <transaction mode="BATCH"/> + </replicated-cache> + </cache-container> + <cache-container name="web" default-cache="dist" module="org.wildfly.clustering.web.infinispan"> + <transport lock-timeout="60000"/> + <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2"> + <locking isolation="REPEATABLE_READ"/> + <transaction mode="BATCH"/> + <file-store/> + </distributed-cache> + <distributed-cache name="concurrent" mode="SYNC" l1-lifespan="0" owners="2"> + <file-store/> + </distributed-cache> + </cache-container> + <cache-container name="ejb" aliases="sfsb" default-cache="dist" module="org.wildfly.clustering.ejb.infinispan"> + <transport lock-timeout="60000"/> + <distributed-cache name="dist" mode="ASYNC" l1-lifespan="0" owners="2"> + <locking isolation="REPEATABLE_READ"/> + <transaction mode="BATCH"/> + <file-store/> + </distributed-cache> + </cache-container> + <cache-container name="hibernate" default-cache="local-query" module="org.hibernate.infinispan"> + <transport lock-timeout="60000"/> + <local-cache name="local-query"> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </local-cache> + <invalidation-cache name="entity" mode="SYNC"> + <transaction mode="NON_XA"/> + <eviction strategy="LRU" max-entries="10000"/> + <expiration max-idle="100000"/> + </invalidation-cache> + <replicated-cache name="timestamps" mode="ASYNC"/> + </cache-container> + </subsystem> + <subsystem xmlns="urn:jboss:domain:iiop-openjdk:1.0"> + <orb socket-binding="iiop" ssl-socket-binding="iiop-ssl"/> + <initializers security="identity" transactions="spec"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/> + <subsystem xmlns="urn:jboss:domain:jca:4.0"> + <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/> + <bean-validation enabled="true"/> + <default-workmanager> + <short-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </short-running-threads> + <long-running-threads> + <core-threads count="50"/> + <queue-length count="50"/> + <max-threads count="50"/> + <keepalive-time time="10" unit="seconds"/> + </long-running-threads> + </default-workmanager> + <cached-connection-manager/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jdr:1.0"/> + <subsystem xmlns="urn:jboss:domain:jgroups:4.0"> + <channels default="ee"> + <channel name="ee" stack="udp"/> + </channels> + <stacks> + <stack name="udp"> + <transport type="UDP" socket-binding="jgroups-udp"/> + <protocol type="PING"/> + <protocol type="MERGE3"/> + <protocol type="FD_SOCK" socket-binding="jgroups-udp-fd"/> + <protocol type="FD_ALL"/> + <protocol type="VERIFY_SUSPECT"/> + <protocol type="pbcast.NAKACK2"/> + <protocol type="UNICAST3"/> + <protocol type="pbcast.STABLE"/> + <protocol type="pbcast.GMS"/> + <protocol type="UFC"/> + <protocol type="MFC"/> + <protocol type="FRAG2"/> + </stack> + <stack name="tcp"> + <transport type="TCP" socket-binding="jgroups-tcp"/> + <protocol type="MPING" socket-binding="jgroups-mping"/> + <protocol type="MERGE3"/> + <protocol type="FD_SOCK" socket-binding="jgroups-tcp-fd"/> + <protocol type="FD"/> + <protocol type="VERIFY_SUSPECT"/> + <protocol type="pbcast.NAKACK2"/> + <protocol type="UNICAST3"/> + <protocol type="pbcast.STABLE"/> + <protocol type="pbcast.GMS"/> + <protocol type="MFC"/> + <protocol type="FRAG2"/> + </stack> + </stacks> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jmx:1.3"> + <expose-resolved-model/> + <expose-expression-model/> + <remoting-connector/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jpa:1.1"> + <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:jsf:1.0"/> + <subsystem xmlns="urn:jboss:domain:jsr77:1.0"/> + <subsystem xmlns="urn:jboss:domain:mail:2.0"> + <mail-session name="default" jndi-name="java:jboss/mail/Default"> + <smtp-server outbound-socket-binding-ref="mail-smtp"/> + </mail-session> + </subsystem> + <subsystem xmlns="urn:jboss:domain:messaging-activemq:1.0"> + <server name="default"> + <cluster password="${jboss.messaging.cluster.password:CHANGE ME!!}"/> + <security-setting name="#"> + <role name="guest" send="true" consume="true" create-non-durable-queue="true" delete-non-durable-queue="true"/> + </security-setting> + <address-setting name="#" dead-letter-address="jms.queue.DLQ" expiry-address="jms.queue.ExpiryQueue" max-size-bytes="10485760" page-size-bytes="2097152" message-counter-history-day-limit="10" redistribution-delay="1000"/> + <http-connector name="http-connector" socket-binding="http" endpoint="http-acceptor"/> + <http-connector name="http-connector-throughput" socket-binding="http" endpoint="http-acceptor-throughput"> + <param name="batch-delay" value="50"/> + </http-connector> + <in-vm-connector name="in-vm" server-id="0"/> + <http-acceptor name="http-acceptor" http-listener="default"/> + <http-acceptor name="http-acceptor-throughput" http-listener="default"> + <param name="batch-delay" value="50"/> + <param name="direct-deliver" value="false"/> + </http-acceptor> + <in-vm-acceptor name="in-vm" server-id="0"/> + <broadcast-group name="bg-group1" jgroups-channel="activemq-cluster" connectors="http-connector"/> + <discovery-group name="dg-group1" jgroups-channel="activemq-cluster"/> + <cluster-connection name="my-cluster" address="jms" connector-name="http-connector" discovery-group="dg-group1"/> + <jms-queue name="ExpiryQueue" entries="java:/jms/queue/ExpiryQueue"/> + <jms-queue name="DLQ" entries="java:/jms/queue/DLQ"/> + <connection-factory name="InVmConnectionFactory" entries="java:/ConnectionFactory" connectors="in-vm"/> + <connection-factory name="RemoteConnectionFactory" entries="java:jboss/exported/jms/RemoteConnectionFactory" connectors="http-connector" ha="true" block-on-acknowledge="true" reconnect-attempts="-1"/> + <pooled-connection-factory name="activemq-ra" entries="java:/JmsXA java:jboss/DefaultJMSConnectionFactory" connectors="in-vm" transaction="xa"/> + </server> + </subsystem> + <subsystem xmlns="urn:jboss:domain:modcluster:2.0"> + <mod-cluster-config advertise-socket="modcluster" connector="ajp"> + <dynamic-load-provider> + <load-metric type="cpu"/> + </dynamic-load-provider> + </mod-cluster-config> + </subsystem> + <subsystem xmlns="urn:jboss:domain:naming:2.0"> + <remote-naming/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:pojo:1.0"/> + <subsystem xmlns="urn:jboss:domain:remoting:3.0"> + <endpoint/> + <http-connector name="http-remoting-connector" connector-ref="default" security-realm="ApplicationRealm"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:resource-adapters:4.0"/> + <subsystem xmlns="urn:jboss:domain:request-controller:1.0"/> + <subsystem xmlns="urn:jboss:domain:sar:1.0"/> + <subsystem xmlns="urn:jboss:domain:security-manager:1.0"> + <deployment-permissions> + <maximum-set> + <permission class="java.security.AllPermission"/> + </maximum-set> + </deployment-permissions> + </subsystem> + <subsystem xmlns="urn:jboss:domain:security:1.2"> + <security-domains> + <security-domain name="other" cache-type="default"> + <authentication> + <login-module code="Remoting" flag="optional"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + <login-module code="RealmDirect" flag="required"> + <module-option name="password-stacking" value="useFirstPass"/> + </login-module> + </authentication> + </security-domain> + <security-domain name="jboss-web-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jboss-ejb-policy" cache-type="default"> + <authorization> + <policy-module code="Delegating" flag="required"/> + </authorization> + </security-domain> + <security-domain name="jaspitest" cache-type="default"> + <authentication-jaspi> + <login-module-stack name="dummy"> + <login-module code="Dummy" flag="optional"/> + </login-module-stack> + <auth-module code="Dummy"/> + </authentication-jaspi> + </security-domain> + </security-domains> + </subsystem> + <subsystem xmlns="urn:jboss:domain:singleton:1.0"> + <singleton-policies default="default"> + <singleton-policy name="default" cache-container="server"> + <simple-election-policy/> + </singleton-policy> + </singleton-policies> + </subsystem> + <subsystem xmlns="urn:jboss:domain:transactions:3.0"> + <core-environment> + <process-id> + <uuid/> + </process-id> + </core-environment> + <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:undertow:3.1"> + <buffer-cache name="default"/> + <server name="default-server"> + <ajp-listener name="ajp" socket-binding="ajp"/> + <http-listener name="default" socket-binding="http" enable-http2="true"/> + <https-listener name="https" socket-binding="https" security-realm="ApplicationRealm" enable-http2="true"/> + <host name="default-host" alias="localhost"> + <location name="/" handler="welcome-content"/> + <filter-ref name="server-header"/> + <filter-ref name="x-powered-by-header"/> + </host> + </server> + <servlet-container name="default"> + <jsp-config/> + <websockets/> + </servlet-container> + <handlers> + <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/> + </handlers> + <filters> + <response-header name="server-header" header-name="Server" header-value="WildFly/10"/> + <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/> + </filters> + </subsystem> + <subsystem xmlns="urn:jboss:domain:webservices:2.0"> + <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host> + <endpoint-config name="Standard-Endpoint-Config"/> + <endpoint-config name="Recording-Endpoint-Config"> + <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM"> + <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/> + </pre-handler-chain> + </endpoint-config> + <client-config name="Standard-Client-Config"/> + </subsystem> + <subsystem xmlns="urn:jboss:domain:weld:3.0"/> + </profile> + + <interfaces> + <interface name="management"> + <inet-address value="${jboss.bind.address.management:127.0.0.1}"/> + </interface> + <interface name="public"> + <inet-address value="${jboss.bind.address:127.0.0.1}"/> + </interface> + <interface name="private"> + <inet-address value="${jboss.bind.address.private:127.0.0.1}"/> + </interface> + <interface name="unsecure"> + <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/> + </interface> + </interfaces> + + <socket-binding-group name="standard-sockets" default-interface="public" port-offset="${jboss.socket.binding.port-offset:0}"> + <socket-binding name="management-http" interface="management" port="${jboss.management.http.port:9990}"/> + <socket-binding name="management-https" interface="management" port="${jboss.management.https.port:9993}"/> + <socket-binding name="ajp" port="${jboss.ajp.port:8009}"/> + <socket-binding name="http" port="${jboss.http.port:8080}"/> + <socket-binding name="https" port="${jboss.https.port:8443}"/> + <socket-binding name="iiop" interface="unsecure" port="3528"/> + <socket-binding name="iiop-ssl" interface="unsecure" port="3529"/> + <socket-binding name="jgroups-mping" interface="private" port="0" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45700"/> + <socket-binding name="jgroups-tcp" interface="private" port="7600"/> + <socket-binding name="jgroups-tcp-fd" interface="private" port="57600"/> + <socket-binding name="jgroups-udp" interface="private" port="55200" multicast-address="${jboss.default.multicast.address:230.0.0.4}" multicast-port="45688"/> + <socket-binding name="jgroups-udp-fd" interface="private" port="54200"/> + <socket-binding name="modcluster" port="0" multicast-address="224.0.1.105" multicast-port="23364"/> + <socket-binding name="txn-recovery-environment" port="4712"/> + <socket-binding name="txn-status-manager" port="4713"/> + <outbound-socket-binding name="mail-smtp"> + <remote-destination host="localhost" port="25"/> + </outbound-socket-binding> + </socket-binding-group> + +</server> diff --git a/kubernetes/mso/resources/config/mso/mso-docker.json b/kubernetes/mso/resources/config/mso/mso-docker.json index 257f5a4e41..b2775590a6 100755 --- a/kubernetes/mso/resources/config/mso/mso-docker.json +++ b/kubernetes/mso/resources/config/mso/mso-docker.json @@ -9,9 +9,9 @@ "mso-api-handler-infra-config": { - "bpelURL": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080", + "bpelURL": "http://localhost:8080", "bpelAuth": "786864AA53D0DCD881AED1154230C0C3058D58B9339D2EFB6193A0F0D82530E1", - "camundaURL": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080", + "camundaURL": "http://localhost:8080", "camundaAuth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1" }, @@ -23,7 +23,7 @@ "consumerGroup": "sdc-OpenSource-Env1", "consumerId": "sdc-COpenSource-Env11", "environmentName": "{{ .Values.dmaapTopic }}", - "asdcAddress": "sdc-be.onap-sdc.svc.cluster.local:8443", + "asdcAddress": "sdc-be.{{.Values.nsPrefix}}:8443", "password": "613AF3483E695524F9857643B697FA51C7A9A0951094F53791485BF3458F9EADA37DBACCCEBD0CB242B85B4062745247", "pollingInterval": 60, "pollingTimeout": 60, @@ -38,20 +38,20 @@ { "sdncurls": [ - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/L3SDN-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/config/L3SDN-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/Firewall-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/config", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/VNF-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/NBNC-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/NORTHBOUND-API:service-topology-operation", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/GENERIC-RESOURCE-API:", - "http://sdnhost.{{ .Values.nsPrefix }}-sdnc.svc.cluster.local:8282/restconf/operations/VNFTOPOLOGYAIC-API:" + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/L3SDN-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/config/L3SDN-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/Firewall-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/config", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/VNF-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/NBNC-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/NORTHBOUND-API:service-topology-operation", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/GENERIC-RESOURCE-API:", + "http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/VNFTOPOLOGYAIC-API:" ], - "bpelurl": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService", - "restbpelurl": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", - "myurl": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/adapters/rest/SDNCNotify", + "bpelurl": "http://localhost:8080/mso/SDNCAdapterCallbackService", + "restbpelurl": "http://localhost:8080/mso/WorkflowMessage", + "myurl": "http://localhost:8080/adapters/rest/SDNCNotify", "sdncauth": "263f7d5f944d4d0c76db74b4148bec67d0bc796a874bc0d2a2a12aae89a866aa69133f700f391f784719a37f6a68d29bf5a2fbae1dab0402db7788c800c5ba73", "bpelauth": "5119D1AF37F671FC01FFAD2151D93EFB2BBB503E879FD07104D024EDDF118FD1", "sdncconnecttime": "5000" @@ -92,7 +92,7 @@ "mso-workflow-message-adapter-config": { - "wmbpelurl": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", + "wmbpelurl": "http://localhost: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.{{ .Values.nsPrefix }}-mock.svc.cluster.local:8080/sniro/api/v2/placement", + "sniroEndpoint": "http://sniro-emulator.{{.Values.nsPrefix}}:8080/sniro/api/v2/placement", "sniroTimeout": "PT30M", - "serviceAgnosticSniroHost": "http://sniro-emulator.{{ .Values.nsPrefix }}-mock.svc.cluster.local:8080", + "serviceAgnosticSniroHost": "http://sniro-emulator.{{.Values.nsPrefix}}:8080", "serviceAgnosticSniroEndpoint": "/sniro/api/v2/placement", - "aaiEndpoint": "https://aai-service.{{ .Values.nsPrefix }}-aai.svc.cluster.local:8443", + "aaiEndpoint": "https://aai-service.{{.Values.nsPrefix}}:8443", "aaiAuth": "2630606608347B7124C244AB0FE34F6F", "adaptersNamespace": "http://org.openecomp.mso", - "adaptersCompletemsoprocessEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/CompleteMsoProcess", - "adaptersDbEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/dbadapters/MsoRequestsDbAdapter", - "adaptersOpenecompDbEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/dbadapters/RequestsDbAdapter", - "catalogDbEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/ecomp/mso/catalog", - "adaptersSdncEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/adapters/SDNCAdapter", - "adaptersSdncRestEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/adapters/rest/v1/sdnc", - "adaptersTenantEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/tenants/TenantAdapter", + "adaptersCompletemsoprocessEndpoint": "http://localhost:8080/CompleteMsoProcess", + "adaptersDbEndpoint": "http://localhost:8080/dbadapters/MsoRequestsDbAdapter", + "adaptersOpenecompDbEndpoint": "http://localhost:8080/dbadapters/RequestsDbAdapter", + "catalogDbEndpoint": "http://localhost:8080/ecomp/mso/catalog", + "adaptersSdncEndpoint": "http://localhost:8080/adapters/SDNCAdapter", + "adaptersSdncRestEndpoint": "http://localhost:8080/adapters/rest/v1/sdnc", + "adaptersTenantEndpoint": "http://localhost:8080/tenants/TenantAdapter", "adaptersDbAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", - "adaptersWorkflowMessageEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/workflows/messages/message", - "workflowMessageEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/WorkflowMessage", - "workflowSdncAdapterCallback": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/SDNCAdapterCallbackService", + "adaptersWorkflowMessageEndpoint": "http://localhost:8080/workflows/messages/message", + "workflowMessageEndpoint": "http://localhost:8080/mso/WorkflowMessage", + "workflowSdncAdapterCallback": "http://localhost:8080/mso/SDNCAdapterCallbackService", "workflowSdncReplicationDelay": "PT5S", "workflowAaiDistributionDelay": "PT30S", "msoKey": "07a7159d3bf51a0e53be7a8f89699be7", "adaptersPoAuth": "6B0E6863FB8EE010AB6F191B3C0489437601E81DC7C86305CB92DB98AFC53D74", "sdncTimeout": "PT5M", "rollback": "true", - "adaptersNetworkEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/networks/NetworkAdapter", - "adaptersNetworkRestEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/networks/rest/v1/networks", - "adaptersVnfAsyncEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/vnfs/VnfAdapterAsync", - "workflowVnfAdapterDeleteCallback": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify", - "workflowVnfAdapterCreateCallback": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/vnfAdapterNotify", - "adaptersVnfRestEndpoint": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/vnfs/rest/v1/vnfs", - "workflowVnfAdapterRestCallback": "http://mso.{{ .Values.nsPrefix }}-mso.svc.cluster.local:8080/mso/vnfAdapterRestNotify", + "adaptersNetworkEndpoint": "http://localhost:8080/networks/NetworkAdapter", + "adaptersNetworkRestEndpoint": "http://localhost:8080/networks/rest/v1/networks", + "adaptersVnfAsyncEndpoint": "http://localhost:8080/vnfs/VnfAdapterAsync", + "workflowVnfAdapterDeleteCallback": "http://localhost:8080/mso/vnfAdapterNotify", + "workflowVnfAdapterCreateCallback": "http://localhost:8080/mso/vnfAdapterNotify", + "adaptersVnfRestEndpoint": "http://localhost:8080/vnfs/rest/v1/vnfs", + "workflowVnfAdapterRestCallback": "http://localhost:8080/mso/vnfAdapterRestNotify", "poTimeout": "PT5M", "sdncFirewallYangModel": "http://com/att/svc/mis/firewall-lite-gui", "sdncFirewallYangModelVersion": "2015-05-15", diff --git a/kubernetes/mso/templates/all-services.yaml b/kubernetes/mso/templates/all-services.yaml index 44e47c10fc..6eefe65cff 100644 --- a/kubernetes/mso/templates/all-services.yaml +++ b/kubernetes/mso/templates/all-services.yaml @@ -2,17 +2,17 @@ apiVersion: v1 kind: Service metadata: - name: mariadb - namespace: "{{ .Values.nsPrefix }}-mso" + name: mso-mariadb + namespace: "{{ .Values.nsPrefix }}" labels: - app: mariadb + app: mso-mariadb spec: ports: - - port: 3306 - nodePort: {{ .Values.nodePortPrefix }}52 + - port: 3306 + name: mso-mariadb-3306 selector: - app: mariadb - type: NodePort + app: mso-mariadb + clusterIP: None #{{ end }} #{{ if not .Values.disableMsoMso }} --- @@ -20,7 +20,7 @@ apiVersion: v1 kind: Service metadata: name: mso - namespace: "{{ .Values.nsPrefix }}-mso" + namespace: "{{ .Values.nsPrefix }}" labels: app: mso annotations: @@ -63,4 +63,4 @@ spec: port: 8787 nodePort: {{ .Values.nodePortPrefix }}50 type: NodePort -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/mso/templates/db-deployment-configmap.yaml b/kubernetes/mso/templates/db-deployment-configmap.yaml index ac3c3bf591..51c106cc78 100644 --- a/kubernetes/mso/templates/db-deployment-configmap.yaml +++ b/kubernetes/mso/templates/db-deployment-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-confd-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/conf.d/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-docker-entry-initd-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/*").AsConfig . | indent 2 }} --- @@ -19,7 +19,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-automated-tests-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/automated-tests/*").AsConfig . | indent 2 }} --- @@ -27,7 +27,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-bulkload-default-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/default/*").AsConfig . | indent 2 }} --- @@ -35,7 +35,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-demo-dns-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-dns/*").AsConfig . | indent 2 }} --- @@ -43,7 +43,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-demo-vfw-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/bulkload-files/demo-vfw/*").AsConfig . | indent 2 }} --- @@ -51,7 +51,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-scripts-camunda-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/camunda/*").AsConfig . | indent 2 }} --- @@ -59,7 +59,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-main-schemas-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/docker-entrypoint-initdb.d/db-sql-scripts/main-schemas/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/mso/templates/db-deployment.yaml b/kubernetes/mso/templates/db-deployment.yaml index cc4c656a04..a906c1c413 100644 --- a/kubernetes/mso/templates/db-deployment.yaml +++ b/kubernetes/mso/templates/db-deployment.yaml @@ -2,25 +2,25 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: mariadb - namespace: "{{ .Values.nsPrefix }}-mso" + name: mso-mariadb + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dbReplicas }} selector: matchLabels: - app: mariadb + app: mso-mariadb template: metadata: labels: - app: mariadb - name: mariadb + app: mso-mariadb + name: mso-mariadb spec: - hostname: mariadb + hostname: mso-mariadb containers: - args: image: {{ .Values.image.mariadb }} imagePullPolicy: {{ .Values.pullPolicy }} - name: "mariadb" + name: "mso-mariadb" env: - name: MYSQL_ROOT_PASSWORD value: password @@ -52,7 +52,7 @@ spec: name: mso-mariadb-data ports: - containerPort: 3306 - name: mariadb + name: mso-mariadb readinessProbe: tcpSocket: port: 3306 diff --git a/kubernetes/mso/templates/mso-deployment-configmap.yaml b/kubernetes/mso/templates/mso-deployment-configmap.yaml index 55b9f8165f..15c6141baf 100644 --- a/kubernetes/mso/templates/mso-deployment-configmap.yaml +++ b/kubernetes/mso/templates/mso-deployment-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-config-mso-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mso/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,15 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-docker-file-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/docker-files/scripts/start-jboss-server.sh").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: mso-jboss-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/mso/jboss/standalone-full-ha-mso.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/mso/templates/mso-deployment.yaml b/kubernetes/mso/templates/mso-deployment.yaml index b4146401c4..2e5497c22c 100644 --- a/kubernetes/mso/templates/mso-deployment.yaml +++ b/kubernetes/mso/templates/mso-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: mso - namespace: "{{ .Values.nsPrefix }}-mso" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.msoReplicas }} selector: @@ -20,7 +20,7 @@ spec: - /root/ready.py args: - --container-name - - mariadb + - mso-mariadb env: - name: NAMESPACE valueFrom: @@ -45,6 +45,9 @@ spec: - mountPath: /tmp/start-jboss-server.sh name: mso-docker-files subPath: start-jboss-server.sh + - mountPath: /opt/jboss/standalone/configuration/standalone-full-ha-mso.xml + name: mso-jboss-config + subPath: standalone-full-ha-mso.xml - mountPath: /var/log/onap name: mso-logs - mountPath: /var/berks-cookbooks/mso-config/files/default/mso-po-adapter-config/logback.network.xml @@ -139,6 +142,9 @@ spec: - key: start-jboss-server.sh path: start-jboss-server.sh mode: 0755 + - name: mso-jboss-config + configMap: + name: mso-jboss-configmap imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/mso/templates/mso-log-configmap.yaml b/kubernetes/mso/templates/mso-log-configmap.yaml index 3bf84128fc..273c22f533 100644 --- a/kubernetes/mso/templates/mso-log-configmap.yaml +++ b/kubernetes/mso/templates/mso-log-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-log-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: mso-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-mso + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/mso/templates/mso-pv-pvc.yaml b/kubernetes/mso/templates/mso-pv-pvc.yaml index af42c013bc..04f5c60832 100644 --- a/kubernetes/mso/templates/mso-pv-pvc.yaml +++ b/kubernetes/mso/templates/mso-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-mso-db" - namespace: "{{ .Values.nsPrefix }}-mso" + name: "{{ .Values.nsPrefix }}-mso" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-mso-db" + name: "{{ .Values.nsPrefix }}-mso" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: mso-db - namespace: "{{ .Values.nsPrefix }}-mso" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-mso-db" + name: "{{ .Values.nsPrefix }}-mso" #{{ end }} diff --git a/kubernetes/multicloud/templates/all-services.yaml b/kubernetes/multicloud/templates/all-services.yaml index 09a90d0eca..58e67e03d1 100644 --- a/kubernetes/multicloud/templates/all-services.yaml +++ b/kubernetes/multicloud/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: framework - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: framework annotations: @@ -32,7 +32,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-vio - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-vio annotations: @@ -62,7 +62,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-ocata - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-ocata annotations: @@ -92,7 +92,7 @@ apiVersion: v1 kind: Service metadata: name: multicloud-windriver - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" labels: name: multicloud-windriver annotations: diff --git a/kubernetes/multicloud/templates/framework-deployment.yaml b/kubernetes/multicloud/templates/framework-deployment.yaml index f585b04787..dcdf0a2d75 100644 --- a/kubernetes/multicloud/templates/framework-deployment.yaml +++ b/kubernetes/multicloud/templates/framework-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: framework - namespace: "{{ .Values.nsPrefix }}-multicloud" + name: multicloud-framework + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -12,17 +12,17 @@ spec: metadata: labels: app: framework - name: framework + name: multicloud-framework spec: hostname: framework containers: - env: - name: MSB_ADDR - value: {{ .Values.msbgateway }} + value: {{ tpl .Values.msbgateway . }} - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml index 9999b5585d..a8bc983d11 100644 --- a/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-ocata-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-ocata - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml index c5efdae559..df99542051 100644 --- a/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-vio-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-vio - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml index c482aea7fd..2298bee2f2 100644 --- a/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml +++ b/kubernetes/multicloud/templates/multicloud-windriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: multicloud-windriver - namespace: "{{ .Values.nsPrefix }}-multicloud" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -18,11 +18,11 @@ spec: containers: - env: - name: MSB_ADDR - value: "{{ .Values.msbgateway }}" + value: "{{ tpl .Values.msbgateway . }}" - name: MSB_PORT value: "{{ .Values.msbPort }}" - name: AAI_ADDR - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: AAI_PORT value: "8443" - name: AAI_SCHEMA_VERSION diff --git a/kubernetes/multicloud/values.yaml b/kubernetes/multicloud/values.yaml index 5d9144a146..2dc24b24fe 100644 --- a/kubernetes/multicloud/values.yaml +++ b/kubernetes/multicloud/values.yaml @@ -10,5 +10,5 @@ image: windriver: nexus3.onap.org:10001/onap/multicloud/openstack-windriver:v1.0.0 # domain name of msb gateway -msbgateway: msb-iag.onap-msb +msbgateway: msb-iag.{{ .Values.nsPrefix }} msbPort: 80 diff --git a/kubernetes/oneclick/createAll.bash b/kubernetes/oneclick/createAll.bash index 5a99b19623..b7d6a64ffb 100755 --- a/kubernetes/oneclick/createAll.bash +++ b/kubernetes/oneclick/createAll.bash @@ -27,19 +27,20 @@ check_return_code(){ } create_service_account() { - cmd=`echo kubectl create clusterrolebinding $1-$2-admin-binding --clusterrole=cluster-admin --serviceaccount=$1-$2:default` +# cmd=`echo kubectl create clusterrolebinding $1-$2-admin-binding --clusterrole=cluster-admin --serviceaccount=$1-$2:default` + cmd=`echo kubectl create clusterrolebinding $1-$2-admin-binding --clusterrole=cluster-admin --serviceaccount=$1:default` eval ${cmd} check_return_code $cmd } create_namespace() { - cmd=`echo kubectl create namespace $1-$2` + cmd=`echo kubectl create namespace $1` eval ${cmd} - check_return_code $cmd } create_registry_key() { - cmd=`echo kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7` +# cmd=`echo kubectl --namespace $1-$2 create secret docker-registry $3 --docker-server=$4 --docker-username=$5 --docker-password=$6 --docker-email=$7` +cmd=`echo kubectl --namespace $1 create secret docker-registry $2 --docker-server=$3 --docker-username=$4 --docker-password=$5 --docker-email=$6` eval ${cmd} check_return_code $cmd } @@ -86,8 +87,8 @@ create_onap_helm() { # assign default auth token if [[ -z $ONAP_DEFAULT_AUTH_TOKEN ]]; then - DEFAULT_SECRET=`kubectl get secrets -n $1-$2 | grep default-token | awk '{ print $1}'` - ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n $1-$2 -o yaml | grep 'token:' | awk '{ print $2}' | base64 --decode` + DEFAULT_SECRET=`kubectl get secrets -n $1 | grep default-token | awk '{ print $1}'` + ONAP_DEFAULT_AUTH_TOKEN=`kubectl get secrets $DEFAULT_SECRET -n $1 -o yaml | grep 'token:' | awk '{ print $2}' | base64 --decode` fi cmd=`echo helm install $LOCATION/$2/ --name $1-$2 --namespace $1 --set nsPrefix=$1,nodePortPrefix=$3,kubeMasterAuthToken=$ONAP_DEFAULT_AUTH_TOKEN ${HELM_VALUES_ADDITION}` @@ -106,6 +107,8 @@ MAX_INSTANCE=5 DU=$ONAP_DOCKER_USER DP=$ONAP_DOCKER_PASS +SINGLE_COMPONENT=false + while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do case $PARAM in u) @@ -125,6 +128,7 @@ while getopts ":n:u:s:i:a:du:dp:l:v:" PARAM; do LOCATION=${OPTARG} ;; a) + SINGLE_COMPONENT=true APP=${OPTARG} if [[ -z $APP ]]; then usage @@ -168,19 +172,22 @@ printf "\n********** Creating instance ${INSTANCE} of ONAP with port range ${sta printf "\n********** Creating ONAP: ${ONAP_APPS[*]}\n" +if [ "$SINGLE_COMPONENT" == "false" ] +then + printf "\nCreating namespace **********\n" + create_namespace $NS + + printf "\nCreating registry secret **********\n" + create_registry_key $NS ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL +fi printf "\n\n********** Creating deployments for ${HELM_APPS[*]} ********** \n" for i in ${HELM_APPS[@]}; do - printf "\nCreating namespace **********\n" - create_namespace $NS $i printf "\nCreating service account **********\n" create_service_account $NS $i - printf "\nCreating registry secret **********\n" - create_registry_key $NS $i ${NS}-docker-registry-key $ONAP_DOCKER_REGISTRY $DU $DP $ONAP_DOCKER_MAIL - printf "\nCreating deployments and services **********\n" create_onap_helm $NS $i $start diff --git a/kubernetes/oneclick/deleteAll.bash b/kubernetes/oneclick/deleteAll.bash index 53f1d1a9cb..52748bc933 100755 --- a/kubernetes/oneclick/deleteAll.bash +++ b/kubernetes/oneclick/deleteAll.bash @@ -3,8 +3,7 @@ . $(dirname "$0")/setenv.bash delete_namespace() { - _NS=$1-$2 - kubectl delete namespace $_NS + kubectl delete namespace $1 } delete_service_account() { @@ -25,13 +24,18 @@ wait_terminate() { while true; do declare -i _STATUS=0 for i in ${HELM_APPS[@]}; do - kubectl get namespaces $1-$i > /dev/null 2>&1 - if [ "$?" -eq "0" ]; then + kubectl get pods --namespace $1 | grep -w " $i" > /dev/null 2>&1 + if [ "$?" -ne "0" ]; then _STATUS=1 break fi done - if [ "$_STATUS" -eq "0" ]; then + + if [ "$SINGLE_COMPONENT" == "false" ]; then + kubectl get namespaces $1 > /dev/null 2>&1 + _STATUS=$? + fi + if [ "$_STATUS" -ne "0" ]; then break fi sleep 2 @@ -60,7 +64,7 @@ APP= WAIT_TERMINATE=true SKIP_INTERACTIVE_CONFIRMATION=no KUBECTL_CONTEXT= - +SINGLE_COMPONENT=false while getopts ":c:n:u:s:a:yN" PARAM; do case $PARAM in u) @@ -76,6 +80,7 @@ while getopts ":c:n:u:s:a:yN" PARAM; do usage exit 1 fi + SINGLE_COMPONENT=true ;; N) WAIT_TERMINATE=false @@ -128,15 +133,15 @@ fi printf "\n********** Cleaning up ONAP: ${ONAP_APPS[*]}\n" for i in ${HELM_APPS[@]}; do - delete_app_helm $NS $i - delete_namespace $NS $i delete_service_account $NS $i - done -delete_app_helm $NS "config" -kubectl delete namespace $NS +if [ "$SINGLE_COMPONENT" == "false" ] +then + delete_app_helm $NS "config" + delete_namespace $NS +fi if $WAIT_TERMINATE; then wait_terminate $NS diff --git a/kubernetes/policy/resources/config/log/filebeat/filebeat.yml b/kubernetes/policy/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/policy/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/policy/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/policy/resources/config/opt/policy/config/drools/base.conf b/kubernetes/policy/resources/config/opt/policy/config/drools/base.conf index 4f904444f7..e5bbd6637d 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/drools/base.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/drools/base.conf @@ -43,14 +43,14 @@ repositoryPassword=admin123 # Relational (SQL) DB access -SQL_HOST=mariadb.onap-policy +SQL_HOST=mariadb.{{.Values.nsPrefix}} SQL_USER=policy_user SQL_PASSWORD=policy_user # PDP-D DMaaP configuration channel PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION -PDPD_CONFIGURATION_SERVERS=dmaap.onap-message-router +PDPD_CONFIGURATION_SERVERS=dmaap.{{.Values.nsPrefix}} PDPD_CONFIGURATION_API_KEY= PDPD_CONFIGURATION_API_SECRET= PDPD_CONFIGURATION_CONSUMER_GROUP= @@ -59,13 +59,13 @@ PDPD_CONFIGURATION_PARTITION_KEY= # PAP -PAP_HOST=pap.onap-policy +PAP_HOST=pap.{{.Values.nsPrefix}} PAP_USERNAME=testpap PAP_PASSWORD=alpha123 # PDP-X -PDP_HOST=pdp.onap-policy +PDP_HOST=pdp.{{.Values.nsPrefix}} PDP_USERNAME=testpdp PDP_PASSWORD=alpha123 PDP_CLIENT_USERNAME=python @@ -75,11 +75,11 @@ PDP_ENVIRONMENT=TEST # DCAE DMaaP DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT -DCAE_SERVERS=dmaap.onap-message-router +DCAE_SERVERS=dmaap.{{.Values.nsPrefix}} # Open DMaaP -DMAAP_SERVERS=dmaap.onap-message-router +DMAAP_SERVERS=dmaap.{{.Values.nsPrefix}} # AAI @@ -89,7 +89,7 @@ AAI_PASSWORD=POLICY # MSO -SO_URL=http://mso.onap-mso:8080/ecomp/mso/infra +SO_URL=http://mso.{{.Values.nsPrefix}}:8080/ecomp/mso/infra SO_USERNAME=InfraPortalClient SO_PASSWORD=password1$ @@ -97,4 +97,4 @@ SO_PASSWORD=password1$ VFC_URL= VFC_USERNAME= -VFC_PASSWORD=
\ No newline at end of file +VFC_PASSWORD= diff --git a/kubernetes/policy/resources/config/opt/policy/config/drools/feature-healthcheck.conf b/kubernetes/policy/resources/config/opt/policy/config/drools/keys/feature-healthcheck.conf index 31baed21e3..31baed21e3 100644 --- a/kubernetes/policy/resources/config/opt/policy/config/drools/feature-healthcheck.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/drools/keys/feature-healthcheck.conf diff --git a/kubernetes/policy/resources/config/opt/policy/config/drools/policy-keystore b/kubernetes/policy/resources/config/opt/policy/config/drools/keys/policy-keystore Binary files differindex ab25c3a341..ab25c3a341 100644 --- a/kubernetes/policy/resources/config/opt/policy/config/drools/policy-keystore +++ b/kubernetes/policy/resources/config/opt/policy/config/drools/keys/policy-keystore diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/base.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/base.conf index 9c87d9ca72..291743157b 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/base.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/base.conf @@ -3,8 +3,8 @@ POLICY_HOME=/opt/app/policy KEYSTORE_PASSWD=PolicyR0ck$ JDBC_DRIVER=org.mariadb.jdbc.Driver -JDBC_URL=jdbc:mariadb://mariadb.onap-policy:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true -JDBC_LOG_URL=jdbc:mariadb://mariadb.onap-policy:3306/log?failOverReadOnly=false&autoReconnect=true +JDBC_URL=jdbc:mariadb://mariadb.{{.Values.nsPrefix}}:3306/onap_sdk?failOverReadOnly=false&autoReconnect=true +JDBC_LOG_URL=jdbc:mariadb://mariadb.{{.Values.nsPrefix}}:3306/log?failOverReadOnly=false&autoReconnect=true JDBC_USER=policy_user JDBC_PASSWORD=policy_user @@ -21,4 +21,4 @@ ENVIRONMENT=TEST #Micro Service Model Properties policy_msOnapName= -policy_msPolicyName=
\ No newline at end of file +policy_msPolicyName= diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/brmsgw.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/brmsgw.conf index ff4d2e487d..d874237575 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/brmsgw.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/brmsgw.conf @@ -4,8 +4,8 @@ BRMSGW_JMX_PORT=9989 COMPONENT_X_MX_MB=1024 COMPONENT_X_MS_MB=1024 -REST_PAP_URL=http://pap.onap-policy:9091/pap/ -REST_PDP_ID=http://pdp.onap-policy:8081/pdp/ +REST_PAP_URL=http://pap.{{.Values.nsPrefix}}:9091/pap/ +REST_PDP_ID=http://pdp.{{.Values.nsPrefix}}:8081/pdp/ PDP_HTTP_USER_ID=testpdp PDP_HTTP_PASSWORD=alpha123 @@ -15,13 +15,13 @@ PDP_PAP_PDP_HTTP_PASSWORD=alpha123 M2_HOME=/usr/share/maven snapshotRepositoryID=policy-nexus-snapshots snapshotRepositoryName=Snapshots -snapshotRepositoryURL=http://nexus.onap-policy:8081/nexus/content/repositories/snapshots +snapshotRepositoryURL=http://nexus.{{.Values.nsPrefix}}:8081/nexus/content/repositories/snapshots releaseRepositoryID=policy-nexus-releases releaseRepositoryName=Releases -releaseRepositoryURL=http://nexus.onap-policy:8081/nexus/content/repositories/releases +releaseRepositoryURL=http://nexus.{{.Values.nsPrefix}}:8081/nexus/content/repositories/releases repositoryUsername=admin repositoryPassword=admin123 -UEB_URL=dmaap.onap-message-router +UEB_URL=dmaap.{{.Values.nsPrefix}} UEB_TOPIC=PDPD-CONFIGURATION UEB_API_KEY= UEB_API_SECRET= @@ -40,7 +40,7 @@ ENVIRONMENT=TEST #Notification Properties... type can be either websocket, ueb, or dmaap BRMS_NOTIFICATION_TYPE=websocket -BRMS_UEB_URL=dmaap.onap-message-router +BRMS_UEB_URL=dmaap.{{.Values.nsPrefix}} BRMS_UEB_TOPIC=PDPD-CONFIGURATION BRMS_UEB_DELAY= BRMS_CLIENT_ID=python diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/console.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/console.conf index 938543cb7e..3ff708655c 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/console.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/console.conf @@ -33,7 +33,7 @@ REST_ADMIN_REPOSITORY=repository # # Location where all the user workspaces are located. # -REST_ADMIN_WORKSPACE=${{POLICY_HOME}}/servers/console/bin/workspace +REST_ADMIN_WORKSPACE=/opt/app/policy/servers/console/bin/workspace # # These can be set so the Admin Console knows who is logged on. Ideally, you can run the console in a J2EE @@ -77,16 +77,16 @@ REFRESH_RATE=40000 # -REST_PAP_URL=http://pap.onap-policy:9091/pap/ +REST_PAP_URL=http://pap.{{.Values.nsPrefix}}:9091/pap/ # # Config/Action Properties location. # -REST_CONFIG_HOME=${{POLICY_HOME}}/servers/pap/webapps/Config/ -REST_ACTION_HOME=${{POLICY_HOME}}/servers/pap/webapps/Action/ -REST_CONFIG_URL=http://pap.onap-policy:9091/ -REST_CONFIG_WEBAPPS=${{POLICY_HOME}}/servers/pap/webapps/ +REST_CONFIG_HOME=/opt/app/policy/servers/pap/webapps/Config/ +REST_ACTION_HOME=/opt/app/policy/servers/pap/webapps/Action/ +REST_CONFIG_URL=http://pap.{{.Values.nsPrefix}}:9091/ +REST_CONFIG_WEBAPPS=/opt/app/policy/servers/pap/webapps/ # PAP account information CONSOLE_PAP_HTTP_USER_ID=testpap @@ -121,12 +121,12 @@ onap_application_name= #-----------------------ONAP-PORTAL-Properties---------------------- -ONAP_REDIRECT_URL=http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm -ONAP_REST_URL=http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi +ONAP_REDIRECT_URL=http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm +ONAP_REST_URL=http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi ONAP_UEB_URL_LIST= ONAP_PORTAL_INBOX_NAME= ONAP_UEB_APP_KEY= ONAP_UEB_APP_SECRET= ONAP_UEB_APP_MAILBOX_NAME= APP_DISPLAY_NAME=ONAP Policy -ONAP_SHARED_CONTEXT_REST_URL=http://portalapps.onap-portal:8989/ONAPPORTAL/context +ONAP_SHARED_CONTEXT_REST_URL=http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/context diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/pap.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/pap.conf index 53c52aaceb..3f892c9f5a 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/pap.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/pap.conf @@ -13,8 +13,8 @@ TOMCAT_X_MX_MB=1024 # pap properties -PAP_PDPS=${{POLICY_HOME}}/servers/pap/bin/pdps -PAP_URL=http://pap.onap-policy:9091/pap/ +PAP_PDPS=/opt/app/policy/servers/pap/bin/pdps +PAP_URL=http://pap.{{.Values.nsPrefix}}:9091/pap/ PAP_INITIATE_PDP=true PAP_HEARTBEAT_INTERVAL=10000 @@ -26,7 +26,7 @@ REST_ADMIN_WORKSPACE=workspace # PDP related properties -PAP_PDP_URL=http://pdp.onap-policy:8081/pdp/ +PAP_PDP_URL=http://pdp.{{.Values.nsPrefix}}:8081/pdp/ PAP_PDP_HTTP_USER_ID=testpdp PAP_PDP_HTTP_PASSWORD=alpha123 diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/paplp.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/paplp.conf index d25f11be3b..22ca8492b2 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/paplp.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/paplp.conf @@ -3,8 +3,8 @@ LOGPARSER_JMX_PORT=9996 LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 -SERVER=http://pap.onap-policy:9091/pap/ -LOGPATH=${{POLICY_HOME}}/servers/pap/logs/pap-rest.log +SERVER=http://pap.{{.Values.nsPrefix}}:9091/pap/ +LOGPATH=/opt/app/policy/servers/pap/logs/pap-rest.log PARSERLOGPATH=IntegrityMonitor.log node_type=logparser diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/pdp.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/pdp.conf index dba8af2e10..c3af2238f0 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/pdp.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/pdp.conf @@ -13,12 +13,12 @@ TOMCAT_X_MX_MB=1024 # pdp properties -UEB_CLUSTER=dmaap.onap-message-router +UEB_CLUSTER=dmaap.{{.Values.nsPrefix}} -REST_PAP_URL=http://pap.onap-policy:9091/pap/ -REST_PDP_ID=http://pdp.onap-policy:8081/pdp/ -REST_PDP_CONFIG=${{POLICY_HOME}}/servers/pdp/bin/config -REST_PDP_WEBAPPS=${{POLICY_HOME}}/servers/pdp/webapps +REST_PAP_URL=http://pap.{{.Values.nsPrefix}}:9091/pap/ +REST_PDP_ID=http://pdp.{{.Values.nsPrefix}}:8081/pdp/ +REST_PDP_CONFIG=/opt/app/policy/servers/pdp/bin/config +REST_PDP_WEBAPPS=/opt/app/policy/servers/pdp/webapps REST_PDP_REGISTER=true REST_PDP_REGISTER_SLEEP=15 REST_PDP_REGISTER_RETRIES=-1 @@ -53,4 +53,4 @@ POLICY_AAF_NAMESPACE= POLICY_AAF_RESOURCE= # Indeterminate resolution -DECISION_INDETERMINATE_RESPONSE=PERMIT
\ No newline at end of file +DECISION_INDETERMINATE_RESPONSE=PERMIT diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/pdplp.conf b/kubernetes/policy/resources/config/opt/policy/config/pe/pdplp.conf index 8320caa56b..0e58cebbc6 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/pdplp.conf +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/pdplp.conf @@ -3,8 +3,8 @@ LOGPARSER_JMX_PORT=9997 LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 -SERVER=http://pdp.onap-policy:8081/pdp/ -LOGPATH=${{POLICY_HOME}}/servers/pdp/logs/pdp-rest.log +SERVER=http://pdp.{{.Values.nsPrefix}}:8081/pdp/ +LOGPATH=/opt/app/policy/servers/pdp/logs/pdp-rest.log PARSERLOGPATH=IntegrityMonitor.log node_type=logparser diff --git a/kubernetes/policy/resources/config/opt/policy/config/pe/push-policies.sh b/kubernetes/policy/resources/config/opt/policy/config/pe/push-policies.sh index 0461731c16..b9242cee78 100755 --- a/kubernetes/policy/resources/config/opt/policy/config/pe/push-policies.sh +++ b/kubernetes/policy/resources/config/opt/policy/config/pe/push-policies.sh @@ -12,7 +12,7 @@ wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-application sleep 2 -curl -v --silent -X POST --header 'Content-Type: multipart/form-data' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -F "file=@cl-amsterdam-template.drl" -F "importParametersJson={\"serviceName\":\"ClosedLoopControlName\",\"serviceType\":\"BRMSPARAM\"}" 'http://pdp.onap-policy:8081/pdp/api/policyEngineImport' +curl -v --silent -X POST --header 'Content-Type: multipart/form-data' --header 'Accept: text/plain' --header 'ClientAuth: cHl0aG9uOnRlc3Q=' --header 'Authorization: Basic dGVzdHBkcDphbHBoYTEyMw==' --header 'Environment: TEST' -F "file=@cl-amsterdam-template.drl" -F "importParametersJson={\"serviceName\":\"ClosedLoopControlName\",\"serviceType\":\"BRMSPARAM\"}" 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/policyEngineImport' echo "PRELOAD_POLICIES is $PRELOAD_POLICIES" @@ -42,7 +42,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" } } -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' sleep 2 @@ -62,7 +62,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3%0D%0A++trigger_policy%3A+unique-policy-id-1-scale-up%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-scale-up%0D%0A++++name%3A+Create+a+new+VF+Module%0D%0A++++description%3A%0D%0A++++actor%3A+SO%0D%0A++++recipe%3A+VF+Module+Create%0D%0A++++target%3A%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" } } -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' sleep 2 @@ -82,7 +82,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-VOLTE-2179b738-fd36-4843-a71a-a8c24c70c55b%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+VFC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" } } -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' sleep 2 @@ -102,7 +102,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e%0D%0A++trigger_policy%3A+unique-policy-id-1-restart%0D%0A++timeout%3A+3600%0D%0A++abatement%3A+true%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-restart%0D%0A++++name%3A+Restart+the+VM%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+Restart%0D%0A++++target%3A%0D%0A++++++type%3A+VM%0D%0A++++retry%3A+3%0D%0A++++timeout%3A+1200%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard" } } -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' #########################################Create Micro Service Config policies########################################## @@ -116,7 +116,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "policyConfigType": "MicroService", "policyName": "com.MicroServicevFirewall", "onapName": "DCAE" -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' sleep 2 @@ -127,7 +127,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "policyConfigType": "MicroService", "policyName": "com.MicroServicevDNS", "onapName": "DCAE" -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' sleep 2 @@ -138,7 +138,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "policyConfigType": "MicroService", "policyName": "com.MicroServicevCPE", "onapName": "DCAE" -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' #########################################Creating Decision Guard policy######################################### @@ -165,7 +165,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "guardActiveEnd": "00:00:00-05:00" } } -}' 'http://pdp.onap-policy:8081/pdp/api/createPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/createPolicy' #########################################Push Decision policy######################################### @@ -176,7 +176,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.AllPermitGuard", "policyType": "DECISION" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' #########################################Pushing BRMS Param policies########################################## @@ -189,7 +189,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.BRMSParamvFirewall", "policyType": "BRMS_Param" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' sleep 2 @@ -198,7 +198,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.BRMSParamvDNS", "policyType": "BRMS_Param" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' sleep 2 @@ -207,7 +207,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.BRMSParamVOLTE", "policyType": "BRMS_Param" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' sleep 2 @@ -216,7 +216,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.BRMSParamvCPE", "policyType": "BRMS_Param" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' #########################################Pushing MicroService Config policies########################################## @@ -229,7 +229,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.MicroServicevFirewall", "policyType": "MicroService" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' sleep 10 @@ -238,7 +238,7 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.MicroServicevDNS", "policyType": "MicroService" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy' +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' sleep 10 @@ -247,4 +247,4 @@ curl -v --silent -X PUT --header 'Content-Type: application/json' --header 'Acce "pdpGroup": "default", "policyName": "com.MicroServicevCPE", "policyType": "MicroService" -}' 'http://pdp.onap-policy:8081/pdp/api/pushPolicy'
\ No newline at end of file +}' 'http://pdp.{{.Values.nsPrefix}}:8081/pdp/api/pushPolicy' diff --git a/kubernetes/policy/templates/all-services.yaml b/kubernetes/policy/templates/all-services.yaml index c6b633e98d..3971b29b73 100644 --- a/kubernetes/policy/templates/all-services.yaml +++ b/kubernetes/policy/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: mariadb - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: mariadb spec: @@ -22,7 +22,7 @@ metadata: labels: app: nexus name: nexus - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: nexus-port @@ -39,7 +39,7 @@ metadata: labels: app: drools name: drools - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: "drools-port" @@ -58,7 +58,7 @@ apiVersion: v1 kind: Service metadata: name: pap - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: pap spec: @@ -79,7 +79,7 @@ apiVersion: v1 kind: Service metadata: name: pdp - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: pdp annotations: @@ -117,7 +117,7 @@ apiVersion: v1 kind: Service metadata: name: brmsgw - namespace: "{{ .Values.nsPrefix }}-policy" + namespace: "{{ .Values.nsPrefix }}" labels: app: brmsgw spec: diff --git a/kubernetes/policy/templates/dep-brmsgw.yaml b/kubernetes/policy/templates/dep-brmsgw.yaml index 6c0533ce15..25bf0c678b 100644 --- a/kubernetes/policy/templates/dep-brmsgw.yaml +++ b/kubernetes/policy/templates/dep-brmsgw.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: brmsgw - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-brmsgw + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.brmsgwReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: brmsgw - name: brmsgw + name: policy-brmsgw spec: initContainers: - command: diff --git a/kubernetes/policy/templates/dep-drools.yaml b/kubernetes/policy/templates/dep-drools.yaml index 1dc16cf374..ef9636ceef 100644 --- a/kubernetes/policy/templates/dep-drools.yaml +++ b/kubernetes/policy/templates/dep-drools.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: drools - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-drools + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.droolsReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: drools - name: drools + name: policy-drools spec: initContainers: - command: @@ -55,8 +55,21 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /tmp/policy-install/config - name: drools + - mountPath: /tmp/policy-install/config/policy-keystore + name: drools-secret + subPath: policy-keystore + - mountPath: /tmp/policy-install/config/feature-healthcheck.conf + name: drools-secret + subPath: feature-healthcheck.conf + - mountPath: /tmp/policy-install/config/base.conf + name: drools-config + subPath: base.conf + - mountPath: /tmp/policy-install/config/policy-management.conf + name: drools-config + subPath: policy-management.conf + - mountPath: /tmp/policy-install/config/drools-tweaks.sh + name: drools-config + subPath: drools-tweaks.sh - mountPath: /usr/share/maven/conf/settings.xml name: drools-settingsxml subPath: settings.xml @@ -97,16 +110,10 @@ spec: - name: drools-settingsxml configMap: name: policy-dep-drools-settings-configmap - - name: drools - secret: - secretName: policy-dep-drools-secret + - name: drools-config + configMap: + name: policy-dep-drools-configmap items: - - key: policy-keystore - path: policy-keystore - mode: 0644 - - key: feature-healthcheck.conf - path: feature-healthcheck.conf - mode: 0644 - key: base.conf path: base.conf mode: 0755 @@ -116,6 +123,16 @@ spec: - key: drools-tweaks.sh path: drools-tweaks.sh mode: 0755 + - name: drools-secret + secret: + secretName: policy-dep-drools-secret + items: + - key: policy-keystore + path: policy-keystore + mode: 0644 + - key: feature-healthcheck.conf + path: feature-healthcheck.conf + mode: 0644 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" #{{ end }} diff --git a/kubernetes/policy/templates/dep-maria.yaml b/kubernetes/policy/templates/dep-maria.yaml index e42230f994..9ac17daa88 100644 --- a/kubernetes/policy/templates/dep-maria.yaml +++ b/kubernetes/policy/templates/dep-maria.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: mariadb - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-mariadb + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.mariadbReplicas }} selector: @@ -13,6 +13,7 @@ spec: metadata: labels: app: mariadb + name: policy-mariadb spec: hostname: mariadb containers: diff --git a/kubernetes/policy/templates/dep-nexus.yaml b/kubernetes/policy/templates/dep-nexus.yaml index 2db40b2763..c63e0af685 100644 --- a/kubernetes/policy/templates/dep-nexus.yaml +++ b/kubernetes/policy/templates/dep-nexus.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: nexus - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-nexus + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nexusReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: nexus - name: nexus + name: policy-nexus spec: initContainers: - command: diff --git a/kubernetes/policy/templates/dep-pap.yaml b/kubernetes/policy/templates/dep-pap.yaml index 68ccb5a746..389fc6b3eb 100644 --- a/kubernetes/policy/templates/dep-pap.yaml +++ b/kubernetes/policy/templates/dep-pap.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: pap - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-pap + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.papReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: pap - name: pap + name: policy-pap spec: initContainers: - command: diff --git a/kubernetes/policy/templates/dep-pdp.yaml b/kubernetes/policy/templates/dep-pdp.yaml index f867fa54e2..6740f1d422 100644 --- a/kubernetes/policy/templates/dep-pdp.yaml +++ b/kubernetes/policy/templates/dep-pdp.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: pdp - namespace: "{{ .Values.nsPrefix }}-policy" + name: policy-pdp + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.pdpReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: pdp - name: pdp + name: policy-pdp spec: initContainers: - command: diff --git a/kubernetes/policy/templates/policy-deployment-configmap.yaml b/kubernetes/policy/templates/policy-deployment-configmap.yaml index b1db02bd20..d59ba617fa 100644 --- a/kubernetes/policy/templates/policy-deployment-configmap.yaml +++ b/kubernetes/policy/templates/policy-deployment-configmap.yaml @@ -3,9 +3,9 @@ apiVersion: v1 kind: ConfigMap metadata: name: policy-dep-drools-settings-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/drools/settings.xml").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/drools/settings.xml").AsConfig . | indent 2 }} #{{ end }} --- #{{ if not .Values.disablePolicyPdp }} @@ -13,7 +13,15 @@ apiVersion: v1 kind: ConfigMap metadata: name: policy-dep-pe-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/opt/policy/config/pe/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/opt/policy/config/pe/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: policy-dep-drools-configmap + namespace: {{ .Values.nsPrefix }} +data: +{{ tpl (.Files.Glob "resources/config/opt/policy/config/drools/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/policy/templates/policy-deployment-secret.yaml b/kubernetes/policy/templates/policy-deployment-secret.yaml index 99a807bddf..6fe52ead4e 100644 --- a/kubernetes/policy/templates/policy-deployment-secret.yaml +++ b/kubernetes/policy/templates/policy-deployment-secret.yaml @@ -3,8 +3,8 @@ apiVersion: v1 kind: Secret metadata: name: policy-dep-drools-secret - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} type: Opaque data: -{{ tpl (.Files.Glob "resources/config/opt/policy/config/drools/*").AsSecrets . | indent 2 }} +{{ (.Files.Glob "resources/config/opt/policy/config/drools/keys/*").AsSecrets | indent 2 }} #{{ end }} diff --git a/kubernetes/policy/templates/policy-log-configmap.yaml b/kubernetes/policy/templates/policy-log-configmap.yaml index 24ad45e5f7..b1a9e0999c 100644 --- a/kubernetes/policy/templates/policy-log-configmap.yaml +++ b/kubernetes/policy/templates/policy-log-configmap.yaml @@ -3,25 +3,25 @@ apiVersion: v1 kind: ConfigMap metadata: name: policy-pap-log-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/log/xacml-pap-rest/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/log/xacml-pap-rest/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: name: policy-sdk-log-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/log/ep_sdk_app/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/log/ep_sdk_app/*").AsConfig . | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: name: policy-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/log/filebeat/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} #{{ end }} #{{ if not .Values.disablePolicyPdp }} --- @@ -29,9 +29,9 @@ apiVersion: v1 kind: ConfigMap metadata: name: policy-pdp-log-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/log/xacml-pdp-rest/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/log/xacml-pdp-rest/*").AsConfig . | indent 2 }} #{{ end }} #{{ if not .Values.disablePolicyDrools }} --- @@ -39,7 +39,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: policy-drools-log-configmap - namespace: {{ .Values.nsPrefix }}-policy + namespace: {{ .Values.nsPrefix }} data: -{{ (.Files.Glob "resources/config/log/drools/*").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/log/drools/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/portal/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/portal/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties index 4871b42288..6c89f6007c 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/portal.properties @@ -16,7 +16,7 @@ ueb_app_key = 7GkVcrO6sIDb3ngW ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9 ueb_app_mailbox_name = ECOMP-PORTAL-INBOX -ueb_url_list = dmaap.onap-message-router +ueb_url_list = dmaap.{{.Values.nsPrefix}} ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX # Consumer group name for UEB topic. diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties index 9085cee47f..345d222621 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTAL/system.properties @@ -1,6 +1,6 @@ #mysql db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal +db.connectionURL = jdbc:mariadb:failover://portaldb.{{.Values.nsPrefix}}:3306/portal db.userName =root db.password =Aa123456 db.hib.dialect = org.hibernate.dialect.MySQLDialect @@ -84,7 +84,7 @@ notification_update_duration = 900 #Microservices Related Properties for Portal microservices.widget.protocol = http -microservices.widget.hostname = portalwidgets.onap-portal +microservices.widget.hostname = portalwidgets.{{.Values.nsPrefix}} microservices.widget.username = widget_user microservices.widget.password = KpuqIB08YHg+btG+pjX+sA== #This property won't be needed after consul is functional on VMs - diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties index e77a701798..7eeb913f2d 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/portal.properties @@ -30,7 +30,7 @@ ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi ueb_listeners_enable = false # UEB Configuration -ueb_url_list = dmaap.onap-message-router +ueb_url_list = dmaap.{{.Values.nsPrefix}} # ECOMP Portal listens on this UEB topic ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX # Replace these 3 default values with the ones for your specific App, diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties index d638abcca3..2f53286b56 100755 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/system.properties @@ -24,7 +24,7 @@ decryption_key = AGLDdG4D04BKm2IxIWEr8o== ########################################################################## db.driver = org.mariadb.jdbc.Driver -db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk +db.connectionURL = jdbc:mariadb://portaldb.{{.Values.nsPrefix}}:3306/ecomp_sdk db.userName = root db.password = Aa123456 db.min_pool_size = 5 @@ -61,4 +61,4 @@ instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d guard_notebook_url= #authenticate user server -authenticate_user_server=http://portalapps.onap-portal:8383/openid-connect-server-webapp/allUsers +authenticate_user_server=http://portalapps.{{.Values.nsPrefix}}:8383/openid-connect-server-webapp/allUsers diff --git a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties index a5e55dc6d8..3450a6d414 100644 --- a/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties +++ b/kubernetes/portal/resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties @@ -6,7 +6,7 @@ spring.http.multipart.max-request-size=128MB microservice.widget.location=/tmp ## App DB Properties -spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal +spring.datasource.url=jdbc:mysql://portaldb.{{.Values.nsPrefix}}:3306/portal spring.datasource.username=root spring.datasource.password=Aa123456 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect diff --git a/kubernetes/portal/templates/all-services.yaml b/kubernetes/portal/templates/all-services.yaml index 28ca0303b1..b676e3c6d1 100644 --- a/kubernetes/portal/templates/all-services.yaml +++ b/kubernetes/portal/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: portaldb - namespace: "{{ .Values.nsPrefix }}-portal" + namespace: "{{ .Values.nsPrefix }}" labels: app: portaldb spec: @@ -22,7 +22,7 @@ metadata: labels: app: portalapps name: portalapps - namespace: "{{ .Values.nsPrefix }}-portal" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -58,9 +58,9 @@ apiVersion: v1 kind: Service metadata: labels: - app: vnc-portal - name: vnc-portal - namespace: "{{ .Values.nsPrefix }}-portal" + app: portal-vnc + name: portal-vnc + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: tcp-1 @@ -72,7 +72,7 @@ spec: targetPort: 5900 nodePort: {{ .Values.nodePortPrefix }}12 selector: - app: vnc-portal + app: portal-vnc type: NodePort #{{ end }} #{{ if not .Values.disablePortalPortalwidgets }} @@ -81,7 +81,7 @@ apiVersion: v1 kind: Service metadata: name: portalwidgets - namespace: "{{ .Values.nsPrefix }}-portal" + namespace: "{{ .Values.nsPrefix }}" labels: app: portalwidgets spec: @@ -91,4 +91,4 @@ spec: selector: app: portalwidgets clusterIP: None -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/portal/templates/portal-apps-configmap.yaml b/kubernetes/portal/templates/portal-apps-configmap.yaml index 044e0d8a4d..ec3805de32 100644 --- a/kubernetes/portal/templates/portal-apps-configmap.yaml +++ b/kubernetes/portal/templates/portal-apps-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-onap-portal-sdk-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTALSDK/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-onap-portal-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPPORTAL/*").AsConfig . | indent 2 }} --- @@ -19,7 +19,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-mariadb-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/mariadb/oom_updates.sql").AsConfig . | indent 2 }} #{{ end }} @@ -29,7 +29,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-onapwidgetms-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/portal-fe/webapps/etc/ONAPWIDGETMS/application.properties").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml index 068e0f7564..e00151c714 100755 --- a/kubernetes/portal/templates/portal-apps-deployment.yaml +++ b/kubernetes/portal/templates/portal-apps-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: portalapps - namespace: "{{ .Values.nsPrefix }}-portal" + name: portal-apps + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.portalAppsReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: portalapps - name: portalapps + name: portal-apps spec: initContainers: - command: diff --git a/kubernetes/portal/templates/portal-logs-configmap.yaml b/kubernetes/portal/templates/portal-logs-configmap.yaml index c5735ba722..60abcb78c8 100644 --- a/kubernetes/portal/templates/portal-logs-configmap.yaml +++ b/kubernetes/portal/templates/portal-logs-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/filebeat.yml").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-onapportal-log-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/portal/onapportal/logback.xml").AsConfig . | indent 2 }} --- @@ -19,7 +19,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: portal-onapportalsdk-log-configmap - namespace: {{ .Values.nsPrefix }}-portal + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/portal/onapportalsdk/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml index 9db512a120..828779eaa9 100755 --- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml +++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: portaldb - namespace: "{{ .Values.nsPrefix }}-portal" + name: portal-db + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.portalDbReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: portaldb - name: portaldb + name: portal-db spec: containers: - image: {{ .Values.image.portaldb}} @@ -21,7 +21,7 @@ spec: name: "portaldb" env: - name: MYSQL_HOST - value: "portaldb.{{ .Values.nsPrefix }}-portal" + value: "portaldb.{{ .Values.nsPrefix }}" - name: MYSQL_ROOT_PASSWORD value: Aa123456 volumeMounts: diff --git a/kubernetes/portal/templates/portal-pv-pvc.yaml b/kubernetes/portal/templates/portal-pv-pvc.yaml index 0fabc4cc26..1f554bc34a 100644 --- a/kubernetes/portal/templates/portal-pv-pvc.yaml +++ b/kubernetes/portal/templates/portal-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-portal-db" - namespace: "{{ .Values.nsPrefix }}-portal" + name: "{{ .Values.nsPrefix }}-portal" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-portal-db" + name: "{{ .Values.nsPrefix }}-portal" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: portal-db - namespace: "{{ .Values.nsPrefix }}-portal" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-portal-db" + name: "{{ .Values.nsPrefix }}-portal" #{{ end }} diff --git a/kubernetes/portal/templates/portal-vnc-dep.yaml b/kubernetes/portal/templates/portal-vnc-dep.yaml index 3a80572238..0680a8ab24 100644 --- a/kubernetes/portal/templates/portal-vnc-dep.yaml +++ b/kubernetes/portal/templates/portal-vnc-dep.yaml @@ -1,16 +1,16 @@ #{{ if not .Values.disablePortalVncPortal }} kind: ConfigMap metadata: - name: vnc-profiles-ini - namespace: "{{ .Values.nsPrefix }}-portal" + name: portal-vnc-profiles-ini + namespace: "{{ .Values.nsPrefix }}" data: {{ (.Files.Glob "resources/vnc/init_profile/profiles.ini").AsConfig | indent 2 }} --- apiVersion: v1 kind: ConfigMap metadata: - name: vnc-update-hosts - namespace: "{{ .Values.nsPrefix }}-portal" + name: portal-vnc-update-hosts + namespace: "{{ .Values.nsPrefix }}" data: {{ (.Files.Glob "resources/scripts/update_hosts.sh").AsConfig | indent 2 }} --- @@ -18,19 +18,19 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: labels: - app: vnc-portal - name: vnc-portal - namespace: "{{ .Values.nsPrefix }}-portal" + app: portal-vnc + name: portal-vnc + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vncPortalReplicas }} selector: matchLabels: - app: vnc-portal + app: portal-vnc template: metadata: labels: - app: vnc-portal - name: vnc-portal + app: portal-vnc + name: portal-vnc spec: initContainers: - command: @@ -46,7 +46,7 @@ spec: fieldPath: metadata.namespace image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} - name: vnc-portal-readiness + name: portal-vnc-readiness - command: - /root/ready.py args: @@ -54,7 +54,7 @@ spec: - pap env: - name: NAMESPACE - value: {{ .Values.nsPrefix }}-policy + value: {{ .Values.nsPrefix }} image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: vnc-pap-readiness @@ -65,7 +65,7 @@ spec: - sdc-fe env: - name: NAMESPACE - value: {{ .Values.nsPrefix }}-sdc + value: {{ .Values.nsPrefix }} image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: vnc-sdc-readiness @@ -76,7 +76,7 @@ spec: - vid-server env: - name: NAMESPACE - value: {{ .Values.nsPrefix }}-vid + value: {{ .Values.nsPrefix }} image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: vnc-vid-readiness @@ -86,11 +86,11 @@ spec: lifecycle: postStart: exec: - command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }}-sdc sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }}-portal portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }}-policy policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }}-sdc sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }}-vid vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }}-aai aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }}-cli cli.api.simpledemo.onap.org; sleep 10; done) > update_hosts.log 2>&1 &"] + command: ["/bin/sh", "-c", "mkdir -p /root/.mozilla/firefox/onap.default; cp /root/.init_profile/profiles.ini /root/.mozilla/firefox/; echo 'user_pref(\"browser.tabs.remote.autostart.2\", false);' > /root/.mozilla/firefox/onap.default/prefs.js; (while true; do /tmp/update_hosts.sh sdc-be.{{ .Values.nsPrefix }} sdc.api.be.simpledemo.onap.org; /tmp/update_hosts.sh portalapps.{{ .Values.nsPrefix }} portal.api.simpledemo.onap.org; /tmp/update_hosts.sh pap.{{ .Values.nsPrefix }} policy.api.simpledemo.onap.org; /tmp/update_hosts.sh sdc-fe.{{ .Values.nsPrefix }} sdc.api.simpledemo.onap.org; /tmp/update_hosts.sh vid-server.{{ .Values.nsPrefix }} vid.api.simpledemo.onap.org; /tmp/update_hosts.sh sparky-be.{{ .Values.nsPrefix }} aai.api.simpledemo.onap.org; /tmp/update_hosts.sh cli.{{ .Values.nsPrefix }} cli.api.simpledemo.onap.org; sleep 10; done) > update_hosts.log 2>&1 &"] env: - name: VNC_PASSWORD value: password - name: vnc-portal + name: portal-vnc volumeMounts: - mountPath: /etc/localtime name: localtime @@ -110,10 +110,10 @@ spec: path: /etc/localtime - name: vnc-profiles-ini configMap: - name: vnc-profiles-ini + name: portal-vnc-profiles-ini - name: vnc-update-hosts configMap: - name: vnc-update-hosts + name: portal-vnc-update-hosts defaultMode: 0755 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" diff --git a/kubernetes/portal/templates/portal-widgets-deployment.yaml b/kubernetes/portal/templates/portal-widgets-deployment.yaml index 6f27ef6e80..d5237caf33 100644 --- a/kubernetes/portal/templates/portal-widgets-deployment.yaml +++ b/kubernetes/portal/templates/portal-widgets-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: portalwidgets - namespace: "{{ .Values.nsPrefix }}-portal" + name: portal-widgets + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.portalWidgetsReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: portalwidgets - name: portalwidgets + name: portal-widgets spec: initContainers: - command: diff --git a/kubernetes/readiness/dep-health-init.yaml b/kubernetes/readiness/dep-health-init.yaml index d77127b201..34bfbafdea 100644 --- a/kubernetes/readiness/dep-health-init.yaml +++ b/kubernetes/readiness/dep-health-init.yaml @@ -23,7 +23,7 @@ spec: - hbase command: - /root/ready.py - image: oomk8s/readiness-check:1.0.0 + image: oomk8s/readiness-check:1.1.0 imagePullPolicy: Always name: healthy env: diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh index 251388b26e..23fc555dc5 100755 --- a/kubernetes/robot/demo-k8s.sh +++ b/kubernetes/robot/demo-k8s.sh @@ -1,45 +1,49 @@ -#!/bin/bash +#!/bin/bash -x # # Execute tags built to support the hands on demo, # function usage { - echo "Usage: demo.sh <command> [<parameters>]" + echo "Usage: demo.sh namespace <command> [<parameters>]" echo " " - echo " demo.sh init" + echo " demo.sh <namespace> init" echo " - Execute both init_customer + distribute" echo " " - echo " demo.sh init_customer" + echo " demo.sh <namespace> init_customer" echo " - Create demo customer (Demonstration) and services, etc." echo " " - echo " demo.sh distribute [<prefix>]" + echo " demo.sh <namespace> distribute [<prefix>]" echo " - Distribute demo models (demoVFW and demoVLB)" echo " " - echo " demo.sh preload <vnf_name> <module_name>" + echo " demo.sh <namespace> preload <vnf_name> <module_name>" echo " - Preload data for VNF for the <module_name>" echo " " - echo " demo.sh appc <module_name>" + echo " demo.sh <namespace> appc <module_name>" echo " - provide APPC with vFW module mount point for closed loop" echo " " - echo " demo.sh init_robot" + echo " demo.sh <namespace> init_robot" echo " - Initialize robot after all ONAP VMs have started" echo " " - echo " demo.sh instantiateVFW" + echo " demo.sh <namespace> instantiateVFW" echo " - Instantiate vFW module for the a demo customer (DemoCust<uuid>)" echo " " - echo " demo.sh deleteVNF <module_name from instantiateVFW>" + echo " demo.sh <namespace> deleteVNF <module_name from instantiateVFW>" echo " - Delete the module created by instantiateVFW" echo " " - echo " demo.sh heatbridge <stack_name> <service_instance_id> <service>" + echo " demo.sh <namespace> heatbridge <stack_name> <service_instance_id> <service>" echo " - Run heatbridge against the stack for the given service instance and service" } # Set the defaults -if [ $# -eq 0 ];then +if [ $# -le 1 ];then usage exit fi + +NAMESPACE=$1 +shift + ## ## if more than 1 tag is supplied, the must be provided with -i or -e ## @@ -140,5 +144,5 @@ done ETEHOME=/var/opt/OpenECOMP_ETE VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" -POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out +POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot) +kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/demo/${TAG} -i ${TAG} --display 89 2> ${TAG}.out diff --git a/kubernetes/robot/ete-k8s.sh b/kubernetes/robot/ete-k8s.sh index 2305a584c3..9810ac236e 100755 --- a/kubernetes/robot/ete-k8s.sh +++ b/kubernetes/robot/ete-k8s.sh @@ -5,19 +5,18 @@ # Please clean up logs when you are done... # Note: Do not run multiple concurrent ete.sh as the --display is not parameterized and tests will collide # -if [ "$1" == "" ];then - echo "Usage: ete.sh [ health | ete | closedloop | instantiate | distribute ]" +if [ "$1" == "" ] || [ "$2" == "" ]; then + echo "Usage: ete.sh [namespace] [ health | ete | closedloop | instantiate | distribute ]" exit fi -export TAGS="-i $1" +export NAMESPACE="$1" +export TAGS="-i $2" export ETEHOME=/var/opt/OpenECOMP_ETE export OUTPUT_FOLDER=ETE_$$ VARIABLEFILES="-V /share/config/vm_properties.py -V /share/config/integration_robot_properties.py -V /share/config/integration_preload_parameters.py" VARIABLES="-v GLOBAL_BUILD_NUMBER:$$" -#docker exec openecompete_container ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 - -POD=$(kubectl --namespace onap-robot get pods | sed 's/ .*//'| grep robot) -kubectl --namespace onap-robot exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 +POD=$(kubectl --namespace $NAMESPACE get pods | sed 's/ .*//'| grep robot) +kubectl --namespace $NAMESPACE exec ${POD} -- ${ETEHOME}/runTags.sh ${VARIABLEFILES} ${VARIABLES} -d /share/logs/${OUTPUT_FOLDER} ${TAGS} --display 88 diff --git a/kubernetes/robot/templates/all-services.yaml b/kubernetes/robot/templates/all-services.yaml index 196e7b196a..604982b1e4 100644 --- a/kubernetes/robot/templates/all-services.yaml +++ b/kubernetes/robot/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: robot name: robot - namespace: "{{ .Values.nsPrefix }}-robot" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - port: 88 diff --git a/kubernetes/robot/templates/robot-deployment.yaml b/kubernetes/robot/templates/robot-deployment.yaml index 5130955919..ac176c4039 100644 --- a/kubernetes/robot/templates/robot-deployment.yaml +++ b/kubernetes/robot/templates/robot-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: robot - namespace: "{{ .Values.nsPrefix }}-robot" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -60,4 +60,4 @@ spec: path: /dockerdata-nfs/{{ .Values.nsPrefix }}/robot/authorization imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json index 5d6eaef94e..d35590ec67 100755 --- a/kubernetes/sdc/resources/config/environments/AUTO.json +++ b/kubernetes/sdc/resources/config/environments/AUTO.json @@ -8,34 +8,34 @@ "chef_type": "environment", "default_attributes": { - "CS_VIP": "sdc-cs.onap-sdc", - "BE_VIP": "sdc-be.onap-sdc", - "FE_VIP": "sdc-fe.onap-sdc", - "ES_VIP": "sdc-es.onap-sdc", + "CS_VIP": "sdc-cs.{{.Values.nsPrefix}}", + "BE_VIP": "sdc-be.{{.Values.nsPrefix}}", + "FE_VIP": "sdc-fe.{{.Values.nsPrefix}}", + "ES_VIP": "sdc-es.{{.Values.nsPrefix}}", "interfaces": { "application": "eth0", "private": "eth0" }, "ECompP": { - "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi", - "ueb_url_list": "dmaap.onap-message-router, dmaap.onap-message-router", + "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi", + "ueb_url_list": "dmaap.{{.Values.nsPrefix}}, dmaap.{{.Values.nsPrefix}}", "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", "app_key": "x9UfO7JsDn8BESVX", "inbox_name": "ECOMP-PORTAL-INBOX", - "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm", + "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1", "decryption_key": "AGLDdG4D04BKm2IxIWEr8o==" }, "UEB": { "PublicKey": "iPIxkpAMI8qTcQj8", "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal", - "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"] + "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"] }, "Nodes": { - "CS": "sdc-cs.onap-sdc", - "BE": "sdc-be.onap-sdc", - "FE": "sdc-fe.onap-sdc", - "ES": "sdc-es.onap-sdc" + "CS": "sdc-cs.{{.Values.nsPrefix}}", + "BE": "sdc-be.{{.Values.nsPrefix}}", + "FE": "sdc-fe.{{.Values.nsPrefix}}", + "ES": "sdc-es.{{.Values.nsPrefix}}" } }, "override_attributes": { diff --git a/kubernetes/sdc/resources/config/environments/Template.json b/kubernetes/sdc/resources/config/environments/Template.json index ddddc78e2b..247e990f31 100755 --- a/kubernetes/sdc/resources/config/environments/Template.json +++ b/kubernetes/sdc/resources/config/environments/Template.json @@ -17,19 +17,19 @@ "private": "eth1" }, "ECompP": { - "ecomp_rest_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/auxapi", - "ueb_url_list": "dmaap.onap-message-router,dmaap.onap-message-router", + "ecomp_rest_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/auxapi", + "ueb_url_list": "dmaap.{{.Values.nsPrefix}},dmaap.{{.Values.nsPrefix}}", "app_secret": "XftIATw9Jr3VzAcPqt3NnJOu", "app_key": "x9UfO7JsDn8BESVX", "inbox_name": "ECOMP-PORTAL-INBOX", - "ecomp_redirect_url": "http://portalapps.onap-portal:8989/ONAPPORTAL/login.htm", + "ecomp_redirect_url": "http://portalapps.{{.Values.nsPrefix}}:8989/ONAPPORTAL/login.htm", "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1", "decryption_key": "AGLDdG4D04BKm2IxIWEr8o==" }, "UEB": { "PublicKey": "iPIxkpAMI8qTcQj8", "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal", - "fqdn": ["dmaap.onap-message-router", "dmaap.onap-message-router"] + "fqdn": ["dmaap.{{.Values.nsPrefix}}", "dmaap.{{.Values.nsPrefix}}"] }, "Nodes": { "CS": "yyy", diff --git a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml b/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/sdc/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb index 9fc662ee0a..5c233a2207 100755 --- a/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb +++ b/kubernetes/sdc/resources/config/sdc-fe/FE_2_setup_configuration.rb @@ -7,7 +7,7 @@ template "catalog-fe-config" do mode "0755" variables({ :fe_host_ip => node['HOST_IP'], - :be_host_ip => "sdc-be.onap-sdc", + :be_host_ip => "sdc-be.{{.Values.nsPrefix}}", :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port] }) diff --git a/kubernetes/sdc/templates/all-services.yaml b/kubernetes/sdc/templates/all-services.yaml index 4100dc24a4..247ee034a8 100644 --- a/kubernetes/sdc/templates/all-services.yaml +++ b/kubernetes/sdc/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-es name: sdc-es - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: sdc-es-port-9200 @@ -24,7 +24,7 @@ metadata: labels: app: sdc-cs name: sdc-cs - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: sdc-cs-port-9042 @@ -43,7 +43,7 @@ metadata: labels: app: sdc-kb name: sdc-kb - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: sdc-kb-port-5601 @@ -60,7 +60,7 @@ metadata: labels: app: sdc-be name: sdc-be - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -101,7 +101,7 @@ metadata: labels: app: sdc-fe name: sdc-fe - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml index 3b72071099..d075277d91 100644 --- a/kubernetes/sdc/templates/sdc-be.yaml +++ b/kubernetes/sdc/templates/sdc-be.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-be name: sdc-be - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -42,7 +42,7 @@ spec: - dmaap env: - name: NAMESPACE - value: {{ .Values.nsPrefix }}-message-router + value: {{ .Values.nsPrefix }} image: {{ .Values.image.readiness }} imagePullPolicy: {{ .Values.pullPolicy }} name: sdc-dmaap-readiness diff --git a/kubernetes/sdc/templates/sdc-cs.yaml b/kubernetes/sdc/templates/sdc-cs.yaml index 32aba467b3..bf86de6fe2 100644 --- a/kubernetes/sdc/templates/sdc-cs.yaml +++ b/kubernetes/sdc/templates/sdc-cs.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-cs name: sdc-cs - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/sdc/templates/sdc-environments-configmap.yaml b/kubernetes/sdc/templates/sdc-environments-configmap.yaml index f8456b0efe..e1ff5581fd 100644 --- a/kubernetes/sdc/templates/sdc-environments-configmap.yaml +++ b/kubernetes/sdc/templates/sdc-environments-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdc-environments-configmap - namespace: {{ .Values.nsPrefix }}-sdc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/environments/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-es.yaml b/kubernetes/sdc/templates/sdc-es.yaml index 1a2f70d77e..979c70df5b 100644 --- a/kubernetes/sdc/templates/sdc-es.yaml +++ b/kubernetes/sdc/templates/sdc-es.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-es name: sdc-es - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/sdc/templates/sdc-fe-configmap.yaml b/kubernetes/sdc/templates/sdc-fe-configmap.yaml index 2f60ef88e3..05c0a1645c 100644 --- a/kubernetes/sdc/templates/sdc-fe-configmap.yaml +++ b/kubernetes/sdc/templates/sdc-fe-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdc-fe-configmap - namespace: {{ .Values.nsPrefix }}-sdc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/sdc-fe/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-fe.yaml b/kubernetes/sdc/templates/sdc-fe.yaml index d1144d999e..adcec19ffe 100644 --- a/kubernetes/sdc/templates/sdc-fe.yaml +++ b/kubernetes/sdc/templates/sdc-fe.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-fe name: sdc-fe - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/sdc/templates/sdc-kb.yaml b/kubernetes/sdc/templates/sdc-kb.yaml index a0a00a0d39..90fc6f2a21 100644 --- a/kubernetes/sdc/templates/sdc-kb.yaml +++ b/kubernetes/sdc/templates/sdc-kb.yaml @@ -5,7 +5,7 @@ metadata: labels: app: sdc-kb name: sdc-kb - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: diff --git a/kubernetes/sdc/templates/sdc-log-configmap.yaml b/kubernetes/sdc/templates/sdc-log-configmap.yaml index c79f9e064c..f2b5c09d0b 100644 --- a/kubernetes/sdc/templates/sdc-log-configmap.yaml +++ b/kubernetes/sdc/templates/sdc-log-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdc-log-be-configmap - namespace: {{ .Values.nsPrefix }}-sdc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/be/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdc-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-sdc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} #{{ end }} @@ -21,7 +21,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdc-log-fe-configmap - namespace: {{ .Values.nsPrefix }}-sdc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/fe/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdc/templates/sdc-pv-pvc.yaml b/kubernetes/sdc/templates/sdc-pv-pvc.yaml index 254e55132b..8d9becf2d5 100644 --- a/kubernetes/sdc/templates/sdc-pv-pvc.yaml +++ b/kubernetes/sdc/templates/sdc-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-sdc-cs-db" - namespace: "{{ .Values.nsPrefix }}-sdc" + name: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-sdc-cs-db" + name: "{{ .Values.nsPrefix }}-sdc" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: sdc-cs-db - namespace: "{{ .Values.nsPrefix }}-sdc" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-sdc-cs-db" + name: "{{ .Values.nsPrefix }}-sdc" #{{ end }} diff --git a/kubernetes/sdnc/resources/config/conf/aaiclient.properties b/kubernetes/sdnc/resources/config/conf/aaiclient.properties index 4f66294c42..81f63ecdde 100755 --- a/kubernetes/sdnc/resources/config/conf/aaiclient.properties +++ b/kubernetes/sdnc/resources/config/conf/aaiclient.properties @@ -40,7 +40,7 @@ org.onap.ccsdk.sli.adaptors.aai.application=openECOMP # # Configuration file for A&AI Client # -org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.onap-aai:8443 +org.onap.ccsdk.sli.adaptors.aai.uri=https://aai-service.{{.Values.nsPrefix}}:8443 # query @@ -134,8 +134,8 @@ org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v11/service-design-and # UBB Notify org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v11/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.onap-aai:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://aai-service.onap-aai:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://aai-service.{{.Values.nsPrefix}}:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} +org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://aai-service.{{.Values.nsPrefix}}:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information # Service org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id} diff --git a/kubernetes/sdnc/resources/config/conf/admportal.json b/kubernetes/sdnc/resources/config/conf/admportal.json index f6f59ae797..ee575c22ac 100755 --- a/kubernetes/sdnc/resources/config/conf/admportal.json +++ b/kubernetes/sdnc/resources/config/conf/admportal.json @@ -39,8 +39,8 @@ "dbPassword": "gamma", "dbName": "sdnctl", "odlProtocol": "http", - "odlHost": "sdnhost.onap-sdnc", - "odlConexusHost": "sdnhost.onap-sdnc", + "odlHost": "sdnhost.{{.Values.nsPrefix}}", + "odlConexusHost": "sdnhost.{{.Values.nsPrefix}}", "odlPort": "8181", "odlConexusPort": "8181", "odlUser": "admin", diff --git a/kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties b/kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties index 34fceabaae..cfc8e130be 100644 --- a/kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties +++ b/kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties @@ -14,7 +14,7 @@ password =admin contenttype =application/json authKey=fxoW4jZrO7mdLWWa:f4KxkoBtToyoEG7suMoV8KhnkwM= authDate=2016-02-18T13:57:37-0800 -host=dmaap.onap-message-router:3904 +host=dmaap.{{.Values.nsPrefix}}:3904 topic=VCPE-DHCP-EVENT group=jmsgrp id=sdnc1 @@ -32,4 +32,4 @@ sessionstickinessrequired=NO DME2preferredRouterFilePath=/opt/onap/sdnc/data/properties/dmaap-listener.preferredRoute.txt sdnc.odl.user=admin sdnc.odl.password=admin -sdnc.odl.url-base=https://sdnhost.onap-sdnc:8443/restconf/operations
\ No newline at end of file +sdnc.odl.url-base=https://sdnhost.{{.Values.nsPrefix}}:8443/restconf/operations diff --git a/kubernetes/sdnc/resources/config/log/filebeat/log4j/filebeat.yml b/kubernetes/sdnc/resources/config/log/filebeat/log4j/filebeat.yml index 79c9a08a79..2cd63e1d98 100644 --- a/kubernetes/sdnc/resources/config/log/filebeat/log4j/filebeat.yml +++ b/kubernetes/sdnc/resources/config/log/filebeat/log4j/filebeat.yml @@ -29,7 +29,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/sdnc/resources/config/ueb/ueb-listener.properties b/kubernetes/sdnc/resources/config/ueb/ueb-listener.properties index 0ced08b02b..fb6e26da11 100644 --- a/kubernetes/sdnc/resources/config/ueb/ueb-listener.properties +++ b/kubernetes/sdnc/resources/config/ueb/ueb-listener.properties @@ -1,4 +1,4 @@ -org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.onap-sdc:8443 +org.onap.ccsdk.sli.northbound.uebclient.asdc-address=sdc-be.{{.Values.nsPrefix}}:8443 org.onap.ccsdk.sli.northbound.uebclient.consumer-group=sdc-OpenSource-Env1-sdnc-dockero org.onap.ccsdk.sli.northbound.uebclient.consumer-id=sdc-COpenSource-Env11-sdnc-dockero org.onap.ccsdk.sli.northbound.uebclient.environment-name=AUTO @@ -6,7 +6,7 @@ org.onap.ccsdk.sli.northbound.uebclient.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84 org.onap.ccsdk.sli.northbound.uebclient.user=sdnc org.onap.ccsdk.sli.northbound.uebclient.sdnc-user=admin org.onap.ccsdk.sli.northbound.uebclient.sdnc-passwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://sdnhost.onap-sdnc:8282/restconf/operations/ +org.onap.ccsdk.sli.northbound.uebclient.asdc-api-base-url=http://sdnhost.{{.Values.nsPrefix}}:8282/restconf/operations/ org.onap.ccsdk.sli.northbound.uebclient.asdc-api-namespace=org:onap:ccsdk org.onap.ccsdk.sli.northbound.uebclient.spool.incoming=/opt/onap/sdnc/ueb-listener/spool/incoming org.onap.ccsdk.sli.northbound.uebclient.spool.archive=/opt/onap/sdnc/ueb-listener/spool/archive @@ -18,4 +18,4 @@ org.onap.ccsdk.sli.northbound.uebclient.activate-server-tls-auth=false org.onap.ccsdk.sli.northbound.uebclient.keystore-path= org.onap.ccsdk.sli.northbound.uebclient.keystore-password= org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list= -org.onap.ccsdk.sli.northbound.uebclient.artifact-map=/opt/onap/sdnc/data/properties/artifact.map
\ No newline at end of file +org.onap.ccsdk.sli.northbound.uebclient.artifact-map=/opt/onap/sdnc/data/properties/artifact.map diff --git a/kubernetes/sdnc/templates/all-services.yaml b/kubernetes/sdnc/templates/all-services.yaml index 9425ef4b80..c309f48fb1 100644 --- a/kubernetes/sdnc/templates/all-services.yaml +++ b/kubernetes/sdnc/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: dbhost - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-dbhost spec: @@ -19,7 +19,7 @@ apiVersion: v1 kind: Service metadata: name: dbhost-read - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-dbhost spec: @@ -33,7 +33,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb01 - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-dbhost spec: @@ -47,7 +47,7 @@ apiVersion: v1 kind: Service metadata: name: sdnctldb02 - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-dbhost spec: @@ -63,7 +63,7 @@ apiVersion: v1 kind: Service metadata: name: sdnc-dgbuilder - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-dgbuilder spec: @@ -80,7 +80,7 @@ apiVersion: v1 kind: Service metadata: name: sdnhost - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc annotations: @@ -117,7 +117,7 @@ kind: Service apiVersion: v1 metadata: name: nfs-provisioner - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: nfs-provisioner spec: @@ -140,7 +140,7 @@ apiVersion: v1 kind: Service metadata: name: sdnc-portal - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc-portal annotations: @@ -169,7 +169,7 @@ apiVersion: v1 kind: Service metadata: name: sdnhost-cluster - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" labels: app: sdnc annotations: diff --git a/kubernetes/sdnc/templates/db-statefulset.yaml b/kubernetes/sdnc/templates/db-statefulset.yaml index f2e079d76e..399eb42239 100644 --- a/kubernetes/sdnc/templates/db-statefulset.yaml +++ b/kubernetes/sdnc/templates/db-statefulset.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: sdnc-dbhost - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" spec: serviceName: "dbhost" replicas: {{ .Values.numberOfDbReplicas }} @@ -61,7 +61,7 @@ spec: echo ${BASH_REMATCH} [[ $ordinal -eq 0 ]] && exit 0 # Clone data from previous peer. - ncat --recv-only sdnc-dbhost-$(($ordinal-1)).dbhost.{{ .Values.nsPrefix }}-sdnc 3307 | xbstream -x -C /var/lib/mysql + ncat --recv-only sdnc-dbhost-$(($ordinal-1)).dbhost.{{ .Values.nsPrefix }} 3307 | xbstream -x -C /var/lib/mysql # Prepare the backup. xtrabackup --user=root --password=$MYSQL_ROOT_PASSWORD --prepare --target-dir=/var/lib/mysql ls -l /var/lib/mysql @@ -150,7 +150,7 @@ spec: mv change_master_to.sql.in change_master_to.sql.orig mysql --user=root --password=$MYSQL_ROOT_PASSWORD -h 127.0.0.1 <<EOF $(<change_master_to.sql.orig), - MASTER_HOST="sdnc-dbhost-0.dbhost.{{ .Values.nsPrefix }}-sdnc", + MASTER_HOST="sdnc-dbhost-0.dbhost.{{ .Values.nsPrefix }}", MASTER_USER="root", MASTER_PASSWORD="$MYSQL_ROOT_PASSWORD", MASTER_CONNECT_RETRY=10; @@ -176,10 +176,15 @@ spec: emptyDir: {} - name: config-map configMap: - name: mysql + name: sdnc-mysql - name: localtime hostPath: path: /etc/localtime +#{{ if .Values.disableNfsProvisioner }} + - name: sdnc-data + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/data +#{{ else }} volumeClaimTemplates: - metadata: name: sdnc-data @@ -191,3 +196,4 @@ spec: requests: storage: 1Gi #{{ end }} +#{{ end }} diff --git a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml index b9ec155c3f..78e20dab23 100644 --- a/kubernetes/sdnc/templates/dgbuilder-deployment.yaml +++ b/kubernetes/sdnc/templates/dgbuilder-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc-dgbuilder - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dgbuilderReplicas }} selector: diff --git a/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml b/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml index efd7d6d2af..c27ae72930 100644 --- a/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml +++ b/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdnc-dmaap-configmap - namespace: {{ .Values.nsPrefix }}-sdnc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/dmaap/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdnc/templates/dmaap-deployment.yaml b/kubernetes/sdnc/templates/dmaap-deployment.yaml index eb6f354abd..97dc7738e2 100644 --- a/kubernetes/sdnc/templates/dmaap-deployment.yaml +++ b/kubernetes/sdnc/templates/dmaap-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: dmaap-listener - namespace: "{{ .Values.nsPrefix }}-sdnc" + name: sdnc-dmaap-listener + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.dmaapReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: dmaap-listener - name: dmaap-listener + name: sdnc-dmaap-listener spec: initContainers: - command: diff --git a/kubernetes/sdnc/templates/mysql-configmap.yaml b/kubernetes/sdnc/templates/mysql-configmap.yaml index deaa997f02..6b4cdcbf9c 100644 --- a/kubernetes/sdnc/templates/mysql-configmap.yaml +++ b/kubernetes/sdnc/templates/mysql-configmap.yaml @@ -1,8 +1,8 @@ apiVersion: v1 kind: ConfigMap metadata: - name: mysql - namespace: "{{ .Values.nsPrefix }}-sdnc" + name: sdnc-mysql + namespace: "{{ .Values.nsPrefix }}" labels: app: mysql data: diff --git a/kubernetes/sdnc/templates/nfs-provisoner-deployment.yaml b/kubernetes/sdnc/templates/nfs-provisoner-deployment.yaml index 9e78bf3838..bd161d54a1 100644 --- a/kubernetes/sdnc/templates/nfs-provisoner-deployment.yaml +++ b/kubernetes/sdnc/templates/nfs-provisoner-deployment.yaml @@ -1,9 +1,10 @@ #{{ if not .Values.disableSdncSdncDbhost }} +#{{ if not .Values.disableNfsProvisioner }} kind: Deployment apiVersion: extensions/v1beta1 metadata: - name: nfs-provisioner - namespace: "{{ .Values.nsPrefix }}-sdnc" + name: sdnc-nfs-provisioner + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nfsReplicas }} strategy: @@ -12,6 +13,7 @@ spec: metadata: labels: app: nfs-provisioner + name: sdnc-nfs-provisioner spec: containers: - name: nfs-provisioner @@ -53,3 +55,4 @@ spec: hostPath: path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdnc/data #{{ end }} +#{{ end }} diff --git a/kubernetes/sdnc/templates/sdnc-conf-configmap.yaml b/kubernetes/sdnc/templates/sdnc-conf-configmap.yaml index e7cde3b69f..d60cae7a3a 100644 --- a/kubernetes/sdnc/templates/sdnc-conf-configmap.yaml +++ b/kubernetes/sdnc/templates/sdnc-conf-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdnc-conf-configmap - namespace: {{ .Values.nsPrefix }}-sdnc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/conf/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdnc/templates/sdnc-data-storageclass.yaml b/kubernetes/sdnc/templates/sdnc-data-storageclass.yaml index 7c46cf4a68..d6d4eae30d 100644 --- a/kubernetes/sdnc/templates/sdnc-data-storageclass.yaml +++ b/kubernetes/sdnc/templates/sdnc-data-storageclass.yaml @@ -1,8 +1,10 @@ #{{ if not .Values.disableSdncSdncDbhost }} +#{{ if not .Values.disableNfsProvisioner }} kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: "{{ .Values.nsPrefix }}-sdnc-data" - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" provisioner: sdnc/nfs #{{ end }} +#{{ end }} diff --git a/kubernetes/sdnc/templates/sdnc-log-configmap.yaml b/kubernetes/sdnc/templates/sdnc-log-configmap.yaml index d13daacb89..a7cada8c81 100644 --- a/kubernetes/sdnc/templates/sdnc-log-configmap.yaml +++ b/kubernetes/sdnc/templates/sdnc-log-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdnc-log-configmap - namespace: {{ .Values.nsPrefix }}-sdnc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdnc-logging-cfg-configmap - namespace: {{ .Values.nsPrefix }}-sdnc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdnc/templates/sdnc-statefulset.yaml b/kubernetes/sdnc/templates/sdnc-statefulset.yaml index 02950ba4c6..1f020377bd 100644 --- a/kubernetes/sdnc/templates/sdnc-statefulset.yaml +++ b/kubernetes/sdnc/templates/sdnc-statefulset.yaml @@ -3,7 +3,7 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: name: sdnc - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" spec: serviceName: "sdnhost-cluster" replicas: {{ .Values.numberOfODLReplicas }} @@ -37,8 +37,8 @@ spec: - bash - "-c" - | - sed -i 's/dbhost/sdnc-dbhost-0.dbhost.onap-sdnc.svc.cluster.local/g' /opt/onap/sdnc/data/properties/svclogic.properties - sed -i 's/^\(org.onap.ccsdk.sli.jdbc.hosts=\).*/\1sdnc-dbhost-0.dbhost.onap-sdnc.svc.cluster.local/' /opt/onap/sdnc/data/properties/dblib.properties + sed -i 's/dbhost/sdnc-dbhost-0.dbhost.{{ .Values.nsPrefix }}.svc.cluster.local/g' /opt/onap/sdnc/data/properties/svclogic.properties + sed -i 's/^\(org.onap.ccsdk.sli.jdbc.hosts=\).*/\1sdnc-dbhost-0.dbhost.{{ .Values.nsPrefix }}.svc.cluster.local/' /opt/onap/sdnc/data/properties/dblib.properties /opt/onap/sdnc/bin/startODL.sh env: - name: MYSQL_ROOT_PASSWORD diff --git a/kubernetes/sdnc/templates/ueb-deployment-configmap.yaml b/kubernetes/sdnc/templates/ueb-deployment-configmap.yaml index 4970de01b6..6aeaa9f4c9 100644 --- a/kubernetes/sdnc/templates/ueb-deployment-configmap.yaml +++ b/kubernetes/sdnc/templates/ueb-deployment-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: sdnc-ueb-configmap - namespace: {{ .Values.nsPrefix }}-sdnc + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/ueb/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/sdnc/templates/ueb-deployment.yaml b/kubernetes/sdnc/templates/ueb-deployment.yaml index c109acdaef..b869ca9b83 100644 --- a/kubernetes/sdnc/templates/ueb-deployment.yaml +++ b/kubernetes/sdnc/templates/ueb-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: ueb-listener - namespace: "{{ .Values.nsPrefix }}-sdnc" + name: sdnc-ueb-listener + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.uebReplicas }} selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: ueb-listener - name: ueb-listener + name: sdnc-ueb-listener spec: initContainers: - command: diff --git a/kubernetes/sdnc/templates/web-deployment.yaml b/kubernetes/sdnc/templates/web-deployment.yaml index 73d8e0a6cb..968ec8d443 100644 --- a/kubernetes/sdnc/templates/web-deployment.yaml +++ b/kubernetes/sdnc/templates/web-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: sdnc-portal - namespace: "{{ .Values.nsPrefix }}-sdnc" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.portalReplicas }} selector: diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 523db5a8f4..b502a7427a 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -22,3 +22,5 @@ uebReplicas: 1 portalReplicas: 1 disableSdncSdncDgbuilder: false disableSdncSdncPortal: false +disableNfsProvisioner: false + diff --git a/kubernetes/uui/templates/all-services.yaml b/kubernetes/uui/templates/all-services.yaml index 7b23b36808..173fc77ab4 100644 --- a/kubernetes/uui/templates/all-services.yaml +++ b/kubernetes/uui/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui name: uui - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -34,7 +34,7 @@ metadata: labels: app: uui-server name: uui-server - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { diff --git a/kubernetes/uui/templates/uui-deployment.yaml b/kubernetes/uui/templates/uui-deployment.yaml index db7ac1a9da..1e18009be5 100644 --- a/kubernetes/uui/templates/uui-deployment.yaml +++ b/kubernetes/uui/templates/uui-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui name: uui - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -26,7 +26,7 @@ spec: name: uui env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: 8080 readinessProbe: @@ -36,4 +36,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/uui/templates/uui-server-deployment.yaml b/kubernetes/uui/templates/uui-server-deployment.yaml index 2462a69be1..e3c58a87e6 100644 --- a/kubernetes/uui/templates/uui-server-deployment.yaml +++ b/kubernetes/uui/templates/uui-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: uui-server name: uui-server - namespace: "{{ .Values.nsPrefix }}-uui" + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -22,9 +22,9 @@ spec: name: uui-server env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{tpl .Values.msbaddr .}} - name: MR_ADDR - value: {{ .Values.mraddr }} + value: {{tpl .Values.mraddr .}} ports: - containerPort: 8082 readinessProbe: @@ -34,4 +34,4 @@ spec: periodSeconds: 10 imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/uui/values.yaml b/kubernetes/uui/values.yaml index 361c68a196..f9e23b0f98 100644 --- a/kubernetes/uui/values.yaml +++ b/kubernetes/uui/values.yaml @@ -1,8 +1,8 @@ nsPrefix: onap pullPolicy: Always uuiPortPrefix: 303 -msbaddr: msb-iag.onap-msb:80 -mraddr: dmaap.onap-message-router:3904 +msbaddr: msb-iag.{{ .Values.nsPrefix }}:80 +mraddr: dmaap.{{ .Values.nsPrefix }}:3904 image: uuiImage: nexus3.onap.org:10001/onap/usecase-ui uuiVersion: v1.0.1 diff --git a/kubernetes/vfc/templates/all-services.yaml b/kubernetes/vfc/templates/all-services.yaml index ff9eea4587..36a8d999ac 100755 --- a/kubernetes/vfc/templates/all-services.yaml +++ b/kubernetes/vfc/templates/all-services.yaml @@ -5,7 +5,7 @@ metadata: labels: app: vfc-nslcm name: vfc-nslcm - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -34,7 +34,7 @@ metadata: labels: app: vfc-resmgr name: vfc-resmgr - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -63,7 +63,7 @@ metadata: labels: app: vfc-gvnfmdriver name: vfc-gvnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -92,7 +92,7 @@ metadata: labels: app: vfc-ztevnfmdriver name: vfc-ztevnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -121,7 +121,7 @@ metadata: labels: app: vfc-nokiavnfmdriver name: vfc-nokiavnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -150,7 +150,7 @@ metadata: labels: app: vfc-hwvnfmdriver name: vfc-hwvnfmdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -179,7 +179,7 @@ metadata: labels: app: vfc-ztesdncdriver name: vfc-ztesdncdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -208,7 +208,7 @@ metadata: labels: app: vfc-jujudriver name: vfc-jujudriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -237,7 +237,7 @@ metadata: labels: app: vfc-vnflcm name: vfc-vnflcm - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -266,7 +266,7 @@ metadata: labels: app: vfc-vnfres name: vfc-vnfres - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -295,7 +295,7 @@ metadata: labels: app: vfc-vnfmgr name: vfc-vnfmgr - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -324,7 +324,7 @@ metadata: labels: app: vfc-emsdriver name: vfc-emsdriver - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -353,7 +353,7 @@ metadata: labels: app: vfc-workflow name: vfc-workflow - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -382,7 +382,7 @@ metadata: labels: app: vfc-workflowengineactiviti name: vfc-workflowengineactiviti - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { @@ -411,7 +411,7 @@ metadata: labels: app: vfc-catalog name: vfc-catalog - namespace: "{{ .Values.nsPrefix }}-vfc" + namespace: "{{ .Values.nsPrefix }}" annotations: msb.onap.org/service-info: '[ { diff --git a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml index 1782e24807..0384fefa76 100755 --- a/kubernetes/vfc/templates/vfc-catalog-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-catalog-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-catalog - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.catalog.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-catalog" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.catalog.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml index 6adc0dc833..548bbe7413 100755 --- a/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-emsdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-emsdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.emsdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-emsdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.emsdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml index 18558afada..02093ce00e 100755 --- a/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-gvnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-gvnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.gvnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-gvnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.gvnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml index e9d3282ef7..9b73626e74 100755 --- a/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-hwvnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-hwvnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.hwvnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-hwvnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.hwvnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml index 28a3c1e6b6..127612bed2 100755 --- a/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-jujudriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-jujudriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.jujudriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-jujudriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.jujudriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml index 9a648ca203..4925d1c121 100755 --- a/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-nokiavnfmdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-nokiavnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nokiavnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-nokiavnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.nokiavnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml index 400a680a9a..618968dd9f 100755 --- a/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-nslcm-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-nslcm - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.nslcm.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-nslcm" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.nslcm.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml index 2c6a895518..a6e8125a1e 100755 --- a/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-resmgr-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-resmgr - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.resmgr.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-resmgr" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.resmgr.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml index 0d8922973b..ef4793dfaf 100755 --- a/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnflcm-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnflcm - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnflcm.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnflcm" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnflcm.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml index 566c3cabbd..e3eb750678 100755 --- a/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfmgr-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnfmgr - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnfmgr.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnfmgr" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnfmgr.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml index 50b52b1a77..34f2595ccf 100755 --- a/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-vnfres-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-vnfres - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vnfres.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-vnfres" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.vnfres.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml index f19b55fe95..c2a8205d0d 100755 --- a/kubernetes/vfc/templates/vfc-workflow-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-workflow-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-workflow - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.workflow.replicas }} selector: @@ -28,7 +28,7 @@ spec: - name: SERVICE_PORT value: "{{ .Values.workflow.port }}" - name: OPENPALETTE_MSB_IP - value: msb-iag.{{ .Values.nsPrefix }}-msb + value: msb-iag.{{ .Values.nsPrefix }} - name: OPENPALETTE_MSB_PORT value: "80" ports: @@ -41,4 +41,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml index cb18ada997..d22481526c 100755 --- a/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml +++ b/kubernetes/vfc/templates/vfc-workflow-engine-activity.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-workflowengineactiviti - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.workflowengineactiviti.replicas }} selector: @@ -28,7 +28,7 @@ spec: - name: SERVICE_PORT value: "{{ .Values.workflow.port }}" - name: OPENPALETTE_MSB_IP - value: msb-iag.{{ .Values.nsPrefix }}-msb + value: msb-iag.{{ .Values.nsPrefix }} - name: OPENPALETTE_MSB_PORT value: "80" ports: @@ -41,4 +41,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml index 828e7b32b1..9eae38543c 100755 --- a/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztesdncdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-ztesdncdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.ztesdncdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-ztesdncdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.ztesdncdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml index aed359eceb..e79a27ef11 100755 --- a/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml +++ b/kubernetes/vfc/templates/vfc-ztevmanagerdriver-deployment.yaml @@ -3,7 +3,7 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: name: vfc-ztevnfmdriver - namespace: "{{ .Values.nsPrefix }}-{{ .Chart.Name }}" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.ztevnfmdriver.replicas }} selector: @@ -22,7 +22,7 @@ spec: name: "vfc-ztevnfmdriver" env: - name: MSB_ADDR - value: {{ .Values.msbaddr }} + value: {{ tpl .Values.msbaddr . }} ports: - containerPort: {{ .Values.ztevnfmdriver.port }} readinessProbe: @@ -33,4 +33,4 @@ spec: imagePullPolicy: "{{ .Values.pullPolicy }}" imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vfc/values.yaml b/kubernetes/vfc/values.yaml index 46aa9b71f8..13fb94f638 100644 --- a/kubernetes/vfc/values.yaml +++ b/kubernetes/vfc/values.yaml @@ -1,6 +1,6 @@ nsPrefix: onap pullPolicy: IfNotPresent -msbaddr: msb-iag.onap-msb:80 +msbaddr: msb-iag.{{ .Values.nsPrefix }}:80 nslcm: image: nexus3.onap.org:10001/onap/vfc/nslcm:v1.0.2 port: 8403 @@ -75,4 +75,4 @@ catalog: image: nexus3.onap.org:10001/onap/vfc/catalog:v1.0.2 port: 8806 nodePort: 30806 - replicas: 1
\ No newline at end of file + replicas: 1 diff --git a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml index f316b866af..89c6932577 100644 --- a/kubernetes/vid/resources/config/log/filebeat/filebeat.yml +++ b/kubernetes/vid/resources/config/log/filebeat/filebeat.yml @@ -21,7 +21,7 @@ output.logstash: #List of logstash server ip addresses with port number. #But, in our case, this will be the loadbalancer IP address. #For the below property to work the loadbalancer or logstash should expose 5044 port to listen the filebeat events or port in the property should be changed appropriately. - hosts: ["logstash.onap-log:5044"] + hosts: ["logstash.{{.Values.nsPrefix}}:5044"] #If enable will do load balancing among availabe Logstash, automatically. loadbalance: true diff --git a/kubernetes/vid/templates/all-services.yaml b/kubernetes/vid/templates/all-services.yaml index 1aa2bb0a0b..cd22b7d095 100644 --- a/kubernetes/vid/templates/all-services.yaml +++ b/kubernetes/vid/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: vid-mariadb - namespace: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: vid-mariadb @@ -20,7 +20,7 @@ metadata: labels: app: vid-server name: vid-server - namespace: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" spec: ports: - name: vid-server diff --git a/kubernetes/vid/templates/vid-lfconfig-configmap.yaml b/kubernetes/vid/templates/vid-lfconfig-configmap.yaml index 1cc3f218b9..1743872ef8 100644 --- a/kubernetes/vid/templates/vid-lfconfig-configmap.yaml +++ b/kubernetes/vid/templates/vid-lfconfig-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: vid-lfconfig-configmap - namespace: {{ .Values.nsPrefix }}-vid + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/lf_config/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/vid/templates/vid-log-configmap.yaml b/kubernetes/vid/templates/vid-log-configmap.yaml index 00481d259e..896f47dded 100644 --- a/kubernetes/vid/templates/vid-log-configmap.yaml +++ b/kubernetes/vid/templates/vid-log-configmap.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: vid-log-configmap - namespace: {{ .Values.nsPrefix }}-vid + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/vid/*").AsConfig . | indent 2 }} --- @@ -11,7 +11,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: vid-filebeat-configmap - namespace: {{ .Values.nsPrefix }}-vid + namespace: {{ .Values.nsPrefix }} data: {{ tpl (.Files.Glob "resources/config/log/filebeat/*").AsConfig . | indent 2 }} #{{ end }} diff --git a/kubernetes/vid/templates/vid-mariadb-deployment.yaml b/kubernetes/vid/templates/vid-mariadb-deployment.yaml index bf23c3f8b1..41bfb90b74 100644 --- a/kubernetes/vid/templates/vid-mariadb-deployment.yaml +++ b/kubernetes/vid/templates/vid-mariadb-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: vid-mariadb name: vid-mariadb - namespace: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vidMariaDbReplicas }} selector: diff --git a/kubernetes/vid/templates/vid-pv-pvc.yaml b/kubernetes/vid/templates/vid-pv-pvc.yaml index 3315d093e3..df8d99764f 100644 --- a/kubernetes/vid/templates/vid-pv-pvc.yaml +++ b/kubernetes/vid/templates/vid-pv-pvc.yaml @@ -2,10 +2,10 @@ apiVersion: v1 kind: PersistentVolume metadata: - name: "{{ .Values.nsPrefix }}-vid-db" - namespace: "{{ .Values.nsPrefix }}-vid" + name: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" labels: - name: "{{ .Values.nsPrefix }}-vid-db" + name: "{{ .Values.nsPrefix }}-vid" spec: capacity: storage: 2Gi @@ -19,7 +19,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: vid-db - namespace: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" spec: accessModes: - ReadWriteMany @@ -28,5 +28,5 @@ spec: storage: 2Gi selector: matchLabels: - name: "{{ .Values.nsPrefix }}-vid-db" + name: "{{ .Values.nsPrefix }}-vid" #{{ end }} diff --git a/kubernetes/vid/templates/vid-server-deployment.yaml b/kubernetes/vid/templates/vid-server-deployment.yaml index 7f9cb653b2..a0569abc93 100644 --- a/kubernetes/vid/templates/vid-server-deployment.yaml +++ b/kubernetes/vid/templates/vid-server-deployment.yaml @@ -5,7 +5,7 @@ metadata: labels: app: vid-server name: vid-server - namespace: "{{ .Values.nsPrefix }}-vid" + namespace: "{{ .Values.nsPrefix }}" spec: replicas: {{ .Values.vidServerReplicas }} selector: @@ -35,19 +35,19 @@ spec: containers: - env: - name: ASDC_CLIENT_REST_HOST - value: sdc-be.{{ .Values.nsPrefix }}-sdc + value: sdc-be.{{ .Values.nsPrefix }} - name: ASDC_CLIENT_REST_AUTH value: Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU= - name: ASDC_CLIENT_REST_PORT value: "8080" - name: VID_AAI_HOST - value: aai-service.{{ .Values.nsPrefix }}-aai + value: aai-service.{{ .Values.nsPrefix }} - name: VID_AAI_PORT value: "8443" - name: VID_ECOMP_SHARED_CONTEXT_REST_URL - value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/context + value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/context - name: VID_MSO_SERVER_URL - value: http://mso.{{ .Values.nsPrefix }}-mso:8080 + value: http://mso.{{ .Values.nsPrefix }}:8080 - name: VID_MSO_PASS value: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz - name: MSO_DME2_SERVER_URL @@ -55,13 +55,13 @@ spec: - name: MSO_DME2_ENABLED value: "false" - name: VID_ECOMP_REDIRECT_URL - value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/login.htm + value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/login.htm - name: VID_ECOMP_REST_URL - value: http://portalapps.{{ .Values.nsPrefix }}-portal:8989/ONAPPORTAL/auxapi + value: http://portalapps.{{ .Values.nsPrefix }}:8989/ONAPPORTAL/auxapi - name: VID_CONTACT_US_LINK value: https://todo_contact_us_link.com - name: VID_UEB_URL_LIST - value: dmaap.{{ .Values.nsPrefix }}-message-router + value: dmaap.{{ .Values.nsPrefix }} - name: VID_MYSQL_HOST value: vid-mariadb - name: VID_MYSQL_PORT diff --git a/kubernetes/vnfsdk/templates/all-services.yaml b/kubernetes/vnfsdk/templates/all-services.yaml index c78dab8193..759e26dace 100644 --- a/kubernetes/vnfsdk/templates/all-services.yaml +++ b/kubernetes/vnfsdk/templates/all-services.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Service metadata: name: postgres - namespace: {{ .Values.nsPrefix }}-vnfsdk + namespace: {{ .Values.nsPrefix }} labels: app: postgres spec: @@ -22,7 +22,7 @@ metadata: labels: app: refrepo name: refrepo - namespace: {{ .Values.nsPrefix }}-vnfsdk + namespace: {{ .Values.nsPrefix }} spec: ports: - name: "refrepo-port" diff --git a/kubernetes/vnfsdk/templates/postgres-deployment.yaml b/kubernetes/vnfsdk/templates/postgres-deployment.yaml index cdc2ba9572..d0002662c6 100644 --- a/kubernetes/vnfsdk/templates/postgres-deployment.yaml +++ b/kubernetes/vnfsdk/templates/postgres-deployment.yaml @@ -2,8 +2,8 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: postgres - namespace: {{ .Values.nsPrefix }}-vnfsdk + name: vnfsdk-postgres + namespace: {{ .Values.nsPrefix }} spec: replicas: 1 selector: @@ -13,7 +13,7 @@ spec: metadata: labels: app: postgres - name: postgres + name: vnfsdk-postgres spec: hostname: postgres containers: @@ -23,4 +23,4 @@ spec: name: "postgres" imagePullSecrets: - name: {{ .Values.nsPrefix }}-docker-registry-key -#{{ end }}
\ No newline at end of file +#{{ end }} diff --git a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml index 0a56c740c1..ba13292f0f 100644 --- a/kubernetes/vnfsdk/templates/refrepo-deployment.yaml +++ b/kubernetes/vnfsdk/templates/refrepo-deployment.yaml @@ -4,8 +4,8 @@ kind: Deployment metadata: labels: app: refrepo - name: refrepo - namespace: "{{ .Values.nsPrefix }}-vnfsdk" + name: vnfsdk-refrepo + namespace: "{{ .Values.nsPrefix }}" spec: selector: matchLabels: @@ -14,7 +14,7 @@ spec: metadata: labels: app: refrepo - name: refrepo + name: vnfsdk-refrepo spec: initContainers: - command: |