diff options
| -rw-r--r-- | deploy/cloud/deployment.py | 12 | ||||
| -rw-r--r-- | docs/build-instruction.rst | 15 | ||||
| -rw-r--r-- | docs/installation-instruction.rst | 4 |
3 files changed, 22 insertions, 9 deletions
diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py index 306abf006..0127d2a52 100644 --- a/deploy/cloud/deployment.py +++ b/deploy/cloud/deployment.py @@ -101,8 +101,8 @@ class Deployment(object): LOG_FILE = 'cloud.log' log('Starting deployment of environment %s' % self.env_id) - run_proc('fuel --env %s deploy-changes | strings | tee %s' - % (self.env_id, LOG_FILE)) + p = run_proc('fuel --env %s deploy-changes | strings > %s' + % (self.env_id, LOG_FILE)) ready = False for i in range(int(self.deploy_timeout)): @@ -119,7 +119,13 @@ class Deployment(object): break else: time.sleep(SLEEP_TIME) - delete(LOG_FILE) + + p.poll() + if p.returncode == None: + log('The process deploying the changes has not yet finished.') + log('''The file %s won't be deleted''' % LOG_FILE) + else: + delete(LOG_FILE) if ready: log('Environment %s successfully deployed' % self.env_id) diff --git a/docs/build-instruction.rst b/docs/build-instruction.rst index 2d66b7c00..380d28241 100644 --- a/docs/build-instruction.rst +++ b/docs/build-instruction.rst @@ -102,20 +102,27 @@ Clone the OPNFV code Git repository with your SSH key ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Now it is time to clone the code repository: -$ git clone ssh://<Linux foundation user>@gerrit.opnfv.org:29418/fuel +.. code-block:: bash + + $ git clone ssh://<Linux foundation user>@gerrit.opnfv.org:29418/fuel Now you should have the OPNFV fuel repository with the Fuel directories stored locally on your build host. Check out the Brahmaputra release: -$ cd fuel -$ git checkout brahmaputra.1.0 + +.. code-block:: bash + + $ cd fuel + $ git checkout brahmaputra.1.0 Clone the OPNFV code Git repository without a SSH key ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can also opt to clone the code repository without a SSH key: -$ git clone https://gerrit.opnfv.org:29418/gerrit/fuel +.. code-block:: bash + + $ git clone https://gerrit.opnfv.org/gerrit/fuel Make sure to checkout the release tag as described above. diff --git a/docs/installation-instruction.rst b/docs/installation-instruction.rst index 787287a9b..92fb84330 100644 --- a/docs/installation-instruction.rst +++ b/docs/installation-instruction.rst @@ -51,7 +51,7 @@ Building the ISO image Alternatively, you may build the Fuel .iso from source by cloning the opnfv/fuel git repository. To retrieve the repository for the Brahmaputra release use the following command: -$git clone https://<linux foundation uid>@gerrit.opnf.org/gerrit/fuel +$ git clone https://gerrit.opnfv.org/gerrit/fuel Check-out the Brahmaputra release tag to set the branch to the baseline required to replicate the Brahmaputra release: @@ -335,7 +335,7 @@ Create an OpenStack Environment #. Select "additional services" you wish to install. - - Check option "Install Celiometer (OpenStack Telemetry)" and press <Next> + - Check option "Install Ceilometer (OpenStack Telemetry)" and press <Next> #. Create the new environment. |