Merge "Do not hardcode DPDK driver to 'uio'"
diff --git a/haproxy/proxy/listen/cicd/jenkins.yml b/haproxy/proxy/listen/cicd/jenkins.yml
index 150fac0..93a9fdd 100644
--- a/haproxy/proxy/listen/cicd/jenkins.yml
+++ b/haproxy/proxy/listen/cicd/jenkins.yml
@@ -13,7 +13,7 @@
mode: http
options:
- forwardfor
- - httpchk
+ - httpchk get /login
- httpclose
- httplog
balance: source
diff --git a/jenkins/client/job/salt-models/tests.yml b/jenkins/client/job/salt-models/tests.yml
index 13a9881..e60fe22 100644
--- a/jenkins/client/job/salt-models/tests.yml
+++ b/jenkins/client/job/salt-models/tests.yml
@@ -64,6 +64,9 @@
MAX_CPU_PER_JOB:
type: string
default: "2"
+ RECLASS_IGNORE_CLASS_NOTFOUND:
+ type: boolean
+ default: "{{reclass_ignore_class_notfound}}"
LEGACY_TEST_MODE:
type: boolean
default: "{{legacy_test_mode}}"
@@ -199,6 +202,9 @@
MAX_CPU_PER_JOB:
type: string
default: "2"
+ RECLASS_IGNORE_CLASS_NOTFOUND:
+ type: boolean
+ default: "false"
LEGACY_TEST_MODE:
type: boolean
default: "false"
diff --git a/maas/region/single.yml b/maas/region/single.yml
index d3227ca..2bf9469 100644
--- a/maas/region/single.yml
+++ b/maas/region/single.yml
@@ -1,5 +1,6 @@
classes:
- service.maas.region.single
+ - service.maas.cluster.single
- service.maas.region.vendor_repo
parameters:
_param: