summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Pavlov <andrey.mp@gmail.com>2018-01-16 15:48:52 +0300
committerAndrey Pavlov <andrey.mp@gmail.com>2018-02-08 16:01:29 +0300
commitec59a03f95bba0b566ca131ae9409d5cfbd56c92 (patch)
tree6175dd9ea0a49dbb01e927546a5514c45f8c28f9
parentbe286470e50ab23b8d9d0860115c92cfd07ca710 (diff)
update documentation
remove link to metadata configuration from devstack section. metadata is configured by plugin's script for devstack and user doesn't require to configure it by himself. Add information how to configure metadata over SSL Change-Id: I9ecfc10fed15a73417e840ddecac8a8a56d18601 Closes-Bug: #1739479
Notes
Notes (review): Code-Review+2: Feodor Tersin <ftersin@hotmail.com> Workflow+1: Feodor Tersin <ftersin@hotmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 08 Feb 2018 19:36:36 +0000 Reviewed-on: https://review.openstack.org/534288 Project: openstack/ec2-api Branch: refs/heads/master
-rw-r--r--doc/source/install/install-devstack.rst5
-rw-r--r--doc/source/install/metadata-configuration.rst14
2 files changed, 14 insertions, 5 deletions
diff --git a/doc/source/install/install-devstack.rst b/doc/source/install/install-devstack.rst
index de422fa..b6724e0 100644
--- a/doc/source/install/install-devstack.rst
+++ b/doc/source/install/install-devstack.rst
@@ -8,8 +8,3 @@ In order to install ec2-api with devstack the following should be added to the l
8.. code-block:: ini 8.. code-block:: ini
9 9
10 enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api 10 enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api
11
12Configuring OpenStack for EC2 API metadata service
13---------------------------------------------------
14
15.. include:: metadata-configuration.rst
diff --git a/doc/source/install/metadata-configuration.rst b/doc/source/install/metadata-configuration.rst
index 2e0d826..8796d25 100644
--- a/doc/source/install/metadata-configuration.rst
+++ b/doc/source/install/metadata-configuration.rst
@@ -12,3 +12,17 @@ To configure OpenStack for EC2 API metadata service for Neutron add:
12to ``/etc/neutron/metadata_agent.ini`` 12to ``/etc/neutron/metadata_agent.ini``
13 13
14then restart neutron-metadata service. 14then restart neutron-metadata service.
15
16If you want to obtain metadata via SSL you need to configure neutron:
17
18.. code-block:: ini
19
20 [DEFAULT]
21 nova_metadata_protocol = https
22 # in case of self-signed certs you may need to specify CA
23 auth_ca_cert = /path/to/root/cert/if/self/signed
24 # or skip certs checking
25 nova_metadata_insecure = True
26
27And then you'll be able to get EC2-API/Nova metadata from neutron via SSL.
28Anyway metadata URL inside the server still be http://169.254.169.254 \ No newline at end of file