Merge "Switch maas to dockerized PostgreSQL"
diff --git a/jenkins/client/job/security/openscap.yml b/jenkins/client/job/security/openscap.yml
index aa8dd6c..74bc15a 100644
--- a/jenkins/client/job/security/openscap.yml
+++ b/jenkins/client/job/security/openscap.yml
@@ -63,5 +63,5 @@
description: "The tailoring id"
XCCDF_CPE:
type: string
- default: ''
+ default: '/usr/share/mirantis-scap-content/mirantis/cpe/openscap-cpe-dict.xml'
description: "CPE dictionary or language for applicability checks. (Example: /usr/share/openscap/cpe/openscap-cpe-dict.xml)"
diff --git a/maas/region/single.yml b/maas/region/single.yml
index e7c7078..309ef34 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -16,7 +16,24 @@
xenial:
extra_pkgs:
enabled: true
- pkgs: [ "linux-headers-virtual-hwe-16.04", "linux-image-extra-virtual-hwe-16.04" ]
+ pkgs:
+ - linux-headers-virtual-hwe-16.04
+ - linux-image-extra-virtual-hwe-16.04
+ - acpid
+ - apt-transport-https
+ - bridge-utils
+ - curl
+ - dbus
+ - ethtool
+ - ifenslave
+ - iptables
+ - iputils-ping
+ - lsof
+ - strace
+ - tcpdump
+ - traceroute
+ - vlan
+ - wget
kernel_package:
enabled: true
value: 'linux-image-virtual-hwe-16.04'
diff --git a/neutron/gateway/cluster.yml b/neutron/gateway/cluster.yml
index 6d33684..2a4f4f4 100644
--- a/neutron/gateway/cluster.yml
+++ b/neutron/gateway/cluster.yml
@@ -18,7 +18,7 @@
vlan_aware_vms: ${_param:neutron_enable_vlan_aware_vms}
agent_mode: ${_param:neutron_gateway_agent_mode}
backend:
- tenant_network_types: ${_param:neutron_tenant_network_types}"
+ tenant_network_types: "${_param:neutron_tenant_network_types}"
message_queue:
port: ${_param:openstack_rabbitmq_port}
members: