x/cloudbase-init
Code Issues Proposed changes

Fixes bug in winrm cert auth plugin for user_data

Browse Source 
Adds a try / catch when retrieving the user_data to avoid
an exception.
This commit is contained in:
Alessandro Pilotti 2014-02-10 00:36:11 +02:00
parent 868c638a99
commit 55b6428072
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cloudbaseinit/plugins/windows/winrmcertificateauth.py
View File

@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from cloudbaseinit.metadata.services import base as metadata_services_base
from cloudbaseinit.openstack.common import log as logging from cloudbaseinit.openstack.common import log as logging
from cloudbaseinit.plugins import base from cloudbaseinit.plugins import base
from cloudbaseinit.plugins import constants from cloudbaseinit.plugins import constants
@ -46,9 +47,13 @@ class ConfigWinRMCertificateAuthPlugin(base.BasePlugin):
if not cert_data: if not cert_data:
# Look if the user_data contains a PEM certificate # Look if the user_data contains a PEM certificate
user_data = service.get_user_data('openstack') try:
if user_data.startswith(x509.PEM_HEADER): user_data = service.get_user_data('openstack')
cert_data = user_data if user_data.startswith(x509.PEM_HEADER):
cert_data = user_data
except metadata_services_base.NotExistingMetadataException:
LOG.debug("user_data metadata not present")
pass
return cert_data return cert_data