Commit 993c6dcd authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'azure-alternative-images' into 'master'

Azure alternative images

See merge request !153
parents 2d41926d 198c37b7
Pipeline #826 failed with stage
in 2 minutes and 4 seconds
nsd:
nsd:
- description: NS with 1 VNFs connected to mgmtnet VL
df:
- id: default-df
vnf-profile:
- id: vnf-several-volumes
virtual-link-connectivity:
- constituent-cpd-id:
- constituent-base-element-id: vnf-several-volumes
constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet
vnfd-id: several_volumes-vnf
id: several_volumes-ns
name: several_volumes-ns
version: '1.0'
virtual-link-desc:
- id: mgmtnet
mgmt-network: true
vnfd-id:
- several_volumes-vnf
nsd:
nsd:
- description: NS with 1 VNFs connected to mgmtnet VL
df:
- id: default-df
vnf-profile:
- id: vnf-several-volumes
virtual-link-connectivity:
- constituent-cpd-id:
- constituent-base-element-id: vnf-several-volumes
constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet
vnfd-id: several_volumes-vnf
id: several_volumes-ns
name: several_volumes-ns
version: '1.0'
virtual-link-desc:
- id: mgmtnet
mgmt-network: true
vnfd-id:
- several_volumes-vnf
......@@ -28,7 +28,7 @@ vnfd:
vim-type: aws
- id: ubuntu20.04-azure
name: ubuntu20.04-azure
image: Canonical:UbuntuServer:20.04-LTS:latest
image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
vim-type: azure
vdu:
- id: several_volumes-VM
......
nsd:
nsd:
- description: NS with 1 VNFs connected by mgmtnet VL
df:
- id: default-df
vnf-profile:
- id: '1'
virtual-link-connectivity:
- constituent-cpd-id:
- constituent-base-element-id: '1'
constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet
vnfd-id: simple_2vm-vnf
id: simple_2vm-ns
name: simple_2vm-ns
version: '1.0'
virtual-link-desc:
- id: mgmtnet
mgmt-network: true
vnfd-id:
- simple_2vm-vnf
nsd:
nsd:
- description: NS with 1 VNFs connected by mgmtnet VL
df:
- id: default-df
vnf-profile:
- id: '1'
virtual-link-connectivity:
- constituent-cpd-id:
- constituent-base-element-id: '1'
constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet
vnfd-id: simple_2vm-vnf
id: simple_2vm-ns
name: simple_2vm-ns
version: '1.0'
virtual-link-desc:
- id: mgmtnet
mgmt-network: true
vnfd-id:
- simple_2vm-vnf
vnfd:
description: A VNF consisting of 2 VDUs connected to an internal VL
df:
- id: default-df
instantiation-level:
- id: default-instantiation-level
vdu-level:
- number-of-instances: 1
vdu-id: mgmtVM
- number-of-instances: 1
vdu-id: dataVM
vdu-profile:
- id: mgmtVM
min-number-of-instances: 1
- id: dataVM
min-number-of-instances: 1
ext-cpd:
- id: vnf-mgmt-ext
int-cpd:
cpd: mgmtVM-eth0-int
vdu-id: mgmtVM
id: simple_2vm-vnf
int-virtual-link-desc:
- id: internal
mgmt-cp: vnf-mgmt-ext
product-name: simple_2vm-vnf
sw-image-desc:
- id: ubuntu20.04
image: ubuntu20.04
name: ubuntu20.04
vdu:
- id: mgmtVM
int-cpd:
- id: mgmtVM-eth0-int
virtual-network-interface-requirement:
- name: mgmtVM-eth0
position: 1
virtual-interface:
type: PARAVIRT
- id: mgmtVM-eth1-int
int-virtual-link-desc: internal
virtual-network-interface-requirement:
- name: mgmtVM-eth1
position: 2
virtual-interface:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu20.04
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
- id: dataVM
int-cpd:
- id: dataVM-eth0-int
int-virtual-link-desc: internal
virtual-network-interface-requirement:
- name: dataVM-eth0
position: 1
virtual-interface:
type: PARAVIRT
name: dataVM
sw-image-desc: ubuntu20.04
virtual-compute-desc: dataVM-compute
virtual-storage-desc:
- dataVM-storage
version: '1.0'
virtual-compute-desc:
- id: mgmtVM-compute
virtual-memory:
size: 1.0
virtual-cpu:
num-virtual-cpu: 1
- id: dataVM-compute
virtual-memory:
size: 1.0
virtual-cpu:
num-virtual-cpu: 1
virtual-storage-desc:
- id: mgmtVM-storage
size-of-storage: 10
- id: dataVM-storage
size-of-storage: 10
vnfd:
description: A VNF consisting of 2 VDUs connected to an internal VL
df:
- id: default-df
instantiation-level:
- id: default-instantiation-level
vdu-level:
- number-of-instances: 1
vdu-id: mgmtVM
- number-of-instances: 1
vdu-id: dataVM
vdu-profile:
- id: mgmtVM
min-number-of-instances: 1
- id: dataVM
min-number-of-instances: 1
ext-cpd:
- id: vnf-mgmt-ext
int-cpd:
cpd: mgmtVM-eth0-int
vdu-id: mgmtVM
id: simple_2vm-vnf
int-virtual-link-desc:
- id: internal
mgmt-cp: vnf-mgmt-ext
product-name: simple_2vm-vnf
sw-image-desc:
- id: ubuntu20.04
image: ubuntu20.04
name: ubuntu20.04
- id: ubuntu20.04-azure
name: ubuntu20.04-azure
image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
vim-type: azure
vdu:
- id: mgmtVM
int-cpd:
- id: mgmtVM-eth0-int
virtual-network-interface-requirement:
- name: mgmtVM-eth0
position: 1
virtual-interface:
type: PARAVIRT
- id: mgmtVM-eth1-int
int-virtual-link-desc: internal
virtual-network-interface-requirement:
- name: mgmtVM-eth1
position: 2
virtual-interface:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-azure
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
- id: dataVM
int-cpd:
- id: dataVM-eth0-int
int-virtual-link-desc: internal
virtual-network-interface-requirement:
- name: dataVM-eth0
position: 1
virtual-interface:
type: PARAVIRT
name: dataVM
sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-azure
virtual-compute-desc: dataVM-compute
virtual-storage-desc:
- dataVM-storage
version: '1.0'
virtual-compute-desc:
- id: mgmtVM-compute
virtual-memory:
size: 1.0
virtual-cpu:
num-virtual-cpu: 1
- id: dataVM-compute
virtual-memory:
size: 1.0
virtual-cpu:
num-virtual-cpu: 1
virtual-storage-desc:
- id: mgmtVM-storage
size-of-storage: 10
- id: dataVM-storage
size-of-storage: 10
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
labels:
{{ include "eechart.labels" . | indent 4 }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
volumeClaimTemplates:
- metadata:
name: osm-ee
spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: 1Gi
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
labels:
{{ include "eechart.labels" . | indent 4 }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
containers:
- name: {{ .Chart.Name }}
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
volumeClaimTemplates:
- metadata:
name: osm-ee
spec:
accessModes: [ "ReadWriteOnce" ]
resources:
requests:
storage: 1Gi
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
......@@ -59,9 +59,9 @@ vnfd:
mgmt-cp: vnf-mgmt-ext
product-name: simple_ee-vnf
sw-image-desc:
- id: ubuntu16.04
image: ubuntu16.04
name: ubuntu16.04
- id: ubuntu18.04
image: ubuntu18.04
name: ubuntu18.04
vdu:
- cloud-init-file: cloud-config.txt
id: mgmtVM
......@@ -73,7 +73,7 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu16.04
sw-image-desc: ubuntu18.04
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
......
......@@ -64,9 +64,9 @@ vnfd:
mgmt-cp: vnf-mgmt-ext
product-name: simple_nopasswd-vnf
sw-image-desc:
- id: ubuntu16.04
image: ubuntu16.04
name: ubuntu16.04
- id: ubuntu18.04
image: ubuntu18.04
name: ubuntu18.04
vdu:
- cloud-init-file: cloud-config.txt
id: mgmtVM
......@@ -85,7 +85,7 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu16.04
sw-image-desc: ubuntu18.04
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
......@@ -105,7 +105,7 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: dataVM
sw-image-desc: ubuntu16.04
sw-image-desc: ubuntu18.04
virtual-compute-desc: dataVM-compute
virtual-storage-desc:
- dataVM-storage
......
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
#
# 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.
#NST to test VLD connection between Network Services within the same VIM
nst:
- id: slice_basic_nst2
name: slice_basic_nst2
SNSSAI-identifier:
slice-service-type: eMBB
quality-of-service:
id: 1
netslice-subnet:
- id: slice_basic_nsd_2
is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
netslice-vld:
- id: slice_vld_mgmt
name: slice_vld_mgmt
type: ELAN
mgmt-network: true
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data2
name: slice_vld_data2
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
#
# 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.
#NST to test VLD connection between Network Services within the same VIM
nst:
- id: slice_basic_nst2
name: slice_basic_nst2
SNSSAI-identifier:
slice-service-type: eMBB
quality-of-service:
id: 1
netslice-subnet:
- id: slice_basic_nsd_2
is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
netslice-vld:
- id: slice_vld_mgmt
name: slice_vld_mgmt
type: ELAN
mgmt-network: true
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data2
name: slice_vld_data2
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
#
# 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.
#NST to test VLD connection between Network Services within the same VIM
nst:
- id: slice_basic_nst
name: slice_basic_nst
SNSSAI-identifier:
slice-service-type: eMBB
quality-of-service:
id: 1
netslice-subnet:
- id: slice_basic_nsd_1
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
- id: slice_basic_nsd_2
is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
netslice-vld:
- id: slice_vld_mgmt
name: slice_vld_mgmt
type: ELAN
mgmt-network: true
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data1
name: slice_vld_data1
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_data
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data1
- id: slice_vld_data2
name: slice_vld_data2
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data
# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta]
#
# 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.
#NST to test VLD connection between Network Services within the same VIM
nst:
- id: slice_basic_nst
name: slice_basic_nst
SNSSAI-identifier:
slice-service-type: eMBB
quality-of-service:
id: 1
netslice-subnet:
- id: slice_basic_nsd_1
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
- id: slice_basic_nsd_2
is-shared-nss: true
description: NetSlice Subnet (service) composed by 1 vnf with 3 cp
nsd-ref: slice_basic_middle_ns
- id: slice_basic_nsd_3
is-shared-nss: false
description: NetSlice Subnet (service) composed by 1 vnf with 2 cp
nsd-ref: slice_basic_ns
netslice-vld:
- id: slice_vld_mgmt
name: slice_vld_mgmt
type: ELAN
mgmt-network: true
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_mgmt
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_mgmt
- id: slice_vld_data1
name: slice_vld_data1
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_1
nsd-connection-point-ref: nsd_cp_data
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data1
- id: slice_vld_data2
name: slice_vld_data2
type: ELAN
nss-connection-point-ref:
- nss-ref: slice_basic_nsd_2
nsd-connection-point-ref: nsd_cp_data2
- nss-ref: slice_basic_nsd_3
nsd-connection-point-ref: nsd_cp_data
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
runAsUser: 0
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume
mountPath: /etc/snmp_exporter
- name: vnf-mibs
mountPath: /root/.snmp/mibs
- name: vnf-generator
mountPath: /app/vnf/generator
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume
hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs
configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator
configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee
hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
runAsUser: 0
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume
mountPath: /etc/snmp_exporter
- name: vnf-mibs
mountPath: /root/.snmp/mibs
- name: vnf-generator
mountPath: /app/vnf/generator
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume
hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs
configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator
configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee
hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
labels:
{{ include "eechart.labels" . | indent 4 }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
runAsUser: 0
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume
mountPath: /etc/snmp_exporter
- name: vnf-mibs
mountPath: /root/.snmp/mibs
- name: vnf-generator
mountPath: /app/vnf/generator
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume
hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs
configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator
configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee
hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "eechart.fullname" . }}
labels:
{{ include "eechart.labels" . | indent 4 }}
spec:
serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
template:
metadata:
labels:
app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
vnf: {{ .Values.global.osm.vnf_id | lower}}
spec:
imagePullSecrets:
- name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext:
runAsUser: 0
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
ports:
- name: grpc
containerPort: 50051
protocol: TCP
resources:
{{- toYaml .Values.resources | nindent 12 }}
volumeMounts:
- name: osm-ee
mountPath: /app/storage
- name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf
- name: snmp-config-volume
mountPath: /etc/snmp_exporter
- name: vnf-mibs
mountPath: /root/.snmp/mibs
- name: vnf-generator
mountPath: /app/vnf/generator
volumes:
- name: osm-ee-source
configMap:
name: {{ include "eechart.fullname" . }}
- name: snmp-config-volume
hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs
configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator
configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
- name: osm-ee
hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data
......@@ -34,6 +34,10 @@ vnfd:
- id: ubuntu20.04
image: ubuntu20.04
name: ubuntu20.04
- id: ubuntu20.04-azure
name: ubuntu20.04-azure
image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
vim-type: azure
vdu:
- cloud-init-file: cloud-config.txt
id: dataVM
......@@ -64,6 +68,8 @@ vnfd:
type: PARAVIRT
name: dataVM
sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-azure
virtual-compute-desc: dataVM-compute
virtual-storage-desc:
- dataVM-storage
......
......@@ -20,9 +20,17 @@ vnfd:
product-name: ubuntu_cloudinit-vnf
provider: OSM
sw-image-desc:
- id: ubuntu16.04
image: ubuntu16.04
name: ubuntu16.04
- id: ubuntu18.04
image: ubuntu18.04
name: ubuntu18.04
- id: ubuntu18.04-aws
name: ubuntu18.04-aws
image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
vim-type: aws
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu:
- cloud-init-file: cloud-init.cfg
description: ubuntu_cloudinit-vnf-VM
......@@ -34,7 +42,10 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: ubuntu_cloudinit-vnf-VM
sw-image-desc: ubuntu16.04
sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-aws
- ubuntu18.04-azure
virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute
virtual-storage-desc:
- ubuntu_cloudinit-vnf-VM-storage
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment