Merge "Add virtual_mcp_pike_dvr_ssl deploy job"
diff --git a/haproxy/proxy/listen/openstack/nova-placement.yml b/haproxy/proxy/listen/openstack/nova-placement.yml
index 9fec963..de0504b 100644
--- a/haproxy/proxy/listen/openstack/nova-placement.yml
+++ b/haproxy/proxy/listen/openstack/nova-placement.yml
@@ -3,17 +3,11 @@
proxy:
listen:
nova_placement_api:
- mode: http
+ type: openstack-service
+ service_name: nova_placement
binds:
- address: ${_param:cluster_vip_address}
port: 8778
- options:
- - httpclose
- - httplog
- health-check:
- http:
- options:
- - expect status 401
servers:
- name: ${_param:cluster_node01_hostname}
host: ${_param:cluster_node01_address}
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 6089195..82135f4 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -260,6 +260,9 @@
- name: prometheus
upload_source_package: false
dist: trusty
+ - name: pv
+ upload_source_package: false
+ dist: trusty
- name: python
upload_source_package: false
dist: trusty
@@ -602,6 +605,9 @@
- name: powerdns
upload_source_package: true
dist: xenial
+ - name: pv
+ upload_source_package: true
+ dist: xenial
- name: python
upload_source_package: true
dist: xenial
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index d4c15b6..206a2d8 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -50,6 +50,14 @@
branch: "master"
tags: "latest"
dockerfile: "Dockerfile"
+ - name: docker-ci-rally
+ branch: "master"
+ tags: "latest"
+ dockerfile: "Dockerfile"
+ - name: docker-ci-tempest
+ branch: "master"
+ tags: "latest"
+ dockerfile: "Dockerfile"
template:
discard:
build:
diff --git a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
index 249a7e5..728f8b8 100644
--- a/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
+++ b/jenkins/client/job/salt-formulas/git-mirrors/2way.yml
@@ -36,6 +36,9 @@
- name: barbican
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
+ - name: baremetal-simulator
+ branches: ${_param:salt_formulas_branches}
+ notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: billometer
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
@@ -84,6 +87,9 @@
- name: docker
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
+ - name: dogtag
+ branches: ${_param:salt_formulas_branches}
+ notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: dovecot
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
@@ -291,6 +297,9 @@
- name: prometheus
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
+ - name: pv
+ branches: ${_param:salt_formulas_branches}
+ notification_recipients: ${_param:salt_formulas_notification_recipients}
- name: python
branches: ${_param:salt_formulas_branches}
notification_recipients: ${_param:salt_formulas_notification_recipients}
diff --git a/jenkins/client/job/salt-formulas/tests.yml b/jenkins/client/job/salt-formulas/tests.yml
index b6d74f2..2f6e807 100644
--- a/jenkins/client/job/salt-formulas/tests.yml
+++ b/jenkins/client/job/salt-formulas/tests.yml
@@ -53,6 +53,7 @@
- name: haproxy
- name: heat
- name: heka
+ - name: heketi
- name: helm
- name: horizon
- name: influxdb
@@ -102,6 +103,7 @@
- name: powerdns
- name: pritunl
- name: prometheus
+ - name: pv
- name: python
- name: rabbitmq
- name: reclass