Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NMS-15818: add ability to enable Velocloud #28

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion horizon/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.9
version: 1.1.10

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
1 change: 1 addition & 0 deletions horizon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ kubectl create configmap -n $instance $configmap --from-file=lots-of-zeros.zip
| core.configuration.enableAlec | bool | `false` | |
| core.configuration.enableCortex | bool | `false` | |
| core.configuration.enableTssDualWrite | bool | `false` | |
| core.configuration.enableVelocloud | bool | `false` | |
| core.configuration.etcUpdatePolicy | string | `"never"` | |
| core.configuration.http.adminPassword | string | `"admin"` | |
| core.configuration.http.restPassword | string | `"admin"` | |
Expand Down
12 changes: 12 additions & 0 deletions horizon/scripts/onms-core-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,18 @@ else
fi
fi

# Enable Velocloud
if [[ ${ENABLE_VELOCLOUD} == "true" ]]; then
cat <<EOF > ${CONFIG_DIR_OVERLAY}/featuresBoot.d/plugin-velocloud.boot
opennms-plugins-velocloud wait-for-kar=opennms-plugins-velocloud
EOF
else
if [[ -e "${CONFIG_DIR}/featuresBoot.d/plugin-velocloud.boot" ]];then
echo "Found ${CONFIG_DIR}/featfeaturesBoot.d/plugin-velocloud.boot, we are going to remove it."
rm "${CONFIG_DIR}/featuresBoot.d/plugin-velocloud.boot"
fi
fi

# Configure Sink and RPC to use Kafka, and the Kafka Producer.
if [[ -v KAFKA_BOOTSTRAP_SERVER ]]; then
echo "Configuring Kafka for IPC..."
Expand Down
1 change: 1 addition & 0 deletions horizon/templates/app-settings.configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ data:
ENABLE_ACLS: {{ ((.Values.core).configuration).enableAcls | default "false" | quote }}
ENABLE_TELEMETRYD: {{ if gt ((.Values.sentinel).replicaCount|int) 0 }}"true"{{ else }}"false"{{ end }}
ENABLE_CORTEX: {{ ((.Values.core).configuration).enableCortex | quote }}
ENABLE_VELOCLOUD: {{ ((.Values.core).configuration).enableVelocloud | quote }}
ENABLE_TSS_DUAL_WRITE: {{ ((.Values.core).configuration).enableTssDualWrite | quote }}
ENABLE_GRAFANA: {{ if gt ((.Values.grafana).replicaCount|int) 0 }}"true"{{ else }}"false"{{ end }}
{{- if .Values.multiTenant }}
Expand Down
3 changes: 3 additions & 0 deletions horizon/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@
"enableCortex": {
"type": "boolean"
},
"enableVelocloud": {
"type": "boolean"
},
"enableTssDualWrite": {
"type": "boolean"
},
Expand Down
1 change: 1 addition & 0 deletions horizon/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ core:
alwaysRollDeployment: true
enableAlec: false # See alecImage below for how the KAR is retrieved
enableCortex: false # See cortexTssImage below for how the KAR is retrieved
enableVelocloud: false
enableTssDualWrite: false
enableAcls: false
rras: # To optionally replace the RRDtool aggregations (pass [] to keep defaults). Affects Pollerd and Collectd
Expand Down
2 changes: 1 addition & 1 deletion minion/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.9
version: 1.1.10

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down