Merge "Define Helm client version."
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}
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:
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}
diff --git a/jenkins/client/job/deploy/galera_verify_restore.yml b/jenkins/client/job/deploy/galera_verify_restore.yml
index c1a9d20..492d76f 100644
--- a/jenkins/client/job/deploy/galera_verify_restore.yml
+++ b/jenkins/client/job/deploy/galera_verify_restore.yml
@@ -31,3 +31,6 @@
CHECK_TIME_SYNC:
type: boolean
default: 'true'
+ VERIFICATION_RETRIES:
+ type: string
+ default: 5
diff --git a/keystone/client/v3/service/neutron.yml b/keystone/client/v3/service/neutron.yml
index 8f3c47e..2c1df47 100644
--- a/keystone/client/v3/service/neutron.yml
+++ b/keystone/client/v3/service/neutron.yml
@@ -22,7 +22,7 @@
interface: 'public'
url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:9696/
region: ${_param:openstack_region}
- neutron_interna;:
+ neutron_internal:
interface: 'internal'
url: ${_param:neutron_service_protocol}://${_param:neutron_service_host}:9696/
region: ${_param:openstack_region}
diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 63e4faf..91b410b 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -37,5 +37,5 @@
ssl:
enabled: ${_param:galera_ssl_enabled}
role: ${_param:openstack_node_role}
- identity:
- protocol: ${_param:cluster_internal_protocol}
+ identity:
+ protocol: ${_param:cluster_internal_protocol}