From ca05f7ac3c3fe425c8526cd768e646935fdd0140 Mon Sep 17 00:00:00 2001 From: Artur Korzeniewski Date: Mon, 4 Sep 2017 13:58:59 +0200 Subject: [PATCH] Neutron and OVS: add full name to ovs and lb daemonsets Add neutron prefix to lb-agent and ovs-agent. Rename ovs-db and ovs-vswitchd to openvswitch-db and openvswitch-vswitchd. Change-Id: Iad69b0c00d17e59a9f0eb66003e4512ccaeab128 --- neutron/templates/daemonset-lb-agent.yaml | 8 ++++---- neutron/templates/daemonset-ovs-agent.yaml | 8 ++++---- neutron/values.yaml | 10 +++++----- nova/values.yaml | 2 +- openvswitch/templates/daemonset-ovs-db.yaml | 6 +++--- openvswitch/templates/daemonset-ovs-vswitchd.yaml | 6 +++--- tools/gate/openstack/network_launch.sh | 2 +- tools/overrides/mvp/neutron-linuxbridge.yaml | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml index aa3a91afe8..c71c19eabe 100644 --- a/neutron/templates/daemonset-lb-agent.yaml +++ b/neutron/templates/daemonset-lb-agent.yaml @@ -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 }} diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 81318320f7..1c7fe76c15 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -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 }} diff --git a/neutron/values.yaml b/neutron/values.yaml index 33e78bc68c..6a32775d59 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -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 diff --git a/nova/values.yaml b/nova/values.yaml index bd339fb5d8..4504b336d4 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -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 diff --git a/openvswitch/templates/daemonset-ovs-db.yaml b/openvswitch/templates/daemonset-ovs-db.yaml index 5ff86ff656..3383591dc3 100644 --- a/openvswitch/templates/daemonset-ovs-db.yaml +++ b/openvswitch/templates/daemonset-ovs-db.yaml @@ -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 }} diff --git a/openvswitch/templates/daemonset-ovs-vswitchd.yaml b/openvswitch/templates/daemonset-ovs-vswitchd.yaml index 5f1ee124b9..9ea10679bc 100644 --- a/openvswitch/templates/daemonset-ovs-vswitchd.yaml +++ b/openvswitch/templates/daemonset-ovs-vswitchd.yaml @@ -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 }} diff --git a/tools/gate/openstack/network_launch.sh b/tools/gate/openstack/network_launch.sh index 6da2b9732b..456c7f0a7c 100755 --- a/tools/gate/openstack/network_launch.sh +++ b/tools/gate/openstack/network_launch.sh @@ -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 diff --git a/tools/overrides/mvp/neutron-linuxbridge.yaml b/tools/overrides/mvp/neutron-linuxbridge.yaml index 6195a08324..12a1cd5ca1 100644 --- a/tools/overrides/mvp/neutron-linuxbridge.yaml +++ b/tools/overrides/mvp/neutron-linuxbridge.yaml @@ -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: