Remove a manifest wait when setting up ovs-dpdk pods

This commit added support for wait in the pods
https://review.openstack.org/#/c/651380

However, when ovs-dpdk vswitch type is enabled like this:
  system modify --vswitch_type ovs-dpdk
the wait causes armada to timeout.

This fix is to re-comment out the wait.

Note: this causes the armada logs to show:

WARNING armada.handlers.wait [-] [chart=openvswitch]:
 "label_selector" not specified,
 waiting with no labels may cause unintended consequences.

This submission will get sanity to pass.  A later submission
by someone with ovs expertise can update the openvswitch.py
helm code to add a meta_override to eliminate the warning logs.

Partial-Bug: 1824829
Change-Id: I1e08b2dd98d859d0b37612aba3de70d969653cda
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2019-04-15 12:43:32 -05:00
parent 7bbe7f1bcd
commit 9f78bc667d
1 changed files with 5 additions and 4 deletions

View File

@ -680,10 +680,11 @@ data:
release: openstack-openvswitch
namespace: openstack
# If we deploy ovs-dpdk on the host, ovs pod will not be created.
wait:
timeout: 1800
labels:
release_group: osh-openstack-openvswitch
# commenting out the wait block until a solution can be implemented
#wait:
# timeout: 1800
# labels:
# release_group: osh-openstack-openvswitch
install:
no_hooks: false
upgrade: