diff options
11 files changed, 12 insertions, 46 deletions
diff --git a/heat/vLB_CDS/vdns.env b/heat/vLB_CDS/vdns.env index e6fe0243..3c0657a8 100644 --- a/heat/vLB_CDS/vdns.env +++ b/heat/vLB_CDS/vdns.env @@ -29,9 +29,6 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer vnf_name: vLBMS - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA nb_api_version: 1.2.0 diff --git a/heat/vLB_CDS/vdns.yaml b/heat/vLB_CDS/vdns.yaml index 2b428840..d3f6e7d5 100644 --- a/heat/vLB_CDS/vdns.yaml +++ b/heat/vLB_CDS/vdns.yaml @@ -127,15 +127,6 @@ parameters: sec_group: type: string description: ONAP Security Group - sdnc_model_name: - type: string - description: SDNC Model Name metatada - sdnc_model_version: - type: string - description: SDNC Model Version metatada - sdnc_artifact_name: - type: string - description: SDNC Artifact Name metatada ############# # # @@ -181,9 +172,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } user_data_format: RAW user_data: str_replace: diff --git a/heat/vLB_CDS/vlb.env b/heat/vLB_CDS/vlb.env index 52b30811..d3ca3614 100644 --- a/heat/vLB_CDS/vlb.env +++ b/heat/vLB_CDS/vlb.env @@ -36,9 +36,6 @@ parameters: vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer vnf_name: vLBMS - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA vip: 192.168.9.112 diff --git a/heat/vLB_CDS/vlb.yaml b/heat/vLB_CDS/vlb.yaml index 424bfab0..e0330df4 100644 --- a/heat/vLB_CDS/vlb.yaml +++ b/heat/vLB_CDS/vlb.yaml @@ -175,15 +175,6 @@ parameters: sec_group: type: string description: ONAP Security Group - sdnc_model_name: - type: string - description: SDNC Model Name metatada - sdnc_model_version: - type: string - description: SDNC Model Version metatada - sdnc_artifact_name: - type: string - description: SDNC Artifact Name metatada ############# # # @@ -241,9 +232,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } user_data_format: RAW user_data: str_replace: diff --git a/heat/vLB_CDS/vpkg.env b/heat/vLB_CDS/vpkg.env index 1b4acd6e..4a1a7cde 100644 --- a/heat/vLB_CDS/vpkg.env +++ b/heat/vLB_CDS/vpkg.env @@ -27,9 +27,6 @@ parameters: vnf_name: vLBMS vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - sdnc_model_name: vLB_spinup - sdnc_model_version: 1.0.0 - sdnc_artifact_name: vLB_vNF_Artifact # APP/USER_DATA pg_int: 192.168.9.109 diff --git a/heat/vLB_CDS/vpkg.yaml b/heat/vLB_CDS/vpkg.yaml index 4e635f24..e71e0bbd 100644 --- a/heat/vLB_CDS/vpkg.yaml +++ b/heat/vLB_CDS/vpkg.yaml @@ -135,15 +135,6 @@ parameters: sec_group: type: string description: ONAP Security Group - sdnc_model_name: - type: string - description: SDNC Model Name metatada - sdnc_model_version: - type: string - description: SDNC Model Version metatada - sdnc_artifact_name: - type: string - description: SDNC Artifact Name metatada ############# # # @@ -186,9 +177,6 @@ resources: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } vnf_name: { get_param: vnf_name } - sdnc_model_name: { get_param: sdnc_model_name } - sdnc_model_version: { get_param: sdnc_model_version } - sdnc_artifact_name: { get_param: sdnc_artifact_name } networks: - network: { get_param: public_net_id } - port: { get_resource: vpg_0_int_pktgen_private_port_0 } diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml index 5f013145..647774b5 100644 --- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml +++ b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml @@ -1,5 +1,6 @@ {{- $root := . -}} {{- range append .Values.watchNamespaces .Release.Namespace }} +{{- if ne . "*" -}} --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding @@ -21,3 +22,4 @@ roleRef: name: strimzi-cluster-operator-namespaced apiGroup: rbac.authorization.k8s.io {{- end }} +{{- end }}
\ No newline at end of file diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml index 969fccdc..20b163de 100644 --- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml +++ b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml @@ -1,5 +1,6 @@ {{- $root := . -}} {{- range append .Values.watchNamespaces .Release.Namespace }} +{{- if ne . "*" -}} --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding @@ -21,3 +22,4 @@ roleRef: name: strimzi-entity-operator apiGroup: rbac.authorization.k8s.io {{- end }} +{{- end }} diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml index 30602f6f..29f3d36b 100644 --- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml +++ b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/032-RoleBinding-strimzi-cluster-operator-topic-operator-delegation.yaml @@ -1,5 +1,6 @@ {{- $root := . -}} {{- range append .Values.watchNamespaces .Release.Namespace }} +{{- if ne . "*" -}} --- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: RoleBinding @@ -21,3 +22,4 @@ roleRef: name: strimzi-topic-operator apiGroup: rbac.authorization.k8s.io {{- end }} +{{- end }} diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml index d1ae281a..2f9b570d 100644 --- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml +++ b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/templates/050-Deployment-strimzi-cluster-operator.yaml @@ -24,8 +24,12 @@ spec: - name: STRIMZI_NAMESPACE {{- if .Values.watchNamespaces -}} {{- $ns := .Values.watchNamespaces -}} + {{- if has "*" $ns }} + value: "*" + {{- else -}} {{- $ns := append $ns .Release.Namespace }} value: "{{ join "," $ns }}" + {{- end }} {{- else }} valueFrom: fieldRef: diff --git a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml index b9c5f2ef..74a7c581 100644 --- a/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml +++ b/vnfs/DAaaS/messaging/charts/strimzi-kafka-operator/values.yaml @@ -1,6 +1,7 @@ # Default values for strimzi-kafka-operator. -watchNamespaces: [] +watchNamespaces: + - "*" image: repository: strimzi |