diff options
Diffstat (limited to 'ci/config_tpl/juju2/bundle_tpl/ceph.yaml')
-rw-r--r-- | ci/config_tpl/juju2/bundle_tpl/ceph.yaml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml index b8948e61..180e0490 100644 --- a/ci/config_tpl/juju2/bundle_tpl/ceph.yaml +++ b/ci/config_tpl/juju2/bundle_tpl/ceph.yaml @@ -8,6 +8,7 @@ public: *ceph-public-space cluster: *ceph-cluster-space {% endif %} + series: {{ ubuntu.release }} options: expected-osd-count: {{ unit_ceph_qty() }} source: *openstack-origin @@ -43,10 +44,11 @@ public: *ceph-public-space cluster: *ceph-cluster-space {% endif %} + series: {{ ubuntu.release }} options: osd-devices: *osd-devices osd-journal: *osd-journal - osd-reformat: 'yes' + #osd-reformat: 'True' source: *openstack-origin {% if os.network.ipv6 %} prefer-ipv6: {{ os.network.ipv6 }} @@ -79,6 +81,7 @@ internal: *internal-space mon: *ceph-public-space {% endif %} + series: {{ ubuntu.release }} options: region: *openstack-region operator-roles: "Member,admin,SwiftOperator" @@ -90,7 +93,15 @@ ceph-osd-replication-count: {{ unit_ceph_qty() }} {% endif %} {% if os.ha.mode == 'ha' %} - vip: {{ opnfv.vip.radosgw }} + vip: *rados-gateway-vip +{% endif %} +{% if os.api.ssl %} + ssl_ca: *ssl_ca + ssl_cert: *ssl_cert + ssl_key: *ssl_key + os-public-hostname: *hostname_radosgw_public + os-admin-hostname: *hostname_radosgw_public + os-internal-hostname: *hostname_radosgw_public {% endif %} to: {% for unit_id in to_select(unit_qty()) %} |