aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-16 16:46:15 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-16 16:46:15 +0000
commit302af377cbe7a68da3a0f52eb7ffea3f27dddb52 (patch)
treee71b46b15afea0886320906c21f8b5c410cb2df8
parent0e05daaf5e70f3980beda57bfadbff52adca16cb (diff)
parentdf026e24432c29a1a1520c1995c6260d96320b5c (diff)
Merge "[baremetal] SaltStack Deployment Documentation" into stable/euphrates
-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 652c85558..b27963055 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -380,6 +380,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
@@ -396,6 +399,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}')