50365affc1
userdatautils is expected to operate on bytes, but on Python 3, email.message.Message.get_payload returns a string, not a byte string as for Python 2. This patch also includes a change to parthandler.py, where we're using encoding.write_file instead of writing the file manually, since encoding.write_file knows how to normalize its arguments properly. Change-Id: Ic0b75a18d0a13bdf1dcb5b0b6430a5ac8f99ab74
60 lines
2.0 KiB
Python
60 lines
2.0 KiB
Python
# Copyright 2013 Mirantis Inc.
|
|
# Copyright 2014 Cloudbase Solutions Srl
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
|
|
from oslo_config import cfg
|
|
import six
|
|
|
|
from cloudbaseinit.plugins.common.userdataplugins import base
|
|
from cloudbaseinit.plugins.common import userdatautils
|
|
from cloudbaseinit.utils import encoding
|
|
|
|
|
|
opts = [
|
|
cfg.StrOpt('heat_config_dir', default='C:\\cfn', help='The directory '
|
|
'where the Heat configuration files must be saved'),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(opts)
|
|
|
|
|
|
class HeatPlugin(base.BaseUserDataPlugin):
|
|
_heat_user_data_filename = "cfn-userdata"
|
|
|
|
def __init__(self):
|
|
super(HeatPlugin, self).__init__("text/x-cfninitdata")
|
|
|
|
def _check_dir(self, file_name):
|
|
dir_name = os.path.dirname(file_name)
|
|
if not os.path.exists(dir_name):
|
|
os.makedirs(dir_name)
|
|
|
|
def process(self, part):
|
|
file_name = os.path.join(CONF.heat_config_dir, part.get_filename())
|
|
self._check_dir(file_name)
|
|
|
|
encoding.write_file(file_name, part.get_payload())
|
|
|
|
if part.get_filename() == self._heat_user_data_filename:
|
|
payload = part.get_payload()
|
|
# Normalize the payload to bytes, since `execute_user_data_script`
|
|
# operates on bytes and `get_payload` returns a string on
|
|
# Python 3.
|
|
if isinstance(payload, six.text_type):
|
|
payload = payload.encode()
|
|
return userdatautils.execute_user_data_script(payload)
|