Skip to content

Commit

Permalink
chore: Revert the sections that were rebranding
Browse files Browse the repository at this point in the history
  • Loading branch information
petesfrench committed Nov 18, 2024
1 parent 34f59f2 commit 4a6672e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
23 changes: 12 additions & 11 deletions templates/ceph/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ <h2>Ceph storage deployment and operations</h2>
<p>Canonical can help you to design and install your Ceph cluster or provide consulting to enable you to run Ceph autonomously. Day 2 operations are straightforward with highly automated procedures to upgrade and expand clusters, and manage hardware replacements. If you prefer to treat your storage as-a-service, we offer Managed Ceph &mdash; a Ceph cluster fully managed by Canonical.</p>

<h3>Benefits of Ceph on Ubuntu</h3>
<p>The choice is yours as to whether to use your own operational framework or leverage the benefits of Canonical Ceph. Each Ubuntu LTS release ships with a version of Ceph that is supported for up to 10 years. Newer releases of Ceph can be installed from the Ubuntu Cloud Archive, allowing flexibility to select the right version of Ceph for your environment. To maximise Ceph upgrade flexibility for customers, Ceph versions are regularly released and maintained via Ubuntu updates and security repositories, as well as the Ubuntu Cloud Archive. This leads to a flexible mix between remaining at the forefront of innovation and providing long-term support predictability.</p>
<p>With many global enterprises and telco operators running Ceph on Ubuntu, organisations are able to combine block, file and object storage at scale while tapping into the economic and upstream benefits of open source.</p>
<p>The choice is yours as to whether to use your own operational framework or leverage the benefits of Canonical Ceph. Each Ubuntu LTS release ships with a version of Ceph that is supported for up to 10 years. Newer releases of Ceph can be installed from the Ubuntu Cloud Archive, allowing flexibility to select the right version of Ceph for your environment. To maximize Ceph upgrade flexibility for customers, Ceph versions are regularly released and maintained via Ubuntu updates and security repositories, as well as the Ubuntu Cloud Archive. This leads to a flexible mix between remaining at the forefront of innovation and providing long-term support predictability.</p>
<p>With many global enterprises and telco operators running Ceph on Ubuntu, organizations are able to combine block, file and object storage at scale while tapping into the economic and upstream benefits of open source.</p>
</div>

<div class="row">
<div class="col-6">
<div class="col-9">
{% include "ceph/components/benefits-table.html" %}
</div>
</div>
Expand Down Expand Up @@ -145,7 +145,7 @@ <h3 class="p-heading--4">cephadm/rook <br/>Canonical Ceph rocks</h3>
) | safe
}}
<hr class="p-rule--muted"/>
<h3 class="p-heading--4">Edge Cloud <br/>Canonical MicroCeph</h3>
<h3 class="p-heading--4">Edge cloud <br/>Canonical MicroCeph</h3>
<p>Lightweight deployment and management for edge computing use-cases.</p>
</div>
<div class="col-6 p-card">
Expand All @@ -159,7 +159,7 @@ <h3 class="p-heading--4">Edge Cloud <br/>Canonical MicroCeph</h3>
) | safe
}}
<hr class="p-rule--muted"/>
<h3 class="p-heading--4">Training / Local Dev <br/>Canonical MicroCeph</h3>
<h3 class="p-heading--4">Training / Local dev <br/>Canonical MicroCeph</h3>
<p>Small scale deployments for training and local-development.</p>
</div>
</div>
Expand Down Expand Up @@ -191,7 +191,7 @@ <h4>Benefits of Canonical Ceph</h4>
<li class="p-list__item is-ticked">Compatible with Amazon S3 and OpenStack Swift APIs</li>
<li class="p-list__item is-ticked">Decrease CapEx by using commodity hardware</li>
<li class="p-list__item is-ticked">Decrease OpEx through failure detection, self-management and self-healing</li>
<li class="p-list__item is-ticked">Configurable and optimisable for cost and performance</li>
<li class="p-list__item is-ticked">Configurable and optimizable for cost and performance</li>
</ul>
</div>
<hr class="is--muted" />
Expand Down Expand Up @@ -235,7 +235,7 @@ <h4>Encryption at rest</h4>
<div class="col-6">
<h4>Tested architecture</h4>
<p>Our Ceph reference architectures have been developed after extensive testing and production experience with leading hardware vendors.</p>
<p>Utilise nearline SAS or SATA drives for bulk storage to drive lower storage costs with NVMe flash as a cache device to increase performance.</p>
<p>Utilize nearline SAS or SATA drives for bulk storage to drive lower storage costs with NVMe flash as a cache device to increase performance.</p>
</div>
</div>
</section>
Expand Down Expand Up @@ -268,12 +268,12 @@ <h3 class="p-heading--4">Ceph support on Ubuntu</h3>
<ul class="p-list">
<li class="p-list__item is-ticked">Ceph support is included in <a href="/pro">Ubuntu Pro</a></li>
<li class="p-list__item is-ticked">Simple and predictable pricing model</li>
<li class="p-list__item is-ticked">Up to 192 TB of raw storage included per node</li>
<li class="p-list__item is-ticked">Up to 384TB of raw storage included per node</li>
<li class="p-list__item is-ticked">OCI compliant rocks for cephadm and Rook or packages available</li>
<li class="p-list__item is-ticked">Get access to the storage experts 24/7 or during business hours</li>
<li class="p-list__item is-ticked">Alternatively, get extended security maintenance if all you need is peace of mind by consuming security patches from the world's leading security team</li>
</ul>
<p><a href="/pricing/infra">Find out more&nbsp;&rsaquo;</a></p>
<p><a href="/pricing/infra">Learn more about Ubuntu Pro&nbsp;&rsaquo;</a></p>
</div>

<div class="col-6 p-card">
Expand All @@ -296,15 +296,16 @@ <h3 class="p-heading--4">Managed Ceph</h3>
<ul class="p-list">
<li class="p-list__item is-ticked">Fully managed storage cluster, on your servers, at your location</li>
<li class="p-list__item is-ticked">Built in 2 weeks using a proven reference architecture</li>
<li class="p-list__item is-ticked">Customise the architecture in iterations based on your storage needs</li>
<li class="p-list__item is-ticked">Customize the architecture in iterations based on your storage needs</li>
<li class="p-list__item is-ticked">Your team has access to all machines at all times</li>
<li class="p-list__item is-ticked">Modern monitoring and log management</li>
<li class="p-list__item is-ticked">Canonical hands over the keys when you are ready</li>
</ul>
<p><a href="/ceph/managed">Find out more&nbsp;&rsaquo;</a></p>
<p><a href="/ceph/managed">Learn more about fully managed Ceph&nbsp;&rsaquo;</a></p>
</div>
</div>
</section>

<section class="p-strip--light is-deep is-bordered">
{% include "shared/_resources_ceph.html" %}
</section>
Expand Down
2 changes: 1 addition & 1 deletion templates/openstack/features.html
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ <h2>Storage</h2>
</p>
<p>With Canonical's Charmed OpenStack you get:</p>
<ul class="p-list">
<li class="p-list__item is-ticked">Up to 192TB raw storage per node</li>
<li class="p-list__item is-ticked">Up to 384TB raw storage per node</li>
<li class="p-list__item is-ticked">Data encryption in transit and at rest</li>
<li class="p-list__item is-ticked">Data protection and data durability</li>
<li class="p-list__item is-ticked">A mix of block and object storage based on personal requirements</li>
Expand Down
2 changes: 1 addition & 1 deletion templates/pricing/pro.html
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ <h2 class="p-text--small-caps">Software-defined storage</h2>
<div class="col">
<h3 class="p-heading--2">Ceph and Swift</h3>
<p>
Only applies if attaching more than 192TB of raw Ceph/Swift capacity per node in the cluster. Additional capacity is priced per node exceeding 192TB included in Ubuntu Pro.
Only applies if attaching more than 384TB of raw Ceph/Swift capacity per node in the cluster. Additional capacity is priced per node exceeding 384TB included in Ubuntu Pro.
</p>
</div>

Expand Down

0 comments on commit 4a6672e

Please sign in to comment.