Merge "Drop gloval OFFLINE_DEPLOYMENT var"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 5adb1a7..0bce371 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -89,6 +89,7 @@
# Ironic
ironic_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
ironic_memcache_secret_key: ''
+ ironic_console_enabled: true
# Keystone
keystone_old_version: ${_param:openstack_old_version}
keystone_version: ${_param:openstack_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/ironic/conductor/cluster.yml b/ironic/conductor/cluster.yml
index 09548b7..2394a29 100644
--- a/ironic/conductor/cluster.yml
+++ b/ironic/conductor/cluster.yml
@@ -39,3 +39,9 @@
automated_clean: true
erase_devices_priority: 0
erase_devices_metadata_priority: 1
+ console:
+ enabled: ${_param:ironic_console_enabled}
+ enabled_console_interfaces:
+ - ipmitool-shellinabox
+ - ipmitool-socat
+ - no-console
diff --git a/ironic/conductor/single.yml b/ironic/conductor/single.yml
index 4bbdfa9..e5005da 100644
--- a/ironic/conductor/single.yml
+++ b/ironic/conductor/single.yml
@@ -40,3 +40,9 @@
automated_clean: true
erase_devices_priority: 0
erase_devices_metadata_priority: 1
+ console:
+ enabled: ${_param:ironic_console_enabled}
+ enabled_console_interfaces:
+ - ipmitool-shellinabox
+ - ipmitool-socat
+ - no-console
diff --git a/jenkins/client/job/deploy/galera_verify_restore.yml b/jenkins/client/job/deploy/galera_verify_restore.yml
index 5a32bb5..c1a9d20 100644
--- a/jenkins/client/job/deploy/galera_verify_restore.yml
+++ b/jenkins/client/job/deploy/galera_verify_restore.yml
@@ -28,3 +28,6 @@
ASK_CONFIRMATION:
type: boolean
default: 'true'
+ CHECK_TIME_SYNC:
+ type: boolean
+ default: 'true'
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}
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 2a4f4f4..a159a6d 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -11,6 +11,18 @@
kernel:
sysctl:
fs.inotify.max_user_instances: 4096
+# Old keepalived version has been pinned due to
+# workaround for PROD-26273 and should be removed
+# once keepalived deb package is available higher
+# 1.3.9 version
+ repo:
+ ubuntu:
+ pinning:
+ 10:
+ enabled: true
+ pin: 'version 1:1.2.19-1'
+ priority: 1100
+ package: 'keepalived'
neutron:
gateway:
dvr: ${_param:neutron_gateway_dvr}