commit a8321d6c0e09ec72f2275866d215ad81f8491995
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Feb 04 09:57:36 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Feb 04 09:57:36 2019 +0000
tree 9a927ed0065713564d72380a322720d13f672fc1
parent 597fb414bd89a497eae1a35173e6b982cde6da21
parent 1e8a5aee69e703a0630637b6a8913119e0613ced

Merge "Add VERIFICATION_RETRIES patameter to galera restoration pipeline"

heat/server/cluster.yml

diff --git a/heat/server/cluster.yml b/heat/server/cluster.yml
index 1edf790..be2f211 100644
--- a/heat/server/cluster.yml
+++ b/heat/server/cluster.yml
@@ -18,7 +18,6 @@
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}
-        domain: heat
       enabled: true
       region: ${_param:openstack_region}
       version: ${_param:heat_version}

heat/server/single.yml

diff --git a/heat/server/single.yml b/heat/server/single.yml
index 24db595..4ce11fa 100644
--- a/heat/server/single.yml
+++ b/heat/server/single.yml
@@ -17,7 +17,6 @@
       stack_domain_admin:
         name: heat_domain_admin
         password: ${_param:heat_domain_admin_password}
-        domain: heat
       metadata:
         protocol: ${_param:cluster_public_protocol}
       waitcondition:

jenkins/client/init.yml

diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index a64c76f..4f0b3f4 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -11,12 +11,8 @@
     jenkins_master_port: 8081
     jenkins_aptly_storages: "local"
     jenkins_pipelines_branch: "master"
-    jenkins_offline_deployment: "false"
   jenkins:
     client:
-      globalenvprop:
-        OFFLINE_DEPLOYMENT:
-          value: ${_param:jenkins_offline_deployment}
       master:
         host: ${_param:jenkins_master_host}
         port: ${_param:jenkins_master_port}