diff options
| -rw-r--r-- | docs/release/installation/installation.instruction.rst | 6 | ||||
| -rw-r--r-- | docs/release/release-notes/release-notes.rst | 2 | ||||
| -rwxr-xr-x | mcp/config/states/neutron_compute | 2 | ||||
| -rwxr-xr-x | mcp/config/states/openstack_ha | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst index 5c5897253..9b2c2e8c2 100644 --- a/docs/release/installation/installation.instruction.rst +++ b/docs/release/installation/installation.instruction.rst @@ -249,7 +249,7 @@ These steps are common both for virtual and baremetal deploys. .. code-block:: bash - $ git checkout 5.0.0 + $ git checkout opnfv-5.0.2 #. Start the deploy script @@ -274,7 +274,7 @@ OpenStack. $ ci/deploy.sh -b file:///home/jenkins/tmpdir/securedlab \ -l ericsson \ -p virtual_kvm \ - -s os-nosdn-nofeature-noha \ + -s os-nosdn-nofeature-noha Once the deployment is complete, OpenStack Dashboard, Horizon is available at http://10.16.0.101:8078 The administrator credentials are **admin** / **opnfv_secret**. @@ -299,7 +299,7 @@ An aarch64 deploy on pod5 from Arm lab -l arm \ -p pod5 \ -s os-nosdn-nofeature-ha \ - -B pxebr \ + -B pxebr ============= diff --git a/docs/release/release-notes/release-notes.rst b/docs/release/release-notes/release-notes.rst index b20b4dfc8..6e1b53428 100644 --- a/docs/release/release-notes/release-notes.rst +++ b/docs/release/release-notes/release-notes.rst @@ -61,7 +61,7 @@ Release Data | **Project** | fuel/armband | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | opnfv-5.0.0 | +| **Repo/tag** | opnfv-5.0.2 | | | | +--------------------------------------+--------------------------------------+ | **Release designation** | Euphrates 5.0 | diff --git a/mcp/config/states/neutron_compute b/mcp/config/states/neutron_compute index 70a2db607..f1285479e 100755 --- a/mcp/config/states/neutron_compute +++ b/mcp/config/states/neutron_compute @@ -9,6 +9,6 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x -salt -I 'neutron:compute' state.sls neutron +salt -I 'neutron:compute' state.sls neutron || true salt -I 'neutron:compute' file.append /etc/sudoers.d/neutron_sudoers \ args='neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap-daemon /etc/neutron/rootwrap.conf' diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index aada4ad45..9237cc00b 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -53,12 +53,12 @@ salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova -salt -I 'mongodb:server' state.sls mongodb +salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin --eval "rs.initiate()"' salt -C 'I@mongodb:server and *01*' state.sls mongodb -salt -I 'aodh:server' state.sls aodh +salt -I 'aodh:server' state.sls aodh -b 1 salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer |