Merge "Use set horizon log filename to original"
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 1c742db..a7469ef 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -242,8 +242,8 @@
amphora_image_name: amphora-x64-haproxy
amphora_image_url: ${_param:mcp_static_images_url}/octavia/amphora-x64-haproxy-${_param:openstack_version}-${_param:mcp_version}.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/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 192f5dc..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
@@ -24,3 +24,9 @@
SALT_MASTER_URL:
type: string
default: "${_param:jenkins_salt_api_url}"
+ RESTORE_SALTMASTER_AND_MAAS: #TODO: Salt-master and MaaS backup should be separated. See https://mirantis.jira.com/browse/PROD-33616 for more info.
+ type: boolean
+ default: 'true'
+ RESTORE_DOGTAG:
+ type: boolean
+ default: 'true'