diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-13 06:16:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-13 06:16:55 +0000 |
| commit | 6e6894fcbd647c7df3c6c12722dedf977d41b40a (patch) | |
| tree | 5e965aeaf9f6f1622089a1a9183f1d475004026d /ansible | |
| parent | bb3ed4ef5b295a45c402cdedf1dc18b24b3aa018 (diff) | |
| parent | 253692630f156e81a7ea33d1fa9fc3708939a9c0 (diff) | |
| download | kolla-6e6894fcbd647c7df3c6c12722dedf977d41b40a.tar.gz kolla-6e6894fcbd647c7df3c6c12722dedf977d41b40a.zip | |
Merge "Clean imports in code"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/action_plugins/merge_configs.py | 8 | ||||
| -rwxr-xr-x | ansible/action_plugins/merge_yaml.py | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py index 266bc353e..821b4877d 100644 --- a/ansible/action_plugins/merge_configs.py +++ b/ansible/action_plugins/merge_configs.py @@ -14,15 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ConfigParser import ConfigParser +import ConfigParser import inspect import os from six import StringIO -from ansible.plugins.action import ActionBase +from ansible.plugins import action -class ActionModule(ActionBase): +class ActionModule(action.ActionBase): TRANSFERS_FILES = True @@ -62,7 +62,7 @@ class ActionModule(ActionBase): temp_vars = task_vars.copy() temp_vars.update(extra_vars) - config = ConfigParser() + config = ConfigParser.ConfigParser() old_vars = self._templar._available_variables self._templar.set_available_variables(temp_vars) diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py index 8eed1559e..76410833b 100755 --- a/ansible/action_plugins/merge_yaml.py +++ b/ansible/action_plugins/merge_yaml.py @@ -28,10 +28,10 @@ except ImportError: from yaml import Loader # noqa: F401 -from ansible.plugins.action import ActionBase +from ansible.plugins import action -class ActionModule(ActionBase): +class ActionModule(action.ActionBase): TRANSFERS_FILES = True |
