From 8909836b9bf8e2e1608204f1a6976c3c31d08a0f Mon Sep 17 00:00:00 2001 From: "Denis V. Meltsaykin" Date: Fri, 24 Mar 2023 15:19:33 +0000 Subject: [PATCH] [maintenance-ci] actualise some settings - Bump wait_condition timeout, 10 mins is way too optimistic for a full stack deployment. - Entrypoint is changed after upgrading EU to MOSK. - Changed outdated DNS to an actual one. Change-Id: Ie7667497e6f479de7bb5fea932201ec1315cb77c --- maintenance-ci/common/data/jenkins-slave.yml | 4 ++-- maintenance-ci/common/data/mos-dev-slave-eu.yml | 4 ++-- maintenance-ci/common/data/mos-dev-slave-us.yml | 4 ++-- maintenance-ci/common/data/mos-slave-eu.yml | 4 ++-- maintenance-ci/common/data/mos-slave-us.yml | 4 ++-- maintenance-ci/common/data/openrc_files/openrc_eu_cloud.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/maintenance-ci/common/data/jenkins-slave.yml b/maintenance-ci/common/data/jenkins-slave.yml index 66a8057..f205f04 100644 --- a/maintenance-ci/common/data/jenkins-slave.yml +++ b/maintenance-ci/common/data/jenkins-slave.yml @@ -41,7 +41,7 @@ resources: properties: handle: {get_resource: wait_handle} count: 1 - timeout: 600 + timeout: 1200 wait_handle: type: OS::Heat::WaitConditionHandle @@ -56,7 +56,7 @@ resources: cidr: 10.10.0.0/24 dns_nameservers: - 172.18.176.6 - - 172.18.208.44 + - 172.18.224.6 router: type: OS::Neutron::Router diff --git a/maintenance-ci/common/data/mos-dev-slave-eu.yml b/maintenance-ci/common/data/mos-dev-slave-eu.yml index d7e597e..c7048fd 100644 --- a/maintenance-ci/common/data/mos-dev-slave-eu.yml +++ b/maintenance-ci/common/data/mos-dev-slave-eu.yml @@ -41,7 +41,7 @@ resources: properties: handle: {get_resource: wait_handle} count: 1 - timeout: 600 + timeout: 1200 wait_handle: type: OS::Heat::WaitConditionHandle @@ -56,7 +56,7 @@ resources: cidr: 10.10.0.0/24 dns_nameservers: - 172.18.176.6 - - 172.18.208.44 + - 172.18.224.6 router: type: OS::Neutron::Router diff --git a/maintenance-ci/common/data/mos-dev-slave-us.yml b/maintenance-ci/common/data/mos-dev-slave-us.yml index 5af8998..66521f7 100644 --- a/maintenance-ci/common/data/mos-dev-slave-us.yml +++ b/maintenance-ci/common/data/mos-dev-slave-us.yml @@ -41,7 +41,7 @@ resources: properties: handle: {get_resource: wait_handle} count: 1 - timeout: 600 + timeout: 1200 wait_handle: type: OS::Heat::WaitConditionHandle @@ -56,7 +56,7 @@ resources: cidr: 10.10.0.0/24 dns_nameservers: - 172.18.176.6 - - 172.18.208.44 + - 172.18.224.6 router: type: OS::Neutron::Router diff --git a/maintenance-ci/common/data/mos-slave-eu.yml b/maintenance-ci/common/data/mos-slave-eu.yml index 3e40766..2b8b904 100644 --- a/maintenance-ci/common/data/mos-slave-eu.yml +++ b/maintenance-ci/common/data/mos-slave-eu.yml @@ -41,7 +41,7 @@ resources: properties: handle: {get_resource: wait_handle} count: 1 - timeout: 600 + timeout: 1200 wait_handle: type: OS::Heat::WaitConditionHandle @@ -56,7 +56,7 @@ resources: cidr: 10.10.0.0/24 dns_nameservers: - 172.18.176.6 - - 172.18.208.44 + - 172.18.224.6 router: type: OS::Neutron::Router diff --git a/maintenance-ci/common/data/mos-slave-us.yml b/maintenance-ci/common/data/mos-slave-us.yml index 9d91abd..e898356 100644 --- a/maintenance-ci/common/data/mos-slave-us.yml +++ b/maintenance-ci/common/data/mos-slave-us.yml @@ -41,7 +41,7 @@ resources: properties: handle: {get_resource: wait_handle} count: 1 - timeout: 600 + timeout: 1200 wait_handle: type: OS::Heat::WaitConditionHandle @@ -56,7 +56,7 @@ resources: cidr: 10.10.0.0/24 dns_nameservers: - 172.18.176.6 - - 172.18.208.44 + - 172.18.224.6 router: type: OS::Neutron::Router diff --git a/maintenance-ci/common/data/openrc_files/openrc_eu_cloud.sh b/maintenance-ci/common/data/openrc_files/openrc_eu_cloud.sh index 26edb91..7823ecf 100644 --- a/maintenance-ci/common/data/openrc_files/openrc_eu_cloud.sh +++ b/maintenance-ci/common/data/openrc_files/openrc_eu_cloud.sh @@ -1 +1 @@ -OS_AUTH_URL=https://ic-eu.ssl.mirantis.net:5000/v3 +OS_AUTH_URL=https://keystone.ic-eu.ssl.mirantis.net/v3 -- 2.45.2