Merge "Remove osd_pool_default_min_size to allow Ceph cluster to do the right thing...
authorJenkins <jenkins@review.openstack.org>
Tue, 23 May 2017 15:58:48 +0000 (15:58 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 23 May 2017 15:58:48 +0000 (15:58 +0000)
1  2 
ci/environments/scenario001-multinode.yaml
ci/environments/scenario004-multinode.yaml
puppet/services/ceph-base.yaml
puppet/services/ceph-mon.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']
Simple merge
Simple merge