x/solar
Code Issues Proposed changes

Handle puppet error during remove as WARNING in example-puppet.py

Browse Source
This commit is contained in:
Dmitry Shulyak 2015-07-23 10:31:33 +03:00
parent 9c2068e94f
commit c84ae56089
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example-puppet.py
View File

@ -7,6 +7,7 @@ from solar.core import resource
from solar.core import signals from solar.core import signals
from solar.core import validation from solar.core import validation
from solar.core.resource import virtual_resource as vr from solar.core.resource import virtual_resource as vr
from solar import errors
from solar.interfaces.db import get_db from solar.interfaces.db import get_db
@ -347,7 +348,10 @@ def undeploy():
resources = {r.name: r for r in resources} resources = {r.name: r for r in resources}
for name in to_remove: for name in to_remove:
actions.resource_action(resources[name], 'remove') try:
actions.resource_action(resources[name], 'remove')
except errors.SolarError as e:
print 'WARNING: %s' % str(e)
#actions.resource_action(resources['nova_keystone_service_endpoint'], 'remove' ) #actions.resource_action(resources['nova_keystone_service_endpoint'], 'remove' )
# actions.resource_action(resources['nova_network_puppet'], 'remove' ) # actions.resource_action(resources['nova_network_puppet'], 'remove' )