diff options
| -rw-r--r-- | devstack/lib/ironic | 2 | ||||
| -rw-r--r-- | ironic/conductor/task_manager.py | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index e2938ac10..3bf287411 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -2518,7 +2518,7 @@ function build_ipa_dib_ramdisk { if is_deploy_iso_required; then IRONIC_DIB_RAMDISK_OPTIONS+=" iso" fi - git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR + git_clone $IRONIC_PYTHON_AGENT_BUILDER_REPO $IRONIC_PYTHON_AGENT_BUILDER_DIR $IRONIC_PYTHON_AGENT_BUILDER_BRANCH ELEMENTS_PATH="$IRONIC_PYTHON_AGENT_BUILDER_DIR/dib" \ disk-image-create "$IRONIC_DIB_RAMDISK_OPTIONS" \ -o "$tempdir/ironic-agent" \ diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index 804d8e4a2..b99cd1084 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -486,12 +486,20 @@ class TaskManager(object): # publish the state transition by saving the Node self.node.save() - LOG.info('Node %(node)s moved to provision state "%(state)s" from ' - 'state "%(previous)s"; target provision state is ' - '"%(target)s"', - {'node': self.node.uuid, 'state': self.node.provision_state, - 'target': self.node.target_provision_state, - 'previous': self._prev_provision_state}) + + log_message = ('Node %(node)s moved to provision state "%(state)s" ' + 'from state "%(previous)s"; target provision state is ' + '"%(target)s"' % + {'node': self.node.uuid, + 'state': self.node.provision_state, + 'target': self.node.target_provision_state, + 'previous': self._prev_provision_state}) + + if (self.node.provision_state.endswith('failed') or + self.node.provision_state == 'error'): + LOG.error(log_message) + else: + LOG.info(log_message) if callback is None: self._notify_provision_state_change() |