From 221ec46c265e2da0d484c5cd3308532cfbbb6ce1 Mon Sep 17 00:00:00 2001 From: Evgeny L Date: Mon, 8 Apr 2019 21:49:43 +0000 Subject: [PATCH] Fix broken Nova and Neutron deployment 1. Upgrade Nova chart to be compatible with Ocata Rally container. 2. Test for Neutron takes more than 20 minutes to complete, increase a timeout for Neutron chart execution. Change-Id: I9386991ef3b59d699ef75e276c4804e318f4e6b0 --- .../v1.0demo/software/charts/osh/compute-kit/neutron.yaml | 2 ++ deployment_files/global/v1.0demo/software/config/versions.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml index 4a874113..fb5348cb 100644 --- a/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml +++ b/deployment_files/global/v1.0demo/software/charts/osh/compute-kit/neutron.yaml @@ -52,6 +52,8 @@ data: labels: application: neutron component: ks-endpoints + wait: + timeout: 1800 values: labels: agent: diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml index 07bb617d..6685a1e6 100644 --- a/deployment_files/global/v1.0demo/software/config/versions.yaml +++ b/deployment_files/global/v1.0demo/software/config/versions.yaml @@ -380,7 +380,7 @@ data: type: git location: https://git.openstack.org/openstack/openstack-helm subpath: nova - reference: 92b04a735d6a26e6cffc5c83a4a7dccfdebba2b7 + reference: 112e15b1655285194593a7afca4352ce046c7a47 nova-htk: type: git location: https://git.openstack.org/openstack/openstack-helm-infra