Libvirt: add dynamic deps on neutron agents as option.
This PS adds the ability for the Libvirt chart to depend on neutron agents being up if desired. Change-Id: I7cd2dca4416d1852261591a0064381ae2b087b9a Depends-On: Idcade7eebed317852b70392431ed02a352241c9b Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley
parent
5cfa1501a2
commit
dd006e9569
|
|
@ -16,12 +16,14 @@ limitations under the License.
|
|||
|
||||
{{- if .Values.manifests.daemonset_libvirt }}
|
||||
{{- $envAll := . }}
|
||||
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "libvirt" -}}
|
||||
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
|
||||
|
||||
{{- $mounts_libvirt := .Values.pod.mounts.libvirt.libvirt }}
|
||||
{{- $mounts_libvirt_init := .Values.pod.mounts.libvirt.init_container }}
|
||||
|
||||
{{- $serviceAccountName := "libvirt" }}
|
||||
{{ tuple $envAll "libvirt" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
|
|
@ -49,7 +51,7 @@ spec:
|
|||
hostPID: true
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
initContainers:
|
||||
{{ tuple $envAll "libvirt" $mounts_libvirt_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||
{{ tuple $envAll "pod_dependency" $mounts_libvirt_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||
{{- if .Values.conf.ceph.enabled }}
|
||||
{{- if empty .Values.conf.ceph.cinder.keyring }}
|
||||
- name: ceph-admin-keyring-placement
|
||||
|
|
|
|||
|
|
@ -37,6 +37,12 @@ images:
|
|||
- dep_check
|
||||
- image_repo_sync
|
||||
|
||||
network:
|
||||
# provide what type of network wiring will be used
|
||||
# possible options: openvswitch, linuxbridge, sriov
|
||||
backend:
|
||||
- openvswitch
|
||||
|
||||
endpoints:
|
||||
cluster_domain_suffix: cluster.local
|
||||
local_image_registry:
|
||||
|
|
@ -118,8 +124,31 @@ dependencies:
|
|||
services:
|
||||
- endpoint: node
|
||||
service: local_image_registry
|
||||
targeted:
|
||||
openvswitch:
|
||||
libvirt:
|
||||
pod:
|
||||
- requireSameNode: true
|
||||
labels:
|
||||
application: neutron
|
||||
component: neutron-ovs-agent
|
||||
linuxbridge:
|
||||
libvirt:
|
||||
pod:
|
||||
- requireSameNode: true
|
||||
labels:
|
||||
application: neutron
|
||||
component: neutron-lb-agent
|
||||
sriov:
|
||||
libvirt:
|
||||
pod:
|
||||
- requireSameNode: true
|
||||
labels:
|
||||
application: neutron
|
||||
component: neutron-sriov-agent
|
||||
static:
|
||||
libvirt: null
|
||||
libvirt:
|
||||
services: null
|
||||
image_repo_sync:
|
||||
services:
|
||||
- endpoint: internal
|
||||
|
|
|
|||
|
|
@ -1465,17 +1465,6 @@ data:
|
|||
- memcached
|
||||
---
|
||||
schema: armada/ChartGroup/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: openstack-infra-services
|
||||
data:
|
||||
description: "OpenStack Infra Services"
|
||||
sequenced: True
|
||||
chart_group:
|
||||
- libvirt
|
||||
- openvswitch
|
||||
---
|
||||
schema: armada/ChartGroup/v1
|
||||
metadata:
|
||||
schema: metadata/Document/v1
|
||||
name: openstack-keystone
|
||||
|
|
@ -1523,9 +1512,11 @@ metadata:
|
|||
schema: metadata/Document/v1
|
||||
name: openstack-compute-kit
|
||||
data:
|
||||
description: "Deploy nova and neutron"
|
||||
description: "Deploy nova and neutron, as well as supporting services"
|
||||
sequenced: False
|
||||
chart_group:
|
||||
- libvirt
|
||||
- openvswitch
|
||||
- nova-rabbitmq
|
||||
- nova
|
||||
- neutron-rabbitmq
|
||||
|
|
@ -1574,7 +1565,6 @@ data:
|
|||
- openstack-ceph-config
|
||||
- deploy-mariadb
|
||||
- deploy-memcached
|
||||
- openstack-infra-services
|
||||
- openstack-keystone
|
||||
- openstack-glance
|
||||
- openstack-radosgw
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ make all
|
|||
helm install ./libvirt \
|
||||
--namespace=libvirt \
|
||||
--name=libvirt \
|
||||
--set network.backend=null \
|
||||
--set conf.ceph.enabled=false \
|
||||
--set images.tags.libvirt=docker.io/openstackhelm/vbmc:centos
|
||||
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@ helm upgrade --install libvirt ./libvirt \
|
|||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_LIBVIRT}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
#NOTE(portdirect): We dont wait for libvirt pods to come up, as they depend
|
||||
# on the neutron agents being up.
|
||||
|
||||
#NOTE: Validate Deployment info
|
||||
helm status libvirt
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ helm upgrade --install libvirt ./libvirt \
|
|||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_LIBVIRT}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
#NOTE(portdirect): We dont wait for libvirt pods to come up, as they depend
|
||||
# on the neutron agents being up.
|
||||
|
||||
#NOTE: Validate Deployment info
|
||||
helm status libvirt
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
# under the License.
|
||||
set -xe
|
||||
|
||||
#NOTE: Deploy command
|
||||
#NOTE: Deploy libvirt
|
||||
helm upgrade --install libvirt ./libvirt \
|
||||
--namespace=openstack \
|
||||
${OSH_EXTRA_HELM_ARGS} \
|
||||
${OSH_EXTRA_HELM_ARGS_LIBVIRT}
|
||||
|
||||
#NOTE: Wait for deploy
|
||||
./tools/deployment/common/wait-for-pods.sh openstack
|
||||
#NOTE(portdirect): We dont wait for libvirt pods to come up, as they depend
|
||||
# on the neutron agents being up.
|
||||
|
||||
#NOTE: Validate Deployment info
|
||||
helm status libvirt
|
||||
|
|
|
|||
Loading…
Reference in New Issue