Merge "Add virt:nic:baremetal and use it for golden" into release/proposed/2019.2.0
diff --git a/apache/server/site/horizon.yml b/apache/server/site/horizon.yml
index e909d4c..2c85f6b 100644
--- a/apache/server/site/horizon.yml
+++ b/apache/server/site/horizon.yml
@@ -57,6 +57,7 @@
log:
custom:
format: ${_param:apache_site_openstack_horizon_log_format}
+ file: '/var/log/apache2/openstack_dashboard_access.log'
error:
enabled: true
level: debug
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 2976422..c37e551 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -237,8 +237,8 @@
amphora_image_name: amphora-x64-haproxy
amphora_image_url: "${_param:mcp_binary_registry}/mirantis/openstack/octavia/images/${_param:mcp_version}/${_param:openstack_version}/amphora-x64-haproxy.qcow2"
- glance_image_cirros_name: 'TestCirros-0.3.5'
- glance_image_cirros_location: "${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.3.5/cirros-0.3.5-x86_64-disk.img"
+ glance_image_cirros_name: 'TestCirros-0.4.0'
+ glance_image_cirros_location: "${_param:mcp_binary_registry}/mirantis/external/images/cirros/0.4.0/cirros-0.4.0-x86_64-disk.img"
glance_image_fedora_name: 'TestFedora-27-1.6'
glance_image_fedora_location: "${_param:mcp_binary_registry}/mirantis/external/images/cloud-fedora/27/Fedora-Cloud-Base-27-1.6.x86_64.qcow2"
diff --git a/jenkins/client/job/ceph/add-osd-upmap.yml b/jenkins/client/job/ceph/add-osd-upmap.yml
index 949154d..9e95894 100644
--- a/jenkins/client/job/ceph/add-osd-upmap.yml
+++ b/jenkins/client/job/ceph/add-osd-upmap.yml
@@ -5,7 +5,7 @@
ceph-add-osd-upmap:
type: workflow-scm
concurrent: true
- display_name: "Ceph - add osd"
+ display_name: "Ceph - add osd ( upmap )"
description: "This pipeline requires ceph luminous version, all clients must be upgraded to luminous version to proceed."
discard:
build:
diff --git a/jenkins/client/job/deploy/backupninja_backup.yml b/jenkins/client/job/deploy/backupninja_backup.yml
index c48422f..690ae0a 100644
--- a/jenkins/client/job/deploy/backupninja_backup.yml
+++ b/jenkins/client/job/deploy/backupninja_backup.yml
@@ -5,7 +5,7 @@
backupninja_backup:
type: workflow-scm
name: backupninja-backup
- display_name: "Backupninja salt-master/MaaS backup"
+ display_name: "Backupninja backup pipeline"
discard:
build:
keep_num: 50
diff --git a/jenkins/client/job/deploy/backupninja_restore.yml b/jenkins/client/job/deploy/backupninja_restore.yml
index 3716b24..76a594e 100644
--- a/jenkins/client/job/deploy/backupninja_restore.yml
+++ b/jenkins/client/job/deploy/backupninja_restore.yml
@@ -6,7 +6,7 @@
backupninja_restore:
type: workflow-scm
name: backupninja-restore
- display_name: "Backupninja restore salt-master/MaaS backup"
+ display_name: "Backupninja restore pipeline"
discard:
build:
keep_num: 50