2017-10-17: FG; Fixed replication count parameter.

bundles/openstack/bundle_template.juju2.cephlocal.yaml

@@ -13,15 +13,15 @@ variables:
 #EDIT#  os-data-network: &os_data_network   <your_OS_data_network>
 
   # Ceph configs
-#EDIT#  ceph-fsid: &ceph_fsid   <your_FSID_here>
-#EDIT#  ceph-monitor-hosts: &ceph_monitor_hosts    [cephmon1:port[ cephmon2:port cephmon3:port]]
 #EDIT#  ceph-osd-partition: &ceph_osd_partition  /data
+#EDIT#  ceph-cinder-replication-count: &ceph_cinder_replication_count  2
+#EDIT#  ceph-glance-replication-count: &ceph_glance_replication_count  2
 
   ceph-radosgw-pool-prefix: &ceph_radosgw_pool_prefix    testrgw
   ceph-radosgw-lightweight-pool-pg-num:  &ceph_radosgw_lightweight_pool_pg_num  8
   ceph-radosgw-rgw-buckets-pool-weight:  &ceph_radosgw_rgw_buckets_pool_weight  5
-  ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_ceph_osd_replication_count  2
   ceph-radosgw-config-flags:  &ceph_radosgw_config_flags
+#EDIT#  ceph-radosgw-replication-count: &ceph_radosgw_replication_count  2
 
   # vips (number of VIPs should match number of different bindings)
 
@@ -616,6 +616,7 @@ services:
       gui-x: '1330'
       gui-y: '230'
     options:
+      ceph-osd-replication-count: *ceph_cinder_replication_count
       restrict-ceph-pools: True
   ceph-mon-STRSITE:
     charm: cs:xenial/ceph-mon
@@ -668,7 +669,7 @@ services:
       cluster: *network_space_os_mgmt
     num_units: 3
     options:
-      ceph-osd-replication-count: *ceph_radosgw_ceph_osd_replication_count
+      ceph-osd-replication-count: *ceph_radosgw_replication_count
       config-flags: *ceph_radosgw_config_flags
       nagios_servicegroups: ceph,object,storage
       nagios_context: *nagios_context
@@ -702,6 +703,7 @@ services:
       shared-db: *network_space_os_mgmt
       cluster: *network_space_os_mgmt
     options:
+      ceph-osd-replication-count: *ceph_glance_replication_count
       openstack-origin: *openstack_origin
       debug: 'False'
       verbose: 'False'

bundles/openstack/bundle_template.juju2.yaml

@@ -19,8 +19,8 @@ variables:
   ceph-radosgw-pool-prefix: &ceph_radosgw_pool_prefix    testrgw
   ceph-radosgw-lightweight-pool-pg-num:  &ceph_radosgw_lightweight_pool_pg_num  8
   ceph-radosgw-rgw-buckets-pool-weight:  &ceph_radosgw_rgw_buckets_pool_weight  5
-  ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_ceph_osd_replication_count  2
   ceph-radosgw-config-flags:  &ceph_radosgw_config_flags
+#EDIT#  ceph-radosgw-ceph-osd-replication-count: &ceph_radosgw_replication_count  2
 
   # vips (number of VIPs should match number of different bindings)
 
@@ -633,7 +633,7 @@ services:
       cluster: *network_space_os_mgmt
     num_units: 3
     options:
-      ceph-osd-replication-count: *ceph_radosgw_ceph_osd_replication_count
+      ceph-osd-replication-count: *ceph_radosgw_replication_count
       config-flags: *ceph_radosgw_config_flags
       nagios_servicegroups: ceph,object,storage
       nagios_context: *nagios_context