From 631b83a448b4bf2e54aeabb3298c81c5e943e6f9 Mon Sep 17 00:00:00 2001 From: Kevin Tsang Date: Wed, 27 Aug 2014 17:23:18 -0700 Subject: [PATCH] Updated documentation of "DummyProvider to "ExistingServers" ExistingServers replaced DummyProvider in code a while ago, but documentation was not updated to reflect the change until now. Change-Id: Ia2f81ca66c935d386eee191a50f0d792cba5384b --- ... => devstack-lxc-engine-in-existing-servers.json} | 4 ++-- ...t => devstack-lxc-engine-in-existing-servers.rst} | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) rename doc/samples/deployments/{devstack-lxc-engine-in-dummy.json => devstack-lxc-engine-in-existing-servers.json} (94%) rename doc/samples/deployments/{devstack-lxc-engine-in-dummy.rst => devstack-lxc-engine-in-existing-servers.rst} (95%) diff --git a/doc/samples/deployments/devstack-lxc-engine-in-dummy.json b/doc/samples/deployments/devstack-lxc-engine-in-existing-servers.json similarity index 94% rename from doc/samples/deployments/devstack-lxc-engine-in-dummy.json rename to doc/samples/deployments/devstack-lxc-engine-in-existing-servers.json index b6902c904e..e0eb892215 100644 --- a/doc/samples/deployments/devstack-lxc-engine-in-dummy.json +++ b/doc/samples/deployments/devstack-lxc-engine-in-existing-servers.json @@ -15,7 +15,7 @@ "container_name_prefix": "controller", "distribution": "ubuntu", "host_provider": { - "type": "DummyProvider", + "type": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] } } @@ -27,7 +27,7 @@ "container_name": "devstack-compute", "nodes_per_server": 64, "provider": { - "type": "DummyProvider", + "type": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] }, "engine": { diff --git a/doc/samples/deployments/devstack-lxc-engine-in-dummy.rst b/doc/samples/deployments/devstack-lxc-engine-in-existing-servers.rst similarity index 95% rename from doc/samples/deployments/devstack-lxc-engine-in-dummy.rst rename to doc/samples/deployments/devstack-lxc-engine-in-existing-servers.rst index 08687a4baa..7384204b3c 100644 --- a/doc/samples/deployments/devstack-lxc-engine-in-dummy.rst +++ b/doc/samples/deployments/devstack-lxc-engine-in-existing-servers.rst @@ -33,12 +33,12 @@ This node should be deployed in lxc container, so we use the LxcProvider:: "container_name_prefix": "controller", "distribution": "ubuntu", "host_provider": { - "name": "DummyProvider", + "name": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] } } -DummyProvider is used as sub-provider, because we already have a linux box (localhost). +ExistingServers is used as sub-provider, because we already have a linux box (localhost). Computes @@ -54,7 +54,7 @@ compute instance via the devstack engine, then makes N clones using lxc-clone. "container_name": "devstack-compute", "nodes_per_server": 64, "provider": { - "type": "DummyProvider", + "type": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] }, "engine": { @@ -69,7 +69,7 @@ compute instance via the devstack engine, then makes N clones using lxc-clone. } } -This is very similar to LxcProvider configuration: DummyProvider as sub-provider and DevstackEngine +This is very similar to LxcProvider configuration: ExistingServers as sub-provider and DevstackEngine as sub-engine. Please note controller's ip isn't known at the moment of configuratoin, so MultihostEngine will replace {contoller_ip} pattern with actual address after first node is deployed. @@ -111,7 +111,7 @@ Here is an example of a complete configuration file, assembled from the snippets "container_name_prefix": "controller", "distribution": "ubuntu", "host_provider": { - "type": "DummyProvider", + "type": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] } } @@ -123,7 +123,7 @@ Here is an example of a complete configuration file, assembled from the snippets "container_name": "devstack-compute", "nodes_per_server": 64, "provider": { - "type": "DummyProvider", + "type": "ExistingServers", "credentials": [{"user": "root", "host": "localhost"}] }, "engine": {