aboutsummaryrefslogtreecommitdiffstats
path: root/sdc-os-chef
diff options
context:
space:
mode:
Diffstat (limited to 'sdc-os-chef')
-rw-r--r--sdc-os-chef/environments/Template.json16
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/configmaps/sdc-environment-configmap.yaml16
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml23
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml4
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml48
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml131
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-onboard-cassandra-init.yaml86
-rw-r--r--sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml32
-rw-r--r--sdc-os-chef/kubernetes/sdc/values.yaml2
-rw-r--r--sdc-os-chef/pom.xml18
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh54
-rwxr-xr-xsdc-os-chef/scripts/k8s/bin_nsenterbin0 -> 90162 bytes
-rw-r--r--sdc-os-chef/scripts/k8s/etc_nsenter (renamed from sdc-os-chef/scripts/k8s/etc/bash_completion.d/nsenter)0
-rw-r--r--sdc-os-chef/scripts/k8s/kubernetes_run.sh23
-rw-r--r--sdc-os-chef/sdc-os-common/.gitignore21
-rw-r--r--sdc-os-chef/sdc-os-common/.kitchen.yml26
-rw-r--r--sdc-os-chef/sdc-os-common/Berksfile3
-rw-r--r--sdc-os-chef/sdc-os-common/README.md4
-rw-r--r--sdc-os-chef/sdc-os-common/chefignore107
-rw-r--r--sdc-os-chef/sdc-os-common/metadata.rb20
-rw-r--r--sdc-os-chef/sdc-os-common/recipes/default.rb5
-rw-r--r--sdc-os-chef/sdc-os-common/spec/spec_helper.rb2
-rw-r--r--sdc-os-chef/sdc-os-common/spec/unit/recipes/default_spec.rb22
-rw-r--r--sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb634
-rw-r--r--sdc-os-chef/sdc-os-common/test/smoke/default/default_test.rb18
25 files changed, 394 insertions, 921 deletions
diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index 7eb7376ed4..9073f2c562 100644
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -11,6 +11,7 @@
"disableHttp": false,
"CS_VIP": "yyy",
"BE_VIP": "yyy",
+ "ONBOARDING_BE_VIP": "yyy",
"FE_VIP": "yyy",
"ES_VIP": "yyy",
"KB_VIP": "yyy",
@@ -34,11 +35,12 @@
"fqdn": ["10.0.11.1", "10.0.11.1"]
},
"Nodes": {
- "CS": "yyy",
- "BE": "yyy",
- "FE": "yyy",
- "ES": "yyy",
- "KB": "yyy"
+ "CS": "yyy",
+ "BE": "yyy",
+ "ONBOARDING_BE": "yyy",
+ "FE": "yyy",
+ "ES": "yyy",
+ "KB": "yyy"
},
"Plugins": {
"DCAE": {
@@ -64,6 +66,10 @@
"http_port": "8080",
"https_port": "8443"
},
+ "ONBOARDING_BE": {
+ "http_port": "8081",
+ "https_port": "8445"
+ },
"elasticsearch": {
"cluster_name": "SDC-ES-",
"ES_path_home": "/usr/share/elasticsearch",
diff --git a/sdc-os-chef/kubernetes/sdc/templates/configmaps/sdc-environment-configmap.yaml b/sdc-os-chef/kubernetes/sdc/templates/configmaps/sdc-environment-configmap.yaml
index abc1d209ba..29215a0748 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/configmaps/sdc-environment-configmap.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/configmaps/sdc-environment-configmap.yaml
@@ -17,11 +17,12 @@ data:
"default_attributes": {
"disableHttp": false,
- "CS_VIP": "sdc-cs.{{ .Values.nsPrefix }}",
- "BE_VIP": "sdc-be.{{ .Values.nsPrefix }}",
- "FE_VIP": "sdc-fe.{{ .Values.nsPrefix }}",
- "ES_VIP": "sdc-es.{{ .Values.nsPrefix }}",
- "KB_VIP": "sdc-es.{{ .Values.nsPrefix }}",
+ "CS_VIP": "sdc-cs.{{ .Values.nsPrefix }}-sdc",
+ "BE_VIP": "sdc-be.{{ .Values.nsPrefix }}-sdc",
+ "ONBOARDING_BE_VIP": "sdc-onboard-be.{{ .Values.nsPrefix }}-sdc",
+ "FE_VIP": "sdc-fe.{{ .Values.nsPrefix }}-sdc",
+ "ES_VIP": "sdc-es.{{ .Values.nsPrefix }}-sdc",
+ "KB_VIP": "sdc-es.{{ .Values.nsPrefix }}-sdc",
"interfaces": {
"application": "eth0",
"private": "eth1"
@@ -44,6 +45,7 @@ data:
"Nodes": {
"CS": "sdc-cs",
"BE": "sdc-be",
+ "ONBOARDING_BE": "sdc-onboard-be",
"FE": "sdc-fe",
"ES": "sdc-es",
"KB": "sdc-kb"
@@ -72,6 +74,10 @@ data:
"http_port": "8080",
"https_port": "8443"
},
+ "ONBOARDING_BE": {
+ "http_port": "8081",
+ "https_port": "8445"
+ },
"elasticsearch": {
"cluster_name": "SDC-ES-",
"ES_path_home": "/usr/share/elasticsearch",
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
index c0ff9e13a1..8189bd9785 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-be.yaml
@@ -35,6 +35,8 @@ spec:
- sdc-cs
- --container-name
- sdc-kb
+ - --container-name
+ - sdc-onboard-backend
env:
- name: NAMESPACE
valueFrom:
@@ -67,8 +69,8 @@ spec:
- containerPort: 8443
- containerPort: 8080
volumeMounts:
- - mountPath: /usr/share/elasticsearch/data/
- name: sdc-sdc-es-es
+ #- mountPath: /usr/share/elasticsearch/data/
+ # name: sdc-sdc-es-es
- mountPath: /root/chef-solo/environments/
name: sdc-environments
- mountPath: /etc/localtime
@@ -88,14 +90,17 @@ spec:
fieldRef:
fieldPath: status.podIP
- name: JAVA_OPTIONS
- value: ""
+ value: "-Xmx1536m -Xms1536m"
+ - name: cassandra_ssl_enabled
+ value: "false"
lifecycle:
postStart:
exec:
command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-be/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
readinessProbe:
- tcpSocket:
- port: 8443
+ exec:
+ command:
+ - "/var/lib/ready-probe.sh"
initialDelaySeconds: 120
periodSeconds: 10
failureThreshold: 30
@@ -110,9 +115,9 @@ spec:
- name: sdc-logback
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/be/logback.xml
- - name: sdc-sdc-es-es
- hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
+ #- name: sdc-sdc-es-es
+ # hostPath:
+ # path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
configMap:
name: sdc-environment
@@ -121,7 +126,7 @@ spec:
path: /etc/localtime
- name: sdc-logs
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs/BE
- name: sdc-check-job-completion
configMap:
name: sdc-check-job-completion
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
index 61efd8ba9a..9dad280526 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-cs.yaml
@@ -30,6 +30,10 @@ spec:
- name: CS_PASSWORD
valueFrom:
secretKeyRef: {name: sdc-cs-secret, key: cs_password}
+ - name: MAX_HEAP_SIZE
+ value: 1536M
+ - name: HEAP_NEWSIZE
+ value: 512M
volumeMounts:
- mountPath: /var/lib/cassandra/
name: sdc-sdc-cs-cs
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
index 874db48f58..68493a7b84 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-fe.yaml
@@ -22,13 +22,11 @@ spec:
- /root/ready.py
args:
- --container-name
- - sdc-es
- - --container-name
- - sdc-cs
- - --container-name
- sdc-kb
- --container-name
- sdc-be
+ - --container-name
+ - sdc-onboard-backend
env:
- name: NAMESPACE
valueFrom:
@@ -37,6 +35,21 @@ spec:
fieldPath: metadata.namespace
image: "{{ .Values.image.readiness }}"
imagePullPolicy: "{{ .Values.pullPolicy }}"
+ - name: sdc-job-completion
+ image: "{{ .Values.image.readiness }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ command:
+ - python
+ args:
+ - /root/readiness/sdc_check_job_completion.py
+ - --job-name
+ - sdc-config-backend
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
volumes:
# - name: filebeat-conf
# hostPath:
@@ -45,24 +58,15 @@ spec:
emptyDir: {}
- name: sdc-data-filebeat
emptyDir: {}
-# - name: sdc-logback
-# hostPath:
-# path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/fe/logback.xml
-# - name: sdc-sdc-es-es
-# hostPath:
-# path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
- name: sdc-environments
configMap:
name: sdc-environment
- name: sdc-localtime
hostPath:
path: /etc/localtime
-# - name: sdc-logs
-# hostPath:
-# path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs
-# - name: sdc-fe-config
-# hostPath:
-# path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/sdc-fe/FE_2_setup_configuration.rb
+ - name: sdc-logs
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs/FE
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
containers:
@@ -77,23 +81,17 @@ spec:
fieldRef:
fieldPath: status.podIP
- name: JAVA_OPTIONS
- value: ""
+ value: "-Xmx256m -Xms256m"
volumeMounts:
-# - mountPath: /usr/share/elasticsearch/data/
-# name: sdc-sdc-es-es
- mountPath: /root/chef-solo/environments/
name: sdc-environments
- mountPath: /etc/localtime
name: sdc-localtime
readOnly: true
-# - mountPath: /var/lib/jetty/logs
-# name: sdc-logs
+ - mountPath: /var/lib/jetty/logs
+ name: sdc-logs
# - mountPath: /var/log/onap
# name: sdc-logs-2
-# - mountPath: /root/chef-solo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb
-# name: sdc-fe-config
-# - mountPath: /tmp/logback.xml
-# name: sdc-logback
lifecycle:
postStart:
exec:
diff --git a/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml
new file mode 100644
index 0000000000..267b3bb3d2
--- /dev/null
+++ b/sdc-os-chef/kubernetes/sdc/templates/deployments/sdc-onboard.yaml
@@ -0,0 +1,131 @@
+#{{ if not .Values.disableSdcSdcBe }}
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ labels:
+ app: sdc-onboard-backend
+ name: sdc-onboard-backend
+ namespace: "{{ .Values.nsPrefix }}-sdc"
+spec:
+ replicas: 1
+ strategy:
+ type: RollingUpdate
+ rollingUpdate:
+ maxSurge: 2
+ maxUnavailable: 0
+ selector:
+ matchLabels:
+ app: sdc-onboard-backend
+ template:
+ metadata:
+ labels:
+ app: sdc-onboard-backend
+ name: sdc-onboard-backend
+ spec:
+ initContainers:
+ - name: sdc-onboard-init-readiness
+ image: "{{ .Values.image.readiness }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - sdc-cs
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ - name: sdc-job-completion
+ image: "{{ .Values.image.readiness }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ command:
+ - python
+ args:
+ - /root/readiness/sdc_check_job_completion.py
+ - --job-name
+ - sdc-onboard-cassandra-init
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ volumeMounts:
+ - mountPath: /root/readiness
+ name: sdc-check-job-completion
+ containers:
+ - name: sdc-onboard-backend
+ image: "{{ .Values.image.sdcOnboardBackend }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ ports:
+ - containerPort: 8445
+ - containerPort: 8081
+ volumeMounts:
+ - mountPath: /root/chef-solo/environments/
+ name: sdc-environments
+ - mountPath: /etc/localtime
+ name: sdc-localtime
+ readOnly: true
+ - mountPath: /var/lib/jetty/logs
+ name: sdc-logs
+ - mountPath: /var/log/onap
+ name: sdc-logs-2
+ - mountPath: /tmp/logback.xml
+ name: sdc-logback
+ env:
+ - name: ENVNAME
+ value: "{{ .Values.env.name }}"
+ - name: HOST_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+ - name: SDC_CLUSTER_NAME
+ value: "SDC-CS-{{ .Values.env.name }}"
+ - name: SDC_USER
+ valueFrom:
+ secretKeyRef: {name: sdc-cs-secret, key: sdc_user}
+ - name: SDC_PASSWORD
+ valueFrom:
+ secretKeyRef: {name: sdc-cs-secret, key: sdc_password}
+ - name: JAVA_OPTIONS
+ value: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g"
+ - name: cassandra_ssl_enabled
+ value: "false"
+ lifecycle:
+ postStart:
+ exec:
+ command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/onboarding-be/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
+ readinessProbe:
+ exec:
+ command:
+ - "/var/lib/ready-probe.sh"
+ initialDelaySeconds: 60
+ periodSeconds: 10
+ volumes:
+ - name: filebeat-conf
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
+ - name: sdc-logs-2
+ emptyDir: {}
+ - name: sdc-data-filebeat
+ emptyDir: {}
+ - name: sdc-logback
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/sdc/onboard-be/logback.xml
+ - name: sdc-environments
+ configMap:
+ name: sdc-environment
+ - name: sdc-localtime
+ hostPath:
+ path: /etc/localtime
+ - name: sdc-logs
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdc/logs/ONBOARD
+ - name: sdc-check-job-completion
+ configMap:
+ name: sdc-check-job-completion
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}
diff --git a/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-onboard-cassandra-init.yaml b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-onboard-cassandra-init.yaml
new file mode 100644
index 0000000000..2cf9ec3fd3
--- /dev/null
+++ b/sdc-os-chef/kubernetes/sdc/templates/jobs/sdc-onboard-cassandra-init.yaml
@@ -0,0 +1,86 @@
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+ name: sdc-onboard-cassandra-init
+ namespace: "{{ .Values.nsPrefix }}-sdc"
+ labels:
+ app: sdc-onboard-cassandra-init
+spec:
+ template:
+ metadata:
+ name: sdc-onboard-cassandra-init
+ spec:
+ initContainers:
+ - name: sdc-init-cs-readiness
+ image: "{{ .Values.image.readiness }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - sdc-cs
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ - name: sdc-job-completion
+ image: "{{ .Values.image.readiness }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ command:
+ - python
+ args:
+ - /root/readiness/sdc_check_job_completion.py
+ - --job-name
+ - sdc-config-cassandra
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ volumeMounts:
+ - mountPath: /root/readiness
+ name: sdc-check-job-completion
+
+ containers:
+ - name: sdc-onboard-cassandra-init
+ image: "{{ .Values.image.sdcOnboardBackendInit }}"
+ imagePullPolicy: "{{ .Values.pullPolicy }}"
+ volumeMounts:
+ - mountPath: /root/chef-solo/environments/
+ name: sdc-environments
+ - mountPath: /var/lib/cassandra/
+ name: sdc-sdc-cs-cs
+ env:
+ - name: ENVNAME
+ value: "{{ .Values.env.name }}"
+ - name: CS_HOST_IP
+ value: sdc-cs
+ - name: SDC_USER
+ valueFrom:
+ secretKeyRef: {name: sdc-cs-secret, key: sdc_user}
+ - name: SDC_PASSWORD
+ valueFrom:
+ secretKeyRef: {name: sdc-cs-secret, key: sdc_password}
+ - name: CS_PASSWORD
+ valueFrom:
+ secretKeyRef: {name: sdc-cs-secret, key: cs_password}
+ volumes:
+ - name: sdc-sdc-cs-cs
+ persistentVolumeClaim:
+ claimName: sdc-cs-db
+ - name: sdc-environments
+ configMap:
+ name: sdc-environment
+ - name: sdc-localtime
+ hostPath:
+ path: /etc/localtime
+ - name: sdc-check-job-completion
+ configMap:
+ name: sdc-check-job-completion
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+ restartPolicy: Never
diff --git a/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml b/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml
index 4100dc24a4..d568e9c317 100644
--- a/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml
+++ b/sdc-os-chef/kubernetes/sdc/templates/services/all-services.yaml
@@ -124,4 +124,36 @@ spec:
selector:
app: sdc-fe
type: NodePort
+---
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: sdc-onboard-be
+ name: sdc-onboard-be
+ namespace: "{{ .Values.nsPrefix }}-sdc"
+ annotations:
+ msb.onap.org/service-info: '[
+ {
+ "serviceName": "sdc-onboard-be",
+ "version": "v1",
+ "url": "/sdc/v1",
+ "protocol": "REST",
+ "port": "8081",
+ "visualRange":"1"
+ }
+ ]'
+spec:
+ ports:
+ - name: sdc-onboard-port-8445
+ nodePort: {{ .Values.nodePortPrefix }}09
+ port: 8445
+ - name: sdc-onboard-port-8081
+ nodePort: {{ .Values.nodePortPrefix }}08
+ port: 8081
+ selector:
+ app: sdc-onboard-be
+ type: NodePort
+#{{ end }}
+#{{ if not .Values.disableSdcSdcOnboardBE }}
#{{ end }} \ No newline at end of file
diff --git a/sdc-os-chef/kubernetes/sdc/values.yaml b/sdc-os-chef/kubernetes/sdc/values.yaml
index eea6b56707..d871190321 100644
--- a/sdc-os-chef/kubernetes/sdc/values.yaml
+++ b/sdc-os-chef/kubernetes/sdc/values.yaml
@@ -11,6 +11,8 @@ image:
sdcElasticsearchInit: nexus3.onap.org:10001/onap/sdc-init-elasticsearch:1.2-STAGING-latest
sdcCassandraInit: nexus3.onap.org:10001/onap/sdc-cassandra-init:1.2-STAGING-latest
sdcBackendInit: nexus3.onap.org:10001/onap/sdc-backend-init:1.2-STAGING-latest
+ sdcOnboardBackendInit: nexus3.onap.org:10001/onap/sdc-onboard-cassandra-init:1.2-STAGING-latest
+ sdcOnboardBackend: nexus3.onap.org:10001/onap/sdc-onboard-backend:1.2-STAGING-latest
filebeat: docker.elastic.co/beats/filebeat:5.5.0
env:
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 3425389408..c8c3acd6e0 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -84,13 +84,13 @@
</build>
<profiles>
- <profile>
- <id>docker-staging</id>
- <properties>
- <docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>
- <docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>
- </properties>
- </profile>
+ <!--<profile>-->
+ <!--<id>docker-staging</id>-->
+ <!--<properties>-->
+ <!--<docker.tag>${project.version}-STAGING-${maven.build.timestamp}</docker.tag>-->
+ <!--<docker.latest.tag>${project.version}-STAGING-latest</docker.latest.tag>-->
+ <!--</properties>-->
+ <!--</profile>-->
<profile>
<id>docker</id>
@@ -131,7 +131,6 @@
<dockerFileDir>${project.basedir}/sdc-init-elasticsearch</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
</tags>
</build>
@@ -146,7 +145,6 @@
<dockerFileDir>${project.basedir}/sdc-elasticsearch</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
</tags>
</build>
@@ -161,7 +159,6 @@
<dockerFileDir>${project.basedir}/sdc-kibana</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
</tags>
</build>
@@ -176,7 +173,6 @@
<dockerFileDir>${project.basedir}/sdc-cassandra</dockerFileDir>
<tags>
<tag>${docker.tag}</tag>
- <tag>${docker.latest.tag}</tag>
<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
</tags>
</build>
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index b7d96d5c62..2c12fffd7d 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -6,6 +6,7 @@ SDC_PASSWORD="Aa1234%^!"
JETTY_BASE="/var/lib/jetty"
BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m"
FE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=6000,server=y,suspend=n -Xmx256m -Xms256m"
+ONBOARD_BE_JAVA_OPTIONS="-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g"
SIM_JAVA_OPTIONS=" -Xmx128m -Xms128m -Xss1m"
API_TESTS_JAVA_OPTIONS="-Xmx512m -Xms512m"
UI_TESTS_JAVA_OPTIONS="-Xmx1024m -Xms1024m"
@@ -38,6 +39,7 @@ function dir_perms {
mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE
mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE
mkdir -p ${WORKSPACE}/data/logs/sdc-api-tests/ExtentReport
+ mkdir -p ${WORKSPACE}/data/logs/ONBOARD/SDC/ONBOARD-BE
mkdir -p ${WORKSPACE}/data/logs/sdc-api-tests/target
mkdir -p ${WORKSPACE}/data/logs/sdc-ui-tests/ExtentReport
mkdir -p ${WORKSPACE}/data/logs/sdc-ui-tests/target
@@ -69,19 +71,31 @@ function probe_be {
be_stat=false
docker exec $1 /var/lib/ready-probe.sh > /dev/null 2>&1
rc=$?
-if [[ $rc == 200 ]]; then
+if [[ $rc == 0 ]]; then
echo DOCKER start finished in $2 seconds
be_stat=true
fi
}
+function probe_sdc_onboard_be {
+
+sdc_onboard_be_stat=false
+docker exec $1 /var/lib/ready-probe.sh > /dev/null 2>&1
+rc=$?
+if [[ $rc == 0 ]]; then
+ echo DOCKER start finished in $2 seconds
+ sdc_onboard_be_stat=true
+fi
+
+}
+
function probe_fe {
fe_stat=false
docker exec $1 /var/lib/ready-probe.sh > /dev/null 2>&1
rc=$?
-if [[ $rc == 200 ]]; then
+if [[ $rc == 0 ]]; then
echo DOCKER start finished in $2 seconds
fe_stat=true
fi
@@ -144,6 +158,10 @@ function monitor_docker {
elif [ "$1" == "sdc-FE" ]; then
probe_fe $1 $TIME
if [[ $fe_stat == true ]]; then break; fi
+ elif [ "$1" == "sdc-onboard-BE" ]; then
+ probe_sdc_onboard_be $1 $TIME
+ if [[ $sdc_onboard_be_stat == true ]]; then break; fi
+
else
probe_docker $1 $TIME
if [[ $match_result == true ]]; then break; fi
@@ -189,6 +207,7 @@ RELEASE=latest
LOCAL=false
RUNTESTS=false
DEBUG_PORT="--publish 4000:4000"
+ONBOARD_DEBUG_PORT="--publish 4001:4000"
while [ $# -gt 0 ]; do
case $1 in
@@ -319,6 +338,18 @@ docker_logs sdc-cs-init
if [[ $rc != 0 ]]; then exit $rc; fi
}
+#Onboard Cassandra-init
+function sdc-cs-onboard-init {
+echo "docker run sdc-cs-onboard-init..."
+if [ ${LOCAL} = false ]; then
+ docker pull ${PREFIX}/sdc-onboard-cassandra-init:${RELEASE}
+fi
+docker run --name sdc-cs-onboard-init --env RELEASE="${RELEASE}" --env CS_HOST_IP=${IP} --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env CS_PASSWORD="${CS_PASSWORD}" --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/CS:/var/lib/cassandra --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --volume ${WORKSPACE}/data/CS-Init:/root/chef-solo/cache ${PREFIX}/sdc-onboard-cassandra-init:${RELEASE}
+rc=$?
+docker_logs sdc-onboard-cs-init
+if [[ $rc != 0 ]]; then exit $rc; fi
+}
+
#Kibana
function sdc-kbn {
echo "docker run sdc-kibana..."
@@ -355,6 +386,23 @@ docker_logs sdc-BE-init
if [[ $rc != 0 ]]; then exit $rc; fi
}
+# Onboard Back-End
+function sdc-onboard-BE {
+
+dir_perms
+# Back-End
+echo "docker run sdc-onboard-BE ..."
+if [ ${LOCAL} = false ]; then
+ docker pull ${PREFIX}/sdc-onboard-backend:${RELEASE}
+else
+ ADDITIONAL_ARGUMENTS=${ONBOARD_DEBUG_PORT}
+fi
+docker run --detach --name sdc-onboard-BE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env SDC_CLUSTER_NAME="SDC-CS-${DEP_ENV}" --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env JAVA_OPTIONS="${ONBOARD_BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/logs/ONBOARD:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8445:8445 --publish 8081:8081 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-onboard-backend:${RELEASE}
+
+echo "please wait while sdc-onboard-BE is starting..."
+monitor_docker sdc-onboard-BE
+}
+
# Front-End
function sdc-FE {
@@ -431,6 +479,8 @@ if [ -z "${DOCKER}" ]; then
sdc-cs
sdc-cs-init
# sdc-kbn
+ sdc-cs-onboard-init
+ sdc-onboard-BE
sdc-BE
sdc-BE-init
sdc-FE
diff --git a/sdc-os-chef/scripts/k8s/bin_nsenter b/sdc-os-chef/scripts/k8s/bin_nsenter
new file mode 100755
index 0000000000..9137f71456
--- /dev/null
+++ b/sdc-os-chef/scripts/k8s/bin_nsenter
Binary files differ
diff --git a/sdc-os-chef/scripts/k8s/etc/bash_completion.d/nsenter b/sdc-os-chef/scripts/k8s/etc_nsenter
index ad56f06e48..ad56f06e48 100644
--- a/sdc-os-chef/scripts/k8s/etc/bash_completion.d/nsenter
+++ b/sdc-os-chef/scripts/k8s/etc_nsenter
diff --git a/sdc-os-chef/scripts/k8s/kubernetes_run.sh b/sdc-os-chef/scripts/k8s/kubernetes_run.sh
index fd9de2e181..7a73c2af3b 100644
--- a/sdc-os-chef/scripts/k8s/kubernetes_run.sh
+++ b/sdc-os-chef/scripts/k8s/kubernetes_run.sh
@@ -52,8 +52,18 @@ status $?
print_header "Dependency - Install ..."
echo "[INFO] Install - nsenter"
# Use pre compiled nsenter:
-sudo cp bin/nsenter /usr/local/bin/nsenter
-sudo cp etc/bash_completion.d/nsenter /etc/bash_completion.d/nsenter
+if [ -f bin_nsenter ]; then
+ sudo cp bin_nsenter /usr/local/bin/nsenter
+else
+ echo "[ERROR] File [bin_nsenter] is missing"
+fi
+
+if [ -f etc_nsenter ]; then
+ sudo cp etc_nsenter /etc/bash_completion.d/nsenter
+else
+ echo "[ERROR] File [etc_nsenter] is missing"
+fi
+
## In order to build the nsenter use the below instructions:
##./build_nsenter_exec.sh
@@ -75,3 +85,12 @@ print_header "SDC - Deploy Pods ..."
sh ./deploy_k8s_sdc.sh
status $?
+
+####################
+# SDC LOGS Tree #
+####################
+print_header "SDC - Deploy Pods ..."
+mkdir -p /dockerdata-nfs/onap/sdc/logs//BE/SDC/SDC-BE
+mkdir -p /dockerdata-nfs/onap/sdc/logs/FE/SDC/SDC-FE
+mkdir -p /dockerdata-nfs/onap/sdc/logs/ONBOARD/SDC/ONBOARD-BE
+chmod -R 777 /dockerdata-nfs/onap/sdc/logs/*
diff --git a/sdc-os-chef/sdc-os-common/.gitignore b/sdc-os-chef/sdc-os-common/.gitignore
deleted file mode 100644
index febee30092..0000000000
--- a/sdc-os-chef/sdc-os-common/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-.vagrant
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-
-# Bundler
-Gemfile.lock
-bin/*
-.bundle/*
-
-# test kitchen
-.kitchen/
-.kitchen.local.yml
-
-# Chef
-Berksfile.lock
-.zero-knife.rb
-Policyfile.lock.json
diff --git a/sdc-os-chef/sdc-os-common/.kitchen.yml b/sdc-os-chef/sdc-os-common/.kitchen.yml
deleted file mode 100644
index 8df250ec0c..0000000000
--- a/sdc-os-chef/sdc-os-common/.kitchen.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-driver:
- name: vagrant
-
-provisioner:
- name: chef_zero
- # You may wish to disable always updating cookbooks in CI or other testing environments.
- # For example:
- # always_update_cookbooks: <%= !ENV['CI'] %>
- always_update_cookbooks: true
-
-verifier:
- name: inspec
-
-platforms:
- - name: ubuntu-16.04
- - name: centos-7.3
-
-suites:
- - name: default
- run_list:
- - recipe[sdc-os-common::default]
- verifier:
- inspec_tests:
- - test/smoke/default
- attributes:
diff --git a/sdc-os-chef/sdc-os-common/Berksfile b/sdc-os-chef/sdc-os-common/Berksfile
deleted file mode 100644
index 34fea2166b..0000000000
--- a/sdc-os-chef/sdc-os-common/Berksfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source 'https://supermarket.chef.io'
-
-metadata
diff --git a/sdc-os-chef/sdc-os-common/README.md b/sdc-os-chef/sdc-os-common/README.md
deleted file mode 100644
index eada81117d..0000000000
--- a/sdc-os-chef/sdc-os-common/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# sdc-os-common
-
-TODO: Enter the cookbook description here.
-
diff --git a/sdc-os-chef/sdc-os-common/chefignore b/sdc-os-chef/sdc-os-common/chefignore
deleted file mode 100644
index 38e7379bb8..0000000000
--- a/sdc-os-chef/sdc-os-common/chefignore
+++ /dev/null
@@ -1,107 +0,0 @@
-# Put files/directories that should be ignored in this file when uploading
-# to a chef-server or supermarket.
-# Lines that start with '# ' are comments.
-
-# OS generated files #
-######################
-.DS_Store
-Icon?
-nohup.out
-ehthumbs.db
-Thumbs.db
-
-# SASS #
-########
-.sass-cache
-
-# EDITORS #
-###########
-\#*
-.#*
-*~
-*.sw[a-z]
-*.bak
-REVISION
-TAGS*
-tmtags
-*_flymake.*
-*_flymake
-*.tmproj
-.project
-.settings
-mkmf.log
-
-## COMPILED ##
-##############
-a.out
-*.o
-*.pyc
-*.so
-*.com
-*.class
-*.dll
-*.exe
-*/rdoc/
-
-# Testing #
-###########
-.watchr
-.rspec
-spec/*
-spec/fixtures/*
-test/*
-features/*
-examples/*
-Guardfile
-Procfile
-.kitchen*
-.rubocop.yml
-spec/*
-Rakefile
-.travis.yml
-.foodcritic
-.codeclimate.yml
-
-# SCM #
-#######
-.git
-*/.git
-.gitignore
-.gitmodules
-.gitconfig
-.gitattributes
-.svn
-*/.bzr/*
-*/.hg/*
-*/.svn/*
-
-# Berkshelf #
-#############
-Berksfile
-Berksfile.lock
-cookbooks/*
-tmp
-
-# Policyfile #
-##############
-Policyfile.rb
-Policyfile.lock.json
-
-# Cookbooks #
-#############
-CONTRIBUTING*
-CHANGELOG*
-TESTING*
-MAINTAINERS.toml
-
-# Strainer #
-############
-Colanderfile
-Strainerfile
-.colander
-.strainer
-
-# Vagrant #
-###########
-.vagrant
-Vagrantfile
diff --git a/sdc-os-chef/sdc-os-common/metadata.rb b/sdc-os-chef/sdc-os-common/metadata.rb
deleted file mode 100644
index ff2506dfc9..0000000000
--- a/sdc-os-chef/sdc-os-common/metadata.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-name 'sdc-os-common'
-maintainer 'The Authors'
-maintainer_email 'you@example.com'
-license 'All Rights Reserved'
-description 'Installs/Configures sdc-os-common'
-long_description 'Installs/Configures sdc-os-common'
-version '0.1.0'
-chef_version '>= 12.1' if respond_to?(:chef_version)
-
-# The `issues_url` points to the location where issues for this cookbook are
-# tracked. A `View Issues` link will be displayed on this cookbook's page when
-# uploaded to a Supermarket.
-#
-# issues_url 'https://github.com/<insert_org_here>/sdc-os-common/issues'
-
-# The `source_url` points to the development reposiory for this cookbook. A
-# `View Source` link will be displayed on this cookbook's page when uploaded to
-# a Supermarket.
-#
-# source_url 'https://github.com/<insert_org_here>/sdc-os-common'
diff --git a/sdc-os-chef/sdc-os-common/recipes/default.rb b/sdc-os-chef/sdc-os-common/recipes/default.rb
deleted file mode 100644
index 4799ba4470..0000000000
--- a/sdc-os-chef/sdc-os-common/recipes/default.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Cookbook:: sdc-os-common
-# Recipe:: default
-#
-# Copyright:: 2017, The Authors, All Rights Reserved.
diff --git a/sdc-os-chef/sdc-os-common/spec/spec_helper.rb b/sdc-os-chef/sdc-os-common/spec/spec_helper.rb
deleted file mode 100644
index 1dd5126bf6..0000000000
--- a/sdc-os-chef/sdc-os-common/spec/spec_helper.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-require 'chefspec'
-require 'chefspec/berkshelf'
diff --git a/sdc-os-chef/sdc-os-common/spec/unit/recipes/default_spec.rb b/sdc-os-chef/sdc-os-common/spec/unit/recipes/default_spec.rb
deleted file mode 100644
index bd9841f76e..0000000000
--- a/sdc-os-chef/sdc-os-common/spec/unit/recipes/default_spec.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Cookbook:: sdc-os-common
-# Spec:: default
-#
-# Copyright:: 2017, The Authors, All Rights Reserved.
-
-require 'spec_helper'
-
-describe 'sdc-os-common::default' do
- context 'When all attributes are default, on an Ubuntu 16.04' do
- let(:chef_run) do
- # for a complete list of available platforms and versions see:
- # https://github.com/customink/fauxhai/blob/master/PLATFORMS.md
- runner = ChefSpec::ServerRunner.new(platform: 'ubuntu', version: '16.04')
- runner.converge(described_recipe)
- end
-
- it 'converges successfully' do
- expect { chef_run }.to_not raise_error
- end
- end
-end
diff --git a/sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb
deleted file mode 100644
index c1ba04d12d..0000000000
--- a/sdc-os-chef/sdc-os-common/templates/default/BE-configuration.yaml.erb
+++ /dev/null
@@ -1,634 +0,0 @@
-identificationHeaderFields:
- - HTTP_IV_USER
- - HTTP_CSP_FIRSTNAME
- - HTTP_CSP_LASTNAME
- - HTTP_IV_REMOTE_ADDRESS
- - HTTP_CSP_WSTYPE
-
-
-# catalog backend hostname
-beFqdn: <%= @host_ip %>
-
-# catalog backend http port
-beHttpPort: <%= @catalog_port %>
-
-# catalog backend http context
-beContext: /sdc/rest/config/get
-
-# catalog backend protocol
-beProtocol: http
-
-# catalog backend ssl port
-beSslPort: <%= @ssl_port %>
-version: 1.0
-released: 2012-11-30
-toscaConformanceLevel: 5.0
-minToscaConformanceLevel: 3.0
-
-titanCfgFile: <%= @titan_Path %>/titan.properties
-titanInMemoryGraph: false
-titanLockTimeout: 1800
-# The interval to try and reconnect to titan DB when it is down during ASDC startup:
-titanReconnectIntervalInSeconds: 3
-
-# The read timeout towards Titan DB when health check is invoked:
-titanHealthCheckReadTimeout: 1
-
-# The interval to try and reconnect to Elasticsearch when it is down during ASDC startup:
-
-esReconnectIntervalInSeconds: 3
-uebHealthCheckReconnectIntervalInSeconds: 15
-uebHealthCheckReadTimeout: 4
-
-# Protocols
-protocols:
- - http
- - https
-
-# Default imports
-defaultImports:
- - nodes:
- file: nodes.yml
- - datatypes:
- file: data.yml
- - capabilities:
- file: capabilities.yml
- - relationships:
- file: relationships.yml
- - groups:
- file: groups.yml
- - policies:
- file: policies.yml
-# Users
-users:
- tom: passwd
- bob: passwd
-
-
-cassandraConfig:
- cassandraHosts: [<%= @cassandra_ip %>]
- localDataCenter: <%= @dc1 %>
- reconnectTimeout : 30000
- authenticate: true
- username: asdc_user
- password: Aa1234%^!
- ssl: false
- truststorePath : /config/.truststore
- truststorePassword : Aa123456
- keySpaces:
- - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
- - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
- - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
- - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
- - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @dc1 %>', '<%= @rep_factor %>']}
- - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @dc1 %>', '<%= @rep_factor %>', '<%= @dc2 %>', '<%= @rep_factor %>']}
-
-#Application-specific settings of ES
-elasticSearch:
- # Mapping of index prefix to time-based frame. For example, if below is configured:
- #
- # - indexPrefix: auditingevents
- # creationPeriod: minute
- #
- # then ES object of type which is mapped to "auditingevents-*" template, and created on 2015-12-23 13:24:54, will enter "auditingevents-2015-12-23-13-24" index.
- # Another object created on 2015-12-23 13:25:54, will enter "auditingevents-2015-12-23-13-25" index.
- # If creationPeriod: month, both of the above will enter "auditingevents-2015-12" index.
- #
- # PLEASE NOTE: the timestamps are created in UTC/GMT timezone! This is needed so that timestamps will be correctly presented in Kibana.
- #
- # Legal values for creationPeriod - year, month, day, hour, minute, none (meaning no time-based behaviour).
- #
- # If no creationPeriod is configured for indexPrefix, default behavour is creationPeriod: month.
-
- indicesTimeFrequency:
- - indexPrefix: auditingevents
- creationPeriod: month
- - indexPrefix: monitoring_events
- creationPeriod: month
-artifactTypes:
- - CHEF
- - PUPPET
- - SHELL
- - YANG
- - YANG_XML
- - HEAT
- - BPEL
- - DG_XML
- - MURANO_PKG
- - WORKFLOW
- - NETWORK_CALL_FLOW
- - TOSCA_TEMPLATE
- - TOSCA_CSAR
- - AAI_SERVICE_MODEL
- - AAI_VF_MODEL
- - AAI_VF_MODULE_MODEL
- - AAI_VF_INSTANCE_MODEL
- - OTHER
- - SNMP_POLL
- - SNMP_TRAP
- - GUIDE
-
-
-licenseTypes:
- - User
- - Installation
- - CPU
-
-#Deployment artifacts placeHolder
-resourceTypes: &allResourceTypes
- - VFC
- - CP
- - VL
- - VF
- - VFCMT
- - Abstract
- - CVFC
-
-# validForResourceTypes usage
-# validForResourceTypes:
-# - VF
-# - VL
-deploymentResourceArtifacts:
-
-
-deploymentResourceInstanceArtifacts:
- heatEnv:
- displayName: "HEAT ENV"
- type: HEAT_ENV
- description: "Auto-generated HEAT Environment deployment artifact"
- fileExtension: "env"
- VfHeatEnv:
- displayName: "VF HEAT ENV"
- type: HEAT_ENV
- description: "VF Auto-generated HEAT Environment deployment artifact"
- fileExtension: "env"
-
-#tosca artifacts placeholders
-toscaArtifacts:
- assetToscaTemplate:
- artifactName: -template.yml
- displayName: Tosca Template
- type: TOSCA_TEMPLATE
- description: TOSCA representation of the asset
- assetToscaCsar:
- artifactName: -csar.csar
- displayName: Tosca Model
- type: TOSCA_CSAR
- description: TOSCA definition package of the asset
-
-#Informational artifacts placeHolder
-excludeResourceCategory:
- - Generic
-excludeResourceType:
- - PNF
-informationalResourceArtifacts:
- features:
- displayName: Features
- type: OTHER
- capacity:
- displayName: Capacity
- type: OTHER
- vendorTestResult:
- displayName: Vendor Test Result
- type: OTHER
- testScripts:
- displayName: Test Scripts
- type: OTHER
- CloudQuestionnaire:
- displayName: Cloud Questionnaire (completed)
- type: OTHER
- HEATTemplateFromVendor:
- displayName: HEAT Template from Vendor
- type: HEAT
- resourceSecurityTemplate:
- displayName: Resource Security Template
- type: OTHER
-
-excludeServiceCategory:
-
-informationalServiceArtifacts:
- serviceArtifactPlan:
- displayName: Service Artifact Plan
- type: OTHER
- summaryOfImpactsToECOMPElements:
- displayName: Summary of impacts to ECOMP elements,OSSs, BSSs
- type: OTHER
- controlLoopFunctions:
- displayName: Control Loop Functions
- type: OTHER
- dimensioningInfo:
- displayName: Dimensioning Info
- type: OTHER
- affinityRules:
- displayName: Affinity Rules
- type: OTHER
- operationalPolicies:
- displayName: Operational Policies
- type: OTHER
- serviceSpecificPolicies:
- displayName: Service-specific Policies
- type: OTHER
- engineeringRules:
- displayName: Engineering Rules (ERD)
- type: OTHER
- distributionInstructions:
- displayName: Distribution Instructions
- type: OTHER
- certificationTestResults:
- displayName: TD Certification Test Results
- type: OTHER
- deploymentVotingRecord:
- displayName: Deployment Voting Record
- type: OTHER
- serviceQuestionnaire:
- displayName: Service Questionnaire
- type: OTHER
- serviceSecurityTemplate:
- displayName: Service Security Template
- type: OTHER
-
-serviceApiArtifacts:
- configuration:
- displayName: Configuration
- type: OTHER
- instantiation:
- displayName: Instantiation
- type: OTHER
- monitoring:
- displayName: Monitoring
- type: OTHER
- reporting:
- displayName: Reporting
- type: OTHER
- logging:
- displayName: Logging
- type: OTHER
- testing:
- displayName: Testing
- type: OTHER
-
-
-additionalInformationMaxNumberOfKeys: 50
-
-systemMonitoring:
- enabled: true
- isProxy: false
- probeIntervalInSeconds: 15
-defaultHeatArtifactTimeoutMinutes: 60
-
-serviceDeploymentArtifacts:
- YANG_XML:
- acceptedTypes:
- - xml
- VNF_CATALOG:
- acceptedTypes:
- - xml
- MODEL_INVENTORY_PROFILE:
- acceptedTypes:
- - xml
- MODEL_QUERY_SPEC:
- acceptedTypes:
- - xml
- AAI_SERVICE_MODEL:
- acceptedTypes:
- - xml
- AAI_VF_MODULE_MODEL:
- acceptedTypes:
- - xml
- AAI_VF_INSTANCE_MODEL:
- acceptedTypes:
- - xml
- UCPE_LAYER_2_CONFIGURATION:
- acceptedTypes:
- - xml
- OTHER:
- acceptedTypes:
-
-
-resourceDeploymentArtifacts:
- HEAT:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes: *allResourceTypes
- HEAT_VOL:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes: *allResourceTypes
- HEAT_NET:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes: *allResourceTypes
- HEAT_NESTED:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes: *allResourceTypes
- HEAT_ARTIFACT:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- YANG_XML:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- VNF_CATALOG:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- VF_LICENSE:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- VENDOR_LICENSE:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- MODEL_INVENTORY_PROFILE:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- MODEL_QUERY_SPEC:
- acceptedTypes:
- - xml
- validForResourceTypes: *allResourceTypes
- LIFECYCLE_OPERATIONS:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes:
- - VF
- - VFC
- VES_EVENTS:
- acceptedTypes:
- - yaml
- - yml
- validForResourceTypes: *allResourceTypes
- PERFORMANCE_COUNTER:
- acceptedTypes:
- - csv
- validForResourceTypes: *allResourceTypes
- APPC_CONFIG:
- acceptedTypes:
- validForResourceTypes:
- - VF
- #DCAE Artifacts
- DCAE_TOSCA:
- acceptedTypes:
- - yml
- - yaml
- validForResourceTypes:
- - VF
- - VFCMT
- DCAE_JSON:
- acceptedTypes:
- - json
- validForResourceTypes:
- - VF
- - VFCMT
- DCAE_POLICY:
- acceptedTypes:
- - emf
- validForResourceTypes:
- - VF
- - VFCMT
- DCAE_DOC:
- acceptedTypes:
- validForResourceTypes:
- - VF
- - VFCMT
- DCAE_EVENT:
- acceptedTypes:
- validForResourceTypes:
- - VF
- - VFCMT
-#AAI Artifacts
- AAI_VF_MODEL:
- acceptedTypes:
- - xml
- validForResourceTypes:
- - VF
- AAI_VF_MODULE_MODEL:
- acceptedTypes:
- - xml
- validForResourceTypes:
- - VF
- OTHER:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- SNMP_POLL:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- SNMP_TRAP:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
-
-resourceInstanceDeploymentArtifacts:
- HEAT_ENV:
- acceptedTypes:
- - env
- VF_MODULES_METADATA:
- acceptedTypes:
- - json
- VES_EVENTS:
- acceptedTypes:
- - yaml
- - yml
- PERFORMANCE_COUNTER:
- acceptedTypes:
- - csv
-#DCAE_VF Instance Artifacts
- DCAE_INVENTORY_TOSCA:
- acceptedTypes:
- - yml
- - yaml
- DCAE_INVENTORY_JSON:
- acceptedTypes:
- - json
- DCAE_INVENTORY_POLICY:
- acceptedTypes:
- - emf
- DCAE_INVENTORY_DOC:
- acceptedTypes:
- DCAE_INVENTORY_BLUEPRINT:
- acceptedTypes:
- DCAE_INVENTORY_EVENT:
- acceptedTypes:
- SNMP_POLL:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- SNMP_TRAP:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
-
-resourceInformationalArtifacts:
- CHEF:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- PUPPET:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- SHELL:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- YANG:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- YANG_XML:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- HEAT:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- BPEL:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- DG_XML:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- MURANO_PKG:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- OTHER:
- acceptedTypes:
- validForResourceTypes:
- - VFC
- - CVFC
- - CP
- - VL
- - VF
- - VFCMT
- - Abstract
- - PNF
- SNMP_POLL:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- SNMP_TRAP:
- acceptedTypes:
- validForResourceTypes: *allResourceTypes
- GUIDE:
- acceptedTypes:
- validForResourceTypes:
- - VF
- - VFC
- - CVFC
-
-resourceInformationalDeployedArtifacts:
-
-
-requirementsToFulfillBeforeCert:
-
-capabilitiesToConsumeBeforeCert:
-
-unLoggedUrls:
- - /sdc2/rest/healthCheck
-
-cleanComponentsConfiguration:
- cleanIntervalInMinutes: 1440
- componentsToClean:
- - Resource
- - Service
-
-artifactsIndex: resources
-
-heatEnvArtifactHeader:
- ""
-heatEnvArtifactFooter:
- ""
-
-onboarding:
- protocol: http
- host: <%= @host_ip %>
- port: <%= @catalog_port %>
- downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
- healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-
-dcae:
- protocol: http
- host: <%= @host_ip %>
- port: <%= @catalog_port %>
- healthCheckUri: "/dcae/healthCheck"
-
-
-# #GSS IDNS
-switchoverDetector:
- gBeFqdn:
- gFeFqdn:
- beVip: 1.2.3.4
- feVip: 1.2.3.4
- beResolveAttempts: 3
- feResolveAttempts: 3
- enabled: false
- interval: 60
- changePriorityUser: ecompasdc
- changePriorityPassword: ecompasdc123
- publishNetworkUrl:
- publishNetworkBody: '{"note":"comment"}'
- groups:
- beSet: { changePriorityUrl: "", changePriorityBody: '{"name":"","uri":"","no_ad_redirection":false,"v4groups":{"failover_groups":["","","failover_policy":["FAILALL"]},"comment":"","intended_app_proto":"DNS"}'}
- feSet: { changePriorityUrl: "", changePriorityBody: '{"name":"","uri":"","no_ad_redirection":false,"v4groups":{"failover_groups":["",""],"failover_policy":["FAILALL"]},"comment":"","intended_app_proto":"DNS"}'}
-
-applicationL1Cache:
- datatypes:
- enabled: true
- firstRunDelay: 10
- pollIntervalInSec: 60
-
-applicationL2Cache:
- enabled: false
- catalogL1Cache:
- enabled: false
- resourcesSizeInCache: 300
- servicesSizeInCache: 200
- productsSizeInCache: 100
- queue:
- syncIntervalInSecondes: 43200
- waitOnShutDownInMinutes: 10
- numberOfCacheWorkers: 4
-
-toscaValidators:
- stringMaxLength: 2500
-
-disableAudit: false
-
-vfModuleProperties:
- min_vf_module_instances:
- forBaseModule: 1
- forNonBaseModule: 0
- max_vf_module_instances:
- forBaseModule: 1
- forNonBaseModule:
- initial_count:
- forBaseModule: 1
- forNonBaseModule: 0
- vf_module_type:
- forBaseModule: Base
- forNonBaseModule: Expansion
-
-genericAssetNodeTypes:
- VFC: org.openecomp.resource.abstract.nodes.VFC
- CVFC: org.openecomp.resource.abstract.nodes.VFC
- VF : org.openecomp.resource.abstract.nodes.VF
- PNF: org.openecomp.resource.abstract.nodes.PNF
- Service: org.openecomp.resource.abstract.nodes.service
-
-workloadContext: Production
-
-environmentContext:
- defaultValue: General_Revenue-Bearing
- validValues:
- - Critical_Revenue-Bearing
- - Vital_Revenue-Bearing
- - Essential_Revenue-Bearing
- - Important_Revenue-Bearing
- - Needed_Revenue-Bearing
- - Useful_Revenue-Bearing
- - General_Revenue-Bearing
- - Critical_Non-Revenue
- - Vital_Non-Revenue
- - Essential_Non-Revenue
- - Important_Non-Revenue
- - Needed_Non-Revenue
- - Useful_Non-Revenue
- - General_Non-Revenue
diff --git a/sdc-os-chef/sdc-os-common/test/smoke/default/default_test.rb b/sdc-os-chef/sdc-os-common/test/smoke/default/default_test.rb
deleted file mode 100644
index a1f2595aab..0000000000
--- a/sdc-os-chef/sdc-os-common/test/smoke/default/default_test.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# # encoding: utf-8
-
-# Inspec test for recipe sdc-os-common::default
-
-# The Inspec reference, with examples and extensive documentation, can be
-# found at http://inspec.io/docs/reference/resources/
-
-unless os.windows?
- # This is an example test, replace with your own test.
- describe user('root'), :skip do
- it { should exist }
- end
-end
-
-# This is an example test, replace it with your own test.
-describe port(80), :skip do
- it { should_not be_listening }
-end