[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

diff --git a/maintenance-ci/common/data/jenkins-slave.yml b/maintenance-ci/common/data/jenkins-slave.yml
index 66a805786ad9a99f07019eb7bd7f653067ec2c45..f205f0450da5d9e72bfdaae2973f05623c7d55c1 100644 (file)
--- 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 d7e597ee3337d60f4c6c345776ad1ae7426d16e3..c7048fd3e1e126109f9e4a6cc31ff205fd297120 100644 (file)
--- 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 5af8998783a9b4df201f1051a6fbbddd8341e949..66521f777cbd4a41ea9126c8ab8ebcf44da79784 100644 (file)
--- 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 3e407663e6ea06cb8dd74353db393fd527d72a5a..2b8b9048e56fc7ae36c7c151468eb10fb7b9a780 100644 (file)
--- 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 9d91abdc4306785dc7cf665e7ddb963d8122a16f..e89835661dd8335c2b377c9319a434b44fb3c82c 100644 (file)
--- 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 26edb91bd6d563956c0e86d8dc334b2223dd862d..7823ecf2087475e793b1a141594fa6f9f502c7bb 100644 (file)
--- 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