diff options
| author | Josh Kearney <josh.kearney@rackspace.com> | 2010-11-23 19:09:36 +0000 |
|---|---|---|
| committer | Tarmac <> | 2010-11-23 19:09:36 +0000 |
| commit | 9d6a1beecb3c4bdd87b68da92648a5e094d504d4 (patch) | |
| tree | 075448ca829666117e4e70a15aeb2ae1bff96c0c | |
| parent | a81547f780afec4eee88e87a301b32c903943c2c (diff) | |
| parent | 9c57e5ce37c1f2405fcf7a1ba322946e6d84efeb (diff) | |
| download | nova-9d6a1beecb3c4bdd87b68da92648a5e094d504d4.tar.gz nova-9d6a1beecb3c4bdd87b68da92648a5e094d504d4.tar.xz nova-9d6a1beecb3c4bdd87b68da92648a5e094d504d4.zip | |
Remove FAKE_subdomain from docs.
| -rwxr-xr-x | contrib/nova.sh | 1 | ||||
| -rw-r--r-- | contrib/puppet/templates/production/nova-common.conf.erb | 1 | ||||
| -rw-r--r-- | doc/source/adminguide/getting.started.rst | 1 | ||||
| -rw-r--r-- | doc/source/adminguide/multi.node.install.rst | 11 | ||||
| -rw-r--r-- | nova/api/__init__.py | 1 |
5 files changed, 2 insertions, 13 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh index 9bc36d6fb..f47d972ab 100755 --- a/contrib/nova.sh +++ b/contrib/nova.sh @@ -40,7 +40,6 @@ cat >/etc/nova/nova-manage.conf << NOVA_CONF_EOF --verbose --nodaemon --dhcpbridge_flagfile=/etc/nova/nova-manage.conf ---FAKE_subdomain=ec2 --cc_host=$HOST_IP --routing_source_ip=$HOST_IP --sql_connection=$SQL_CONN diff --git a/contrib/puppet/templates/production/nova-common.conf.erb b/contrib/puppet/templates/production/nova-common.conf.erb index 00c110781..23ee0c5e8 100644 --- a/contrib/puppet/templates/production/nova-common.conf.erb +++ b/contrib/puppet/templates/production/nova-common.conf.erb @@ -46,7 +46,6 @@ --quota_gigabytes=100 --use_nova_chains=True --input_chain=services ---FAKE_subdomain=ec2 --use_project_ca=True --fixed_ip_disassociate_timeout=300 --api_max_requests=1 diff --git a/doc/source/adminguide/getting.started.rst b/doc/source/adminguide/getting.started.rst index 7075a0b02..3e8073606 100644 --- a/doc/source/adminguide/getting.started.rst +++ b/doc/source/adminguide/getting.started.rst @@ -140,7 +140,6 @@ A sample configuration to test the system follows:: --verbose --nodaemon - --FAKE_subdomain=ec2 --auth_driver=nova.auth.dbdriver.DbDriver Running diff --git a/doc/source/adminguide/multi.node.install.rst b/doc/source/adminguide/multi.node.install.rst index fa0652bc8..dcceb539b 100644 --- a/doc/source/adminguide/multi.node.install.rst +++ b/doc/source/adminguide/multi.node.install.rst @@ -92,7 +92,6 @@ Note: CC_ADDR=<the external IP address of your cloud controller> :: - --FAKE_subdomain=ec2 # workaround for ec2/euca api --fixed_range=<network/prefix> # ip network to use for VM guests, ex 192.168.2.64/26 --network_size=<# of addrs> # number of ip addrs to use for VM guests, ex 64 @@ -104,19 +103,13 @@ Note: CC_ADDR=<the external IP address of your cloud controller> --fixed_range=<network/prefix> # ip network to use for VM guests, ex 192.168.2.64/26 --network_size=<# of addrs> # number of ip addrs to use for VM guests, ex 64 -4. nova-api specific flags - -:: - - --FAKE_subdomain=ec2 # workaround for ec2/euca api - -5. Create a nova group +4. Create a nova group :: sudo addgroup nova -6. nova-objectstore specific flags < no specific config needed > +5. nova-objectstore specific flags < no specific config needed > Config files should be have their owner set to root:nova, and mode set to 0640, since they contain your MySQL server's root password. diff --git a/nova/api/__init__.py b/nova/api/__init__.py index 7e75445a8..80f9f2109 100644 --- a/nova/api/__init__.py +++ b/nova/api/__init__.py @@ -22,7 +22,6 @@ Root WSGI middleware for all API controllers. :osapi_subdomain: subdomain running the OpenStack API (default: api) :ec2api_subdomain: subdomain running the EC2 API (default: ec2) -:FAKE_subdomain: set to 'api' or 'ec2', requests default to that endpoint """ |