openstack/openstack-helm
Code Issues Proposed changes

Neutron and OVS: add full name to ovs and lb daemonsets

Browse Source 
Add neutron prefix to lb-agent and ovs-agent.
Rename ovs-db and ovs-vswitchd to openvswitch-db and openvswitch-vswitchd.

Change-Id: Iad69b0c00d17e59a9f0eb66003e4512ccaeab128
This commit is contained in:
Artur Korzeniewski 2017-09-04 13:58:59 +02:00
parent 198162a073
commit ca05f7ac3c
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/templates/daemonset-lb-agent.yaml
View File

@ -23,13 +23,13 @@ limitations under the License.
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: lb-agent
name: neutron-lb-agent
spec:
{{ tuple $envAll "lb_agent" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
template:
metadata:
labels:
{{ tuple $envAll "neutron" "lb-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
{{ tuple $envAll "neutron" "neutron-lb-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
@ -40,7 +40,7 @@ spec:
hostNetwork: true
initContainers:
{{ tuple $envAll $dependencies $mounts_neutron_lb_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: lb-agent-init
- name: neutron-lb-agent-init
image: {{ .Values.images.neutron_linuxbridge_agent }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@ -126,7 +126,7 @@ spec:
mountPath: /run
{{ if $mounts_neutron_lb_agent.volumeMounts }}{{ toYaml $mounts_neutron_lb_agent.volumeMounts | indent 12 }}{{ end }}
containers:
- name: lb-agent
- name: neutron-lb-agent
image: {{ .Values.images.neutron_linuxbridge_agent }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}

8
neutron/templates/daemonset-ovs-agent.yaml
View File

@ -23,13 +23,13 @@ limitations under the License.
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: ovs-agent
name: neutron-ovs-agent
spec:
{{ tuple $envAll "ovs_agent" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
template:
metadata:
labels:
{{ tuple $envAll "neutron" "ovs-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
{{ tuple $envAll "neutron" "neutron-ovs-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
@ -40,7 +40,7 @@ spec:
hostNetwork: true
initContainers:
{{ tuple $envAll $dependencies $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: ovs-agent-init
- name: neutron-ovs-agent-init
image: {{ .Values.images.neutron_openvswitch_agent }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@ -126,7 +126,7 @@ spec:
mountPath: /run
{{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
containers:
- name: ovs-agent
- name: neutron-ovs-agent
image: {{ .Values.images.neutron_openvswitch_agent }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}

10
neutron/values.yaml
View File

@ -144,7 +144,7 @@ dependencies:
endpoint: internal
daemonset:
# this should be set to corresponding neutron L2 agent
- ovs-agent
- neutron-ovs-agent
metadata:
services:
- service: oslo_messaging
@ -155,7 +155,7 @@ dependencies:
endpoint: internal
daemonset:
# this should be set to corresponding neutron L2 agent
- ovs-agent
- neutron-ovs-agent
ovs_agent:
services:
- service: oslo_messaging
@ -163,8 +163,8 @@ dependencies:
- service: network
endpoint: internal
daemonset:
- ovs-vswitchd
- ovs-db
- openvswitch-vswitchd
- openvswitch-db
lb_agent:
services:
- service: oslo_messaging
@ -181,7 +181,7 @@ dependencies:
endpoint: internal
daemonset:
# this should be set to corresponding neutron L2 agent
- ovs-agent
- neutron-ovs-agent
tests:
services:
- service: network

2
nova/values.yaml
View File

@ -190,7 +190,7 @@ dependencies:
daemonset:
- libvirt
# this should be set to corresponding neutron L2 agent
- ovs-agent
- neutron-ovs-agent
consoleauth:
jobs:
- nova-db-sync

6
openvswitch/templates/daemonset-ovs-db.yaml
View File

@ -20,13 +20,13 @@ limitations under the License.
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: ovs-db
name: openvswitch-db
spec:
{{ tuple $envAll "ovs_db" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
template:
metadata:
labels:
{{ tuple $envAll "openvswitch" "ovs-db" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
{{ 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:
@ -35,7 +35,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
hostNetwork: true
containers:
- name: ovs-db
- name: openvswitch-db
image: {{ .Values.images.openvswitch_db_server }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}

6
openvswitch/templates/daemonset-ovs-vswitchd.yaml
View File

@ -20,13 +20,13 @@ limitations under the License.
apiVersion: extensions/v1beta1
kind: DaemonSet
metadata:
name: ovs-vswitchd
name: openvswitch-vswitchd
spec:
{{ tuple $envAll "ovs_vswitchd" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
template:
metadata:
labels:
{{ tuple $envAll "openvswitch" "ovs-vswitchd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
{{ 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:
@ -35,7 +35,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet
hostNetwork: true
containers:
- name: ovs-vswitchd
- name: openvswitch-vswitchd
image: {{ .Values.images.openvswitch_vswitchd }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}

2
tools/gate/openstack/network_launch.sh
View File

@ -29,7 +29,7 @@ sudo ip link set br-ex up
sudo iptables -t nat -A POSTROUTING -o $(net_default_iface) -s ${OSH_EXT_SUBNET} -j MASQUERADE
# Disable In-Band rules on br-ex bridge to ease debugging
OVS_VSWITCHD_POD=$(kubectl get -n openstack pods -l application=openvswitch,component=ovs-vswitchd --no-headers -o name | head -1 | awk -F '/' '{ print $NF }')
OVS_VSWITCHD_POD=$(kubectl get -n openstack pods -l application=openvswitch,component=openvswitch-vswitchd --no-headers -o name | head -1 | awk -F '/' '{ print $NF }')
kubectl exec -n openstack ${OVS_VSWITCHD_POD} -- ovs-vsctl set Bridge br-ex other_config:disable-in-band=true

6
tools/overrides/mvp/neutron-linuxbridge.yaml
View File

@ -31,13 +31,13 @@ manifests:
dependencies:
dhcp:
daemonset:
- lb-agent
- neutron-lb-agent
l3:
daemonset:
- lb-agent
- neutron-lb-agent
metadata:
daemonset:
- lb-agent
- neutron-lb-agent
conf:
neutron: