Skip to content

Commit 420ee7c

Browse files
committed
Merge pull request #4042 from carmstrong/list-linode-everywhere
chore(*): update lists of supported providers
2 parents 2a7c768 + fceee79 commit 420ee7c

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

client/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ lightweight and flexible.
2525
Deis comes with out-of-the-box support for Ruby, Python, Node.js, Java,
2626
Clojure, Scala, Play, PHP, Perl, Dart and Go. However, Deis can deploy
2727
anything using Docker images or Heroku Buildpacks. Deis is designed to work
28-
with any cloud provider. Currently Amazon EC2, DigitalOcean, and
29-
Google Compute Engine are supported.
28+
with any cloud provider. Currently Amazon Web Services, Azure, DigitalOcean,
29+
Google Compute Engine, Linode, OpenStack, and bare metal deployments are supported.
3030

3131

3232
Why Deis?

client/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
url='https://github.com/deis/deis',
4242
keywords=[
4343
'opdemand', 'deis', 'paas', 'cloud', 'coreos', 'docker', 'heroku',
44-
'aws', 'ec2', 'digitalocean', 'gce'
44+
'aws', 'ec2', 'digitalocean', 'gce', 'azure', 'linode', 'openstack'
4545
],
4646
classifiers=[
4747
'Development Status :: 5 - Production/Stable',

docs/managing_deis/configure-dns.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
Configure DNS
77
=============
88

9-
For Deis clusters on EC2, GCE, Azure, DigitalOcean, OpenStack, or bare metal,
10-
:ref:`DNS records <dns_records>` must be created. The cluster runs multiple routers in
11-
front of the Deis controller and apps you deploy, so a
12-
:ref:`load balancer <configure-load-balancers>` is recommended.
9+
For Deis clusters on Amazon Web Services, Azure, DigitalOcean, Google Compute Engine,
10+
Linode, OpenStack, or bare metal, :ref:`DNS records <dns_records>` must be created.
11+
The cluster runs multiple routers infront of the Deis controller and apps
12+
you deploy, so a :ref:`load balancer <configure-load-balancers>` is recommended.
1313

1414
Vagrant
1515
-------

0 commit comments

Comments
 (0)