ctl upgrade arp fix
Change-Id: I512bed9e3d5e7a560015530047292570a8ff82c7
diff --git a/openstack-control-upgrade.groovy b/openstack-control-upgrade.groovy
index 66cdebb..0bba70e 100644
--- a/openstack-control-upgrade.groovy
+++ b/openstack-control-upgrade.groovy
@@ -115,7 +115,11 @@
// salt -C 'I@backupninja:client' state.sls backupninja
salt.enforceState(saltMaster, 'I@backupninja:client', 'backupninja')
salt.runSaltProcessStep(saltMaster, 'I@backupninja:client', 'ssh.rm_known_host', ["root", "${backupninja_backup_host}"], null, true)
- salt.cmdRun(saltMaster, 'I@backupninja:client', "arp -d ${backupninja_backup_host}")
+ try {
+ salt.cmdRun(saltMaster, 'I@backupninja:client', "arp -d ${backupninja_backup_host}")
+ } catch (Exception e) {
+ common.warningMsg('arp entry does not exist you. We should continue to run.')
+ }
salt.runSaltProcessStep(saltMaster, 'I@backupninja:client', 'ssh.set_known_host', ["root", "${backupninja_backup_host}"], null, true)
salt.cmdRun(saltMaster, 'I@backupninja:client', 'backupninja -n --run /etc/backup.d/101.mysql')
salt.cmdRun(saltMaster, 'I@backupninja:client', 'backupninja -n --run /etc/backup.d/200.backup.rsync > /tmp/backupninjalog')