From da4f79cf2e44f034151973817d8fc8041a99b77b Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Tue, 4 Sep 2018 13:01:43 -0500 Subject: [PATCH] Openvswitch: Move chart to openstack-helm-infra This moves the openvswitch chart to openstack-helm-infra as part of the effort to move charts to their appropriate repositories Depends-On: https://review.openstack.org/#/c/599723/ Change-Id: I248ad2dd24f4ab101839f05070f1f6f022f93715 Story: 2002204 Task: 21730 --- openvswitch/Chart.yaml | 25 ---- openvswitch/requirements.yaml | 18 --- .../bin/_openvswitch-db-server.sh.tpl | 55 -------- .../_openvswitch-vswitchd-init-modules.sh.tpl | 22 --- .../bin/_openvswitch-vswitchd.sh.tpl | 64 --------- openvswitch/templates/configmap-bin.yaml | 35 ----- openvswitch/templates/daemonset-ovs-db.yaml | 82 ----------- .../templates/daemonset-ovs-vswitchd.yaml | 108 --------------- .../templates/job-image-repo-sync.yaml | 20 --- openvswitch/values.yaml | 128 ------------------ .../armada/multinode/armada-osh.yaml | 2 +- tools/deployment/baremetal/005-setup-nodes.sh | 3 +- .../developer/common/140-openvswitch.sh | 3 +- tools/deployment/multinode/120-openvswitch.sh | 3 +- 14 files changed, 7 insertions(+), 561 deletions(-) delete mode 100644 openvswitch/Chart.yaml delete mode 100644 openvswitch/requirements.yaml delete mode 100644 openvswitch/templates/bin/_openvswitch-db-server.sh.tpl delete mode 100644 openvswitch/templates/bin/_openvswitch-vswitchd-init-modules.sh.tpl delete mode 100644 openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl delete mode 100644 openvswitch/templates/configmap-bin.yaml delete mode 100644 openvswitch/templates/daemonset-ovs-db.yaml delete mode 100644 openvswitch/templates/daemonset-ovs-vswitchd.yaml delete mode 100644 openvswitch/templates/job-image-repo-sync.yaml delete mode 100644 openvswitch/values.yaml diff --git a/openvswitch/Chart.yaml b/openvswitch/Chart.yaml deleted file mode 100644 index a11bc469c7..0000000000 --- a/openvswitch/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# 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. - -apiVersion: v1 -description: OpenStack-Helm OpenVSwitch -name: openvswitch -version: 0.1.0 -home: http://openvswitch.org -icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png -sources: - - https://github.com/openvswitch/ovs - - https://git.openstack.org/cgit/openstack/openstack-helm -maintainers: - - name: OpenStack-Helm Authors diff --git a/openvswitch/requirements.yaml b/openvswitch/requirements.yaml deleted file mode 100644 index 53782e69b2..0000000000 --- a/openvswitch/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# 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. - -dependencies: - - name: helm-toolkit - repository: http://localhost:8879/charts - version: 0.1.0 diff --git a/openvswitch/templates/bin/_openvswitch-db-server.sh.tpl b/openvswitch/templates/bin/_openvswitch-db-server.sh.tpl deleted file mode 100644 index b19bb0a72b..0000000000 --- a/openvswitch/templates/bin/_openvswitch-db-server.sh.tpl +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -set -ex -COMMAND="${@:-start}" - -OVS_DB=/run/openvswitch/conf.db -OVS_SCHEMA=/usr/share/openvswitch/vswitch.ovsschema -OVS_PID=/run/openvswitch/ovsdb-server.pid -OVS_SOCKET=/run/openvswitch/db.sock - -function start () { - mkdir -p "$(dirname ${OVS_DB})" - if [[ ! -e "${OVS_DB}" ]]; then - ovsdb-tool create "${OVS_DB}" - fi - - if [[ "$(ovsdb-tool needs-conversion ${OVS_DB} ${OVS_SCHEMA})" == 'yes' ]]; then - ovsdb-tool convert ${OVS_DB} ${OVS_SCHEMA} - fi - - umask 000 - exec /usr/sbin/ovsdb-server ${OVS_DB} \ - -vconsole:emer \ - -vconsole:err \ - -vconsole:info \ - --pidfile=${OVS_PID} \ - --remote=punix:${OVS_SOCKET} \ - --remote=db:Open_vSwitch,Open_vSwitch,manager_options \ - --private-key=db:Open_vSwitch,SSL,private_key \ - --certificate=db:Open_vSwitch,SSL,certificate \ - --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert -} - -function stop () { - PID=$(cat $OVS_PID) - ovs-appctl -T1 -t /run/openvswitch/ovsdb-server.${PID}.ctl exit -} - -$COMMAND diff --git a/openvswitch/templates/bin/_openvswitch-vswitchd-init-modules.sh.tpl b/openvswitch/templates/bin/_openvswitch-vswitchd-init-modules.sh.tpl deleted file mode 100644 index ae06b97c1c..0000000000 --- a/openvswitch/templates/bin/_openvswitch-vswitchd-init-modules.sh.tpl +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -set -ex -chroot /mnt/host-rootfs modprobe openvswitch -chroot /mnt/host-rootfs modprobe gre -chroot /mnt/host-rootfs modprobe vxlan diff --git a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl b/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl deleted file mode 100644 index 94d937ce10..0000000000 --- a/openvswitch/templates/bin/_openvswitch-vswitchd.sh.tpl +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -set -ex -COMMAND="${@:-start}" - -OVS_SOCKET=/run/openvswitch/db.sock -OVS_PID=/run/openvswitch/ovs-vswitchd.pid - -function start () { - t=0 - while [ ! -e "${OVS_SOCKET}" ] ; do - echo "waiting for ovs socket $sock" - sleep 1 - t=$(($t+1)) - if [ $t -ge 10 ] ; then - echo "no ovs socket, giving up" - exit 1 - fi - done - - ovs-vsctl --no-wait show - - # handle any bridge mappings - {{- range $br, $phys := .Values.network.auto_bridge_add }} - if [ -n "{{- $br -}}" ] ; then - # create {{ $br }}{{ if $phys }} and add port {{ $phys }}{{ end }} - ovs-vsctl --no-wait --may-exist add-br "{{ $br }}" - if [ -n "{{- $phys -}}" ] ; then - ovs-vsctl --no-wait --may-exist add-port "{{ $br }}" "{{ $phys }}" - ip link set dev "{{ $phys }}" up - fi - fi - {{- end }} - - exec /usr/sbin/ovs-vswitchd unix:${OVS_SOCKET} \ - -vconsole:emer \ - -vconsole:err \ - -vconsole:info \ - --pidfile=${OVS_PID} \ - --mlockall -} - -function stop () { - PID=$(cat $OVS_PID) - ovs-appctl -T1 -t /run/openvswitch/ovs-vswitchd.${PID}.ctl exit -} - -$COMMAND diff --git a/openvswitch/templates/configmap-bin.yaml b/openvswitch/templates/configmap-bin.yaml deleted file mode 100644 index 74eb59b222..0000000000 --- a/openvswitch/templates/configmap-bin.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -{{- if .Values.manifests.configmap_bin }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: openvswitch-bin -data: -{{- if .Values.images.local_registry.active }} - image-repo-sync.sh: | -{{- include "helm-toolkit.scripts.image_repo_sync" . | indent 4 }} -{{- end }} - openvswitch-db-server.sh: | -{{ tuple "bin/_openvswitch-db-server.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - openvswitch-vswitchd.sh: | -{{ tuple "bin/_openvswitch-vswitchd.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} - openvswitch-vswitchd-init-modules.sh: | -{{ tuple "bin/_openvswitch-vswitchd-init-modules.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} -{{- end }} diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml deleted file mode 100644 index 6275d71a8b..0000000000 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ /dev/null @@ -1,82 +0,0 @@ -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -{{- if .Values.manifests.daemonset_ovs_db }} -{{- $envAll := . }} - -{{- $serviceAccountName := "openvswitch-db" }} -{{ tuple $envAll "db" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: openvswitch-db - labels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd-db" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -spec: - selector: - matchLabels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd-db" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} -{{ tuple $envAll "ovs_db" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} - template: - metadata: - labels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd-db" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} - spec: - serviceAccountName: {{ $serviceAccountName }} - nodeSelector: - {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }} - dnsPolicy: ClusterFirstWithHostNet - hostNetwork: true - initContainers: -{{ tuple $envAll "db" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - containers: - - name: openvswitch-db -{{ tuple $envAll "openvswitch_db_server" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - securityContext: - runAsUser: 0 - command: - - /tmp/openvswitch-db-server.sh - - start - lifecycle: - preStop: - exec: - command: - - /tmp/openvswitch-db-server.sh - - stop - volumeMounts: - - name: openvswitch-bin - mountPath: /tmp/openvswitch-db-server.sh - subPath: openvswitch-db-server.sh - readOnly: true - - name: varlibopenvswitch - mountPath: /var/lib/openvswitch/ - - name: run - mountPath: /run - volumes: - - name: openvswitch-bin - configMap: - name: openvswitch-bin - defaultMode: 0555 - - name: varlibopenvswitch - emptyDir: {} - - name: run - hostPath: - path: /run -{{- end }} diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml deleted file mode 100644 index f792ed05ab..0000000000 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ /dev/null @@ -1,108 +0,0 @@ -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -{{- if .Values.manifests.daemonset_ovs_vswitchd }} -{{- $envAll := . }} - -{{- $serviceAccountName := "openvswitch-vswitchd" }} -{{ tuple $envAll "vswitchd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} ---- -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: openvswitch-vswitchd - labels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -spec: - selector: - matchLabels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} -{{ tuple $envAll "ovs_vswitchd" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }} - template: - metadata: - labels: -{{ tuple $envAll "openvswitch" "openvswitch-vswitchd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - annotations: - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} - spec: - serviceAccountName: {{ $serviceAccountName }} - nodeSelector: - {{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }} - dnsPolicy: ClusterFirstWithHostNet - hostNetwork: true - initContainers: -{{ tuple $envAll "vswitchd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} - - name: openvswitch-vswitchd-modules -{{ tuple $envAll "openvswitch_vswitchd" | include "helm-toolkit.snippets.image" | indent 10 }} - securityContext: - capabilities: - add: - - SYS_MODULE - runAsUser: 0 - command: - - /tmp/openvswitch-vswitchd-init-modules.sh - volumeMounts: - - name: openvswitch-bin - mountPath: /tmp/openvswitch-vswitchd-init-modules.sh - subPath: openvswitch-vswitchd-init-modules.sh - readOnly: true - - name: host-rootfs - mountPath: /mnt/host-rootfs - readOnly: true - containers: - - name: openvswitch-vswitchd -{{ tuple $envAll "openvswitch_vswitchd" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} - securityContext: - runAsUser: 0 - capabilities: - add: - - NET_ADMIN - # ensures this container can speak to the ovs database - # successfully before its marked as ready - readinessProbe: - exec: - command: - - /usr/bin/ovs-vsctl - - show - command: - - /tmp/openvswitch-vswitchd.sh - - start - lifecycle: - preStop: - exec: - command: - - /tmp/openvswitch-db-server.sh - - stop - volumeMounts: - - name: openvswitch-bin - mountPath: /tmp/openvswitch-vswitchd.sh - subPath: openvswitch-vswitchd.sh - readOnly: true - - name: run - mountPath: /run - volumes: - - name: openvswitch-bin - configMap: - name: openvswitch-bin - defaultMode: 0555 - - name: run - hostPath: - path: /run - - name: host-rootfs - hostPath: - path: / -{{- end }} diff --git a/openvswitch/templates/job-image-repo-sync.yaml b/openvswitch/templates/job-image-repo-sync.yaml deleted file mode 100644 index 737c48d89d..0000000000 --- a/openvswitch/templates/job-image-repo-sync.yaml +++ /dev/null @@ -1,20 +0,0 @@ -{{/* -Copyright 2017 The Openstack-Helm Authors. - -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. -*/}} - -{{- if and .Values.manifests.job_image_repo_sync .Values.images.local_registry.active }} -{{- $imageRepoSyncJob := dict "envAll" . "serviceName" "openvswitch" -}} -{{ $imageRepoSyncJob | include "helm-toolkit.manifests.job_image_repo_sync" }} -{{- end }} diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml deleted file mode 100644 index 9d27558c87..0000000000 --- a/openvswitch/values.yaml +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 2017 The Openstack-Helm Authors. -# -# 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. - -# Default values for openvswitch. -# This is a YAML-formatted file. -# Declare name/value pairs to be passed into your templates. -# name: value - -release_group: null - -images: - tags: - openvswitch_db_server: docker.io/openstackhelm/openvswitch:v2.8.1 - openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:v2.8.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - image_repo_sync: docker.io/docker:17.07.0 - pull_policy: "IfNotPresent" - local_registry: - active: false - exclude: - - dep_check - - image_repo_sync - -labels: - ovs: - node_selector_key: openvswitch - node_selector_value: enabled - -network: - # auto_bridge_add is a table of "bridge: interface" pairs, by - # default empty - # To automatically add a physical interfaces to a specific bridges, - # for example eth3 to bridge br-physnet1, if0 to br0 and iface_two - # to br1 do something like: - # - # auto_bridge_add: - # br-physnet1: eth3 - # br0: if0 - # br1: iface_two - auto_bridge_add: {} - -pod: - lifecycle: - upgrades: - daemonsets: - pod_replacement_strategy: RollingUpdate - ovs_db: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - ovs_vswitchd: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - resources: - enabled: false - ovs: - db: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - vswitchd: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - image_repo_sync: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - -endpoints: - cluster_domain_suffix: cluster.local - local_image_registry: - name: docker-registry - namespace: docker-registry - hosts: - default: localhost - internal: docker-registry - node: localhost - host_fqdn_override: - default: null - port: - registry: - node: 5000 - -dependencies: - dynamic: - common: - local_image_registry: - jobs: - - openvswitch-image-repo-sync - services: - - endpoint: node - service: local_image_registry - static: - db: null - vswitchd: null - image_repo_sync: - services: - - endpoint: internal - service: local_image_registry - -manifests: - configmap_bin: true - daemonset_ovs_db: true - daemonset_ovs_vswitchd: true - job_image_repo_sync: true diff --git a/tools/deployment/armada/multinode/armada-osh.yaml b/tools/deployment/armada/multinode/armada-osh.yaml index 15a3953ca9..24171e73b9 100644 --- a/tools/deployment/armada/multinode/armada-osh.yaml +++ b/tools/deployment/armada/multinode/armada-osh.yaml @@ -708,7 +708,7 @@ data: node_selector_value: enabled source: type: local - location: ${OSH_PATH} + location: ${OSH_INFRA_PATH} subpath: openvswitch reference: master dependencies: diff --git a/tools/deployment/baremetal/005-setup-nodes.sh b/tools/deployment/baremetal/005-setup-nodes.sh index cb4602ee91..a1650b38f7 100755 --- a/tools/deployment/baremetal/005-setup-nodes.sh +++ b/tools/deployment/baremetal/005-setup-nodes.sh @@ -68,7 +68,8 @@ for LIBVIRT_POD in ${LIBVIRT_PODS}; do done #NOTE: Deploy OvS to connect nodes to the deployment host -helm install ./openvswitch \ +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +helm install ${OSH_INFRA_PATH}/openvswitch \ --namespace=openstack \ --name=openvswitch diff --git a/tools/deployment/developer/common/140-openvswitch.sh b/tools/deployment/developer/common/140-openvswitch.sh index 6f06af4ed1..1d9a0b3011 100755 --- a/tools/deployment/developer/common/140-openvswitch.sh +++ b/tools/deployment/developer/common/140-openvswitch.sh @@ -19,8 +19,9 @@ set -xe make openvswitch #NOTE: Deploy command +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} : ${OSH_EXTRA_HELM_ARGS:=""} -helm upgrade --install openvswitch ./openvswitch \ +helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \ --namespace=openstack \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH} diff --git a/tools/deployment/multinode/120-openvswitch.sh b/tools/deployment/multinode/120-openvswitch.sh index b903afedef..7ea8e11b9e 100755 --- a/tools/deployment/multinode/120-openvswitch.sh +++ b/tools/deployment/multinode/120-openvswitch.sh @@ -16,7 +16,8 @@ set -xe #NOTE: Deploy command -helm upgrade --install openvswitch ./openvswitch \ +: ${OSH_INFRA_PATH:="../openstack-helm-infra"} +helm upgrade --install openvswitch ${OSH_INFRA_PATH}/openvswitch \ --namespace=openstack \ ${OSH_EXTRA_HELM_ARGS} \ ${OSH_EXTRA_HELM_ARGS_OPENVSWITCH}