aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-13 20:13:43 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-15 16:49:50 +0000
commitdf026e24432c29a1a1520c1995c6260d96320b5c (patch)
treefd8ceef629eb881ee6384d2742bebeeb4dd4071f
parent12c1749e6bd339dc23f155d6990e30f54245c88d (diff)
[baremetal] SaltStack Deployment Documentation
Generate documentation automatically using `reclass-doc`. nginx is already configured to serve said documentation on proxy's public VIP on port 8090. Change-Id: If2aef646a0ec44d5cc7e9d425e565e5c0aa581b3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit f3a355d5644a7271d9df0a48febc3a93cceddb8e)
-rw-r--r--docs/release/installation/installation.instruction.rst6
-rwxr-xr-xmcp/config/states/openstack_ha2
2 files changed, 7 insertions, 1 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index e2d2be657..03f82dc28 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -375,6 +375,9 @@ Examples
Fuel@OPNFV LF POD2 Network Layout
+ Once the deployment is complete, the SaltStack Deployment Documentation is
+ available at http://<Proxy VIP>:8090, e.g. http://172.30.10.103:8090.
+
An aarch64 deploy on pod5 from Arm lab
.. code-block:: bash
@@ -391,6 +394,9 @@ Examples
Fuel@OPNFV ARM POD5 Network Layout
+ Once the deployment is complete, the SaltStack Deployment Documentation is
+ available at http://<Proxy VIP>:8090, e.g. http://10.0.8.103:8090.
+
Pod Descriptor Files
====================
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index c3a51a85a..9eaa3a15b 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -64,7 +64,7 @@ salt -I 'ceilometer:agent' state.sls ceilometer
salt -I 'horizon:server' state.sls horizon
salt -I 'apache:server' state.sls apache
-salt -I 'nginx:server' state.sls nginx
+salt -I 'nginx:server' state.sls nginx,sphinx
clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \
pillar.get _param:cluster_vip_address | awk '{print $2; exit}')