From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 23 May 2017 15:58:48 +0000 (+0000)
Subject: Merge "Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing... 
X-Git-Tag: opnfv-6.0.0~634
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=aeb11f384fe8e221c9bd62b8b86ecb1da4003777;p=apex-tripleo-heat-templates.git

Merge "Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing by default"
---

aeb11f384fe8e221c9bd62b8b86ecb1da4003777
diff --cc ci/environments/scenario004-multinode.yaml
index a5c6fa31,14f181c4..e473d0bb
--- a/ci/environments/scenario004-multinode.yaml
+++ b/ci/environments/scenario004-multinode.yaml
@@@ -90,7 -86,7 +90,8 @@@ parameter_defaults
    CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
    CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
    CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
+   CephPoolDefaultSize: 1
    SwiftCeilometerPipelineEnabled: false
 -  NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin'
 +  NeutronServicePlugins: 'router, networking_bgpvpn.neutron.services.plugin.BGPVPNPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin'
    BgpvpnServiceProvider: 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'
 +  L2gwServiceProvider: ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']