openstack/ironic
Code Issues Proposed changes

Make ironic_log Ansible callback Python 3 ready

Browse Source 
Add Python version detection to decide which of configparser (3)
or ConfigParser (2) should be imported.

Change-Id: If80095ca553d98e5e7b7a3818324fd730e9ddc8e
Story: 2006418
Task: 36308
This commit is contained in:
Gaëtan Trellu 2019-08-19 13:31:00 -04:00
parent c9ae2ffcd3
commit 4af2e14e92
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/drivers/modules/ansible/playbooks/callback_plugins/ironic_log.py
View File

@ -11,13 +11,13 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import ConfigParser
import os import os
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from oslo_utils import strutils from oslo_utils import strutils
import pbr.version import pbr.version
from six.moves import configparser
CONF = cfg.CONF CONF = cfg.CONF
@ -28,7 +28,7 @@ VERSION = pbr.version.VersionInfo(DOMAIN).release_string()
# find and parse callback config file # find and parse callback config file
def parse_callback_config(): def parse_callback_config():
basename = os.path.splitext(__file__)[0] basename = os.path.splitext(__file__)[0]
config = ConfigParser.ConfigParser() config = configparser.ConfigParser()
callback_config = {'ironic_config': None, callback_config = {'ironic_config': None,
'ironic_log_file': None, 'ironic_log_file': None,
'use_journal': True, 'use_journal': True,