commit f8e29a6dc41d6163d64c59b8dcf86b6999db8a2c
author mcp-jenkins <mcp-jenkins@mirantis.com> Thu Oct 18 16:45:33 2018 +0000
committer Gerrit Code Review <mail@domain.com> Thu Oct 18 16:45:33 2018 +0000
tree e48dd54438121f23b648d96ac64f9875ee597601
parent 5dd913d2559d69d11c992e0dcb27683b5c9a9d89
parent 07b6109ec94964b5add85ef32f630a7fe5cdcf59

Merge "Add gerrit trigger to mcp-k8s-formula-test-pipeline job"

cinder/volume/backend/lvm.yml

diff --git a/cinder/volume/backend/lvm.yml b/cinder/volume/backend/lvm.yml
index 768fb6b..6559e46 100644
--- a/cinder/volume/backend/lvm.yml
+++ b/cinder/volume/backend/lvm.yml
@@ -1,6 +1,8 @@
 parameters:
   _param:
-    cinder_lvm_devices: [ "/dev/loop0" ]
+    cinder_lvm_default_device:  "/dev/loop0"
+    cinder_lvm_devices:
+    - ${_param:cinder_lvm_default_device}
   linux:
     storage:
       lvm:

neutron/client/service/ironic.yml

diff --git a/neutron/client/service/ironic.yml b/neutron/client/service/ironic.yml
index 6c5744a..e0814cd 100644
--- a/neutron/client/service/ironic.yml
+++ b/neutron/client/service/ironic.yml
@@ -1,11 +1,6 @@
 classes:
 - service.neutron.client
 parameters:
-  _param:
-     # TODO Remove below variables with typo in next release
-     openstack_baremetal_neutron_subnet_cidr: ${_param:openstack_baremeta_neutron_subnet_cidr}
-     openstack_baremetal_neutron_subnet_allocation_start: ${_param:openstack_baremeta_neutron_subnet_allocation_start}
-     openstack_baremetal_neutron_subnet_allocation_end: ${_param:openstack_baremeta_neutron_subnet_allocation_end}
   neutron:
     client:
       server: