Upversion Armada SHA to be a newer image
Using SHA: af8a9ffd0873c2fbc915794e235dbd357f2adab1 which was built and tagged on April 9, 2019. The previous Armada SHA was from Sept 2018. The manifest.xml is updated to not generate armada warnings for libvirt, openvswitch, nova and neutron. The warning was: "label_selector" not specified, waiting with no labels may cause unintended consequences. Story: 2005198 Task: 30436 Change-Id: I97b633d9e6e1e4574e25dc8b69500faae4b4a809 Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
parent
3c389adaaf
commit
082bbe4927
|
@ -1,3 +1,3 @@
|
|||
SRC_DIR="stx-openstack-helm"
|
||||
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/rbd-provisioner $PKG_BASE/../../../helm-charts/garbd $PKG_BASE/../../../helm-charts/ceph-pools-audit"
|
||||
TIS_PATCH_VER=9
|
||||
TIS_PATCH_VER=10
|
||||
|
|
|
@ -643,6 +643,10 @@ data:
|
|||
chart_name: libvirt
|
||||
release: openstack-libvirt
|
||||
namespace: openstack
|
||||
wait:
|
||||
timeout: 1800
|
||||
labels:
|
||||
release_group: osh-openstack-libvirt
|
||||
install:
|
||||
no_hooks: false
|
||||
upgrade:
|
||||
|
@ -673,11 +677,10 @@ data:
|
|||
release: openstack-openvswitch
|
||||
namespace: openstack
|
||||
# If we deploy ovs-dpdk on the host, ovs pod will not be created.
|
||||
# We can use "native wait" instead. But it's not supported in current armada version.
|
||||
# Before we upgrade armada to new version, we comment the wait
|
||||
# https://github.com/openstack/airship-armada/blob/master/armada/schemas/armada-chart-schema.yaml#L81-L111
|
||||
#wait:
|
||||
# timeout: 1800
|
||||
wait:
|
||||
timeout: 1800
|
||||
labels:
|
||||
release_group: osh-openstack-openvswitch
|
||||
install:
|
||||
no_hooks: false
|
||||
upgrade:
|
||||
|
@ -708,6 +711,10 @@ data:
|
|||
chart_name: nova
|
||||
release: openstack-nova
|
||||
namespace: openstack
|
||||
wait:
|
||||
timeout: 1800
|
||||
labels:
|
||||
release_group: osh-openstack-nova
|
||||
test:
|
||||
enabled: false
|
||||
install:
|
||||
|
@ -998,6 +1005,10 @@ data:
|
|||
chart_name: neutron
|
||||
release: openstack-neutron
|
||||
namespace: openstack
|
||||
wait:
|
||||
timeout: 1800
|
||||
labels:
|
||||
release_group: osh-openstack-neutron
|
||||
test:
|
||||
enabled: false
|
||||
install:
|
||||
|
|
Loading…
Reference in New Issue