From 21f3cf2636c5924f8022cc2ea2da05a3825006ec Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Mon, 10 Jul 2023 15:35:11 +0100 Subject: [PATCH] Rename delegated driver to default (#3960) Fixes: #3931 --- pyproject.toml | 2 +- src/molecule/config.py | 4 +- src/molecule/data/driver.json | 2 +- src/molecule/data/molecule.json | 1 + src/molecule/driver/base.py | 4 +- src/molecule/driver/delegated.py | 14 +++--- src/molecule/test/a_unit/command/conftest.py | 4 +- .../test/a_unit/command/init/test_scenario.py | 2 +- .../test/a_unit/command/test_create.py | 2 +- src/molecule/test/a_unit/command/test_list.py | 4 +- src/molecule/test/a_unit/conftest.py | 2 +- .../test/a_unit/cookiecutter/test_molecule.py | 2 +- .../test/a_unit/driver/test_delegated.py | 10 ++-- .../a_unit/model/v2/test_driver_section.py | 4 +- .../provisioner/test_ansible_playbooks.py | 6 +-- src/molecule/test/a_unit/test_api.py | 6 +-- src/molecule/test/a_unit/test_config.py | 6 +-- .../test/a_unit/test_interpolation.py | 4 +- src/molecule/test/b_functional/conftest.py | 4 +- .../test/b_functional/test_command.py | 48 ++++++++----------- src/molecule/test/resources/molecule.yml | 2 +- .../molecule/default/molecule.yml | 2 +- .../invalid/molecule_delegated.yml | 2 +- .../schema_instance_files/valid/molecule.yml | 2 +- .../cleanup/molecule/default/molecule.yml | 2 +- .../molecule/ansible-galaxy/molecule.yml | 2 +- .../dependency/molecule/shell/molecule.yml | 2 +- .../delegated/molecule/default/molecule.yml | 2 +- .../molecule/default/molecule.yml | 2 +- .../molecule/default/molecule.yml | 2 +- .../molecule/links/molecule.yml | 2 +- .../idempotence/molecule/raises/molecule.yml | 2 +- .../molecule/default/molecule.yml | 2 +- .../side_effect/molecule/default/molecule.yml | 2 +- .../molecule/default/molecule.yml | 2 +- .../testinfra-pre-commit/molecule.yml | 2 +- .../verifier/molecule/testinfra/molecule.yml | 2 +- 37 files changed, 78 insertions(+), 87 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2bc2bb7bd..7f62b2035 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ changelog = "https://github.com/ansible-community/molecule/releases" molecule = "molecule.__main__:main" [project.entry-points."molecule.driver.next"] -delegated = "molecule.driver.delegated:Delegated" +default = "molecule.driver.delegated:Delegated" [project.entry-points."molecule.verifier.next"] testinfra = "molecule.verifier.testinfra:Testinfra" diff --git a/src/molecule/config.py b/src/molecule/config.py index e0aca4ba4..2453bd695 100644 --- a/src/molecule/config.py +++ b/src/molecule/config.py @@ -43,7 +43,7 @@ MOLECULE_DIRECTORY = "molecule" MOLECULE_FILE = "molecule.yml" MOLECULE_KEEP_STRING = "MOLECULE_" -DEFAULT_DRIVER = "delegated" +DEFAULT_DRIVER = "default" MOLECULE_EMBEDDED_DATA_DIR = os.path.dirname(data_module) @@ -383,7 +383,7 @@ def _get_defaults(self) -> MutableMapping: "env": {}, }, "driver": { - "name": "delegated", + "name": "default", "provider": {"name": None}, "options": {"managed": True}, "ssh_connection_options": [], diff --git a/src/molecule/data/driver.json b/src/molecule/data/driver.json index 3e2b32015..b06e9a2fc 100644 --- a/src/molecule/data/driver.json +++ b/src/molecule/data/driver.json @@ -3,7 +3,7 @@ "MoleculeDriverModel": { "properties": { "name": { - "enum": ["delegated"], + "enum": ["delegated", "default"], "title": "Name", "type": "string" }, diff --git a/src/molecule/data/molecule.json b/src/molecule/data/molecule.json index 9c5896d9f..fd8ac966d 100644 --- a/src/molecule/data/molecule.json +++ b/src/molecule/data/molecule.json @@ -77,6 +77,7 @@ "azure", "ec2", "delegated", + "default", "docker", "containers", "openstack", diff --git a/src/molecule/driver/base.py b/src/molecule/driver/base.py index 2e5307a6b..c81cf1ea5 100644 --- a/src/molecule/driver/base.py +++ b/src/molecule/driver/base.py @@ -147,11 +147,11 @@ def safe_files(self): @property def delegated(self): - """Is the driver delegated and returns a bool. + """Is the dedriver delegated and returns a bool. :returns: bool """ - return self.name == "delegated" + return self.name == "default" @property def managed(self): diff --git a/src/molecule/driver/delegated.py b/src/molecule/driver/delegated.py index 7b5eaa7c9..8fa47ff58 100644 --- a/src/molecule/driver/delegated.py +++ b/src/molecule/driver/delegated.py @@ -30,7 +30,7 @@ class Delegated(Driver): - r"""The class responsible for managing delegated instances. + r"""The class responsible for managing default instances. Delegated is `not` the default driver used in Molecule. @@ -40,7 +40,7 @@ class Delegated(Driver): ``` yaml driver: - name: delegated + name: de ``` However, the developer must adhere to the instance-config API. The @@ -81,7 +81,7 @@ class Delegated(Driver): ``` yaml driver: - name: delegated + name: default options: managed: False login_cmd_template: 'docker exec -ti {instance} bash' @@ -107,7 +107,7 @@ class Delegated(Driver): ``` yaml driver: - name: delegated + name: default options: managed: False login_cmd_template: 'ssh {instance} -F /tmp/ssh-config' @@ -122,7 +122,7 @@ class Delegated(Driver): ``` yaml driver: - name: delegated + name: default safe_files: - foo ``` @@ -130,7 +130,7 @@ class Delegated(Driver): ``` yaml driver: - name: delegated + name: default options: managed: False ansible_connection_options: @@ -141,7 +141,7 @@ class Delegated(Driver): def __init__(self, config=None) -> None: """Construct Delegated.""" super().__init__(config) - self._name = "delegated" + self._name = "default" @property def name(self): diff --git a/src/molecule/test/a_unit/command/conftest.py b/src/molecule/test/a_unit/command/conftest.py index dc89aede2..cd213a4e2 100644 --- a/src/molecule/test/a_unit/command/conftest.py +++ b/src/molecule/test/a_unit/command/conftest.py @@ -29,7 +29,7 @@ def command_patched_ansible_create(mocker): def command_driver_delegated_section_data(): x = { "driver": { - "name": "delegated", + "name": "default", "options": { "managed": False, }, @@ -42,4 +42,4 @@ def command_driver_delegated_section_data(): @pytest.fixture() def command_driver_delegated_managed_section_data(): - return {"driver": {"name": "delegated", "managed": True}} + return {"driver": {"name": "default", "managed": True}} diff --git a/src/molecule/test/a_unit/command/init/test_scenario.py b/src/molecule/test/a_unit/command/init/test_scenario.py index 086d65902..ef7eafa8c 100644 --- a/src/molecule/test/a_unit/command/init/test_scenario.py +++ b/src/molecule/test/a_unit/command/init/test_scenario.py @@ -28,7 +28,7 @@ @pytest.fixture() def _command_args(): return { - "driver_name": "delegated", + "driver_name": "default", "role_name": "test-role", "scenario_name": "test-scenario", "subcommand": __name__, diff --git a/src/molecule/test/a_unit/command/test_create.py b/src/molecule/test/a_unit/command/test_create.py index 40932fd3c..c3ab5eb6a 100644 --- a/src/molecule/test/a_unit/command/test_create.py +++ b/src/molecule/test/a_unit/command/test_create.py @@ -48,7 +48,7 @@ def test_execute( assert "default" in caplog.text assert "converge" in caplog.text - assert config_instance.state.driver == "delegated" + assert config_instance.state.driver == "default" command_patched_ansible_create.assert_called_once_with() diff --git a/src/molecule/test/a_unit/command/test_list.py b/src/molecule/test/a_unit/command/test_list.py index 7aaca8e1a..cf414da4c 100644 --- a/src/molecule/test/a_unit/command/test_list.py +++ b/src/molecule/test/a_unit/command/test_list.py @@ -28,7 +28,7 @@ def test_execute(capsys, config_instance: config.Config): x = [ base.Status( instance_name="instance-1", - driver_name="delegated", + driver_name="default", provisioner_name="ansible", scenario_name="default", created="false", @@ -36,7 +36,7 @@ def test_execute(capsys, config_instance: config.Config): ), base.Status( instance_name="instance-2", - driver_name="delegated", + driver_name="default", provisioner_name="ansible", scenario_name="default", created="false", diff --git a/src/molecule/test/a_unit/conftest.py b/src/molecule/test/a_unit/conftest.py index 0e123707e..e032cef85 100644 --- a/src/molecule/test/a_unit/conftest.py +++ b/src/molecule/test/a_unit/conftest.py @@ -58,7 +58,7 @@ def _molecule_dependency_galaxy_section_data(): @pytest.fixture() def _molecule_driver_section_data(): - return {"driver": {"name": "delegated", "options": {"managed": True}}} + return {"driver": {"name": "default", "options": {"managed": True}}} @pytest.fixture() diff --git a/src/molecule/test/a_unit/cookiecutter/test_molecule.py b/src/molecule/test/a_unit/cookiecutter/test_molecule.py index fc9cae67b..ee217a770 100644 --- a/src/molecule/test/a_unit/cookiecutter/test_molecule.py +++ b/src/molecule/test/a_unit/cookiecutter/test_molecule.py @@ -48,7 +48,7 @@ def _role_directory(): def _command_args(): return { "dependency_name": "galaxy", - "driver_name": "delegated", + "driver_name": "default", "provisioner_name": "ansible", "scenario_name": "default", "role_name": "test-role", diff --git a/src/molecule/test/a_unit/driver/test_delegated.py b/src/molecule/test/a_unit/driver/test_delegated.py index 8907c7ea9..3e1b32cc7 100644 --- a/src/molecule/test/a_unit/driver/test_delegated.py +++ b/src/molecule/test/a_unit/driver/test_delegated.py @@ -32,7 +32,7 @@ def _driver_managed_section_data(): return { "driver": { - "name": "delegated", + "name": "default", "options": { "managed": True, }, @@ -44,7 +44,7 @@ def _driver_managed_section_data(): def _driver_unmanaged_section_data(): return { "driver": { - "name": "delegated", + "name": "default", "options": { "managed": False, }, @@ -69,7 +69,7 @@ def test_testinfra_options_property(_instance): def test_name_property(_instance): - assert _instance.name == "delegated" + assert _instance.name == "default" @pytest.mark.parametrize( @@ -317,14 +317,14 @@ def test_status(mocker: MockerFixture, _instance): assert len(result) == 2 assert result[0].instance_name == "instance-1" - assert result[0].driver_name == "delegated" + assert result[0].driver_name == "default" assert result[0].provisioner_name == "ansible" assert result[0].scenario_name == "default" assert result[0].created == "false" assert result[0].converged == "false" assert result[1].instance_name == "instance-2" - assert result[1].driver_name == "delegated" + assert result[1].driver_name == "default" assert result[1].provisioner_name == "ansible" assert result[1].scenario_name == "default" assert result[1].created == "false" diff --git a/src/molecule/test/a_unit/model/v2/test_driver_section.py b/src/molecule/test/a_unit/model/v2/test_driver_section.py index dccdadc12..1e93ec741 100644 --- a/src/molecule/test/a_unit/model/v2/test_driver_section.py +++ b/src/molecule/test/a_unit/model/v2/test_driver_section.py @@ -27,7 +27,7 @@ def _model_driver_section_data(): return { "driver": { - "name": "delegated", + "name": "default", "provider": {"name": None}, "options": {"managed": True}, "ssh_connection_options": ["foo", "bar"], @@ -95,7 +95,7 @@ def test_driver_provider_name_nullable(_config): @pytest.fixture() def _model_driver_allows_delegated_section_data(): - return {"driver": {"name": "delegated"}} + return {"driver": {"name": "default"}} @pytest.fixture() diff --git a/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py b/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py index 5f1210ba1..81f981881 100644 --- a/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py +++ b/src/molecule/test/a_unit/provisioner/test_ansible_playbooks.py @@ -43,7 +43,7 @@ def test_cleanup_property_is_optional(_instance): @pytest.mark.skip(reason="create not running for delegated") def test_create_property(_instance): - x = os.path.join(_instance._get_playbook_directory(), "delegated", "create.yml") + x = os.path.join(_instance._get_playbook_directory(), "default", "create.yml") assert x == _instance._config.provisioner.playbooks.create @@ -56,7 +56,7 @@ def test_converge_property(_instance): @pytest.mark.skip(reason="destroy not running for delegated") def test_destroy_property(_instance): - x = os.path.join(_instance._get_playbook_directory(), "delegated", "destroy.yml") + x = os.path.join(_instance._get_playbook_directory(), "default", "destroy.yml") assert x == _instance._config.provisioner.playbooks.destroy @@ -93,7 +93,7 @@ def test_get_playbook_returns_bundled_driver_playbook_when_local_not_found( tmpdir, _instance, ): - x = os.path.join(_instance._get_playbook_directory(), "delegated", "create.yml") + x = os.path.join(_instance._get_playbook_directory(), "default", "create.yml") assert x == _instance._get_playbook("create") diff --git a/src/molecule/test/a_unit/test_api.py b/src/molecule/test/a_unit/test_api.py index 023d5a7cb..bcf2d4d26 100644 --- a/src/molecule/test/a_unit/test_api.py +++ b/src/molecule/test/a_unit/test_api.py @@ -24,8 +24,8 @@ def test_api_molecule_drivers_as_attributes(): results = api.drivers() - assert hasattr(results, "delegated") - assert isinstance(results.delegated, api.Driver) + assert hasattr(results, "default") + assert isinstance(results.default, api.Driver) def test_api_drivers(): @@ -34,7 +34,7 @@ def test_api_drivers(): for result in results: assert isinstance(result, api.Driver) - assert "delegated" in results + assert "default" in results def test_api_verifiers(): diff --git a/src/molecule/test/a_unit/test_config.py b/src/molecule/test/a_unit/test_config.py index 438f52918..8937e9e38 100644 --- a/src/molecule/test/a_unit/test_config.py +++ b/src/molecule/test/a_unit/test_config.py @@ -107,7 +107,7 @@ def test_dependency_property_is_shell(config_instance: config.Config): @pytest.fixture() def _config_driver_delegated_section_data(): - return {"driver": {"name": "delegated", "options": {"managed": False}}} + return {"driver": {"name": "default", "options": {"managed": False}}} def test_env(config_instance: config.Config): @@ -124,7 +124,7 @@ def test_env(config_instance: config.Config): "MOLECULE_PROJECT_DIRECTORY": config_instance.project_directory, "MOLECULE_INSTANCE_CONFIG": config_instance.driver.instance_config, "MOLECULE_DEPENDENCY_NAME": "galaxy", - "MOLECULE_DRIVER_NAME": "delegated", + "MOLECULE_DRIVER_NAME": "default", "MOLECULE_PROVISIONER_NAME": "ansible", "MOLECULE_SCENARIO_NAME": "default", "MOLECULE_STATE_FILE": config_instance.state.state_file, @@ -172,7 +172,7 @@ def test_get_driver_name_from_cli(config_instance: config.Config): def test_get_driver_name(config_instance: config.Config): - assert config_instance._get_driver_name() == "delegated" + assert config_instance._get_driver_name() == "default" def test_get_driver_name_raises_when_different_driver_used( diff --git a/src/molecule/test/a_unit/test_interpolation.py b/src/molecule/test/a_unit/test_interpolation.py index c4afa23c8..b49e35632 100644 --- a/src/molecule/test/a_unit/test_interpolation.py +++ b/src/molecule/test/a_unit/test_interpolation.py @@ -100,7 +100,7 @@ def test_interpolate_with_molecule_yaml(_instance): dependency: name: $DEPENDENCY_NAME driver: - name: delegated + name: default platforms: - name: instance-1 provisioner: @@ -116,7 +116,7 @@ def test_interpolate_with_molecule_yaml(_instance): dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance-1 provisioner: diff --git a/src/molecule/test/b_functional/conftest.py b/src/molecule/test/b_functional/conftest.py index 664463be0..9fea90d49 100644 --- a/src/molecule/test/b_functional/conftest.py +++ b/src/molecule/test/b_functional/conftest.py @@ -84,7 +84,7 @@ def with_scenario(request, scenario_to_test, driver_name, scenario_name, skip_te def skip_test(request, driver_name): msg_tmpl = "Skipped '{}' not supported" support_checks_map = { - "delegated": lambda: True, + "default": lambda: True, } try: check_func = support_checks_map[driver_name] @@ -189,7 +189,7 @@ def login(login_args, scenario_name="default"): def run_test(driver_name, scenario_name="default", parallel=False): cmd = ["molecule", "test", "--scenario-name", scenario_name] - if driver_name != "delegated": + if driver_name != "default": if scenario_name is None: cmd.append("--all") if parallel: diff --git a/src/molecule/test/b_functional/test_command.py b/src/molecule/test/b_functional/test_command.py index 0772adef9..3fa673da6 100644 --- a/src/molecule/test/b_functional/test_command.py +++ b/src/molecule/test/b_functional/test_command.py @@ -68,7 +68,7 @@ def platform_name(request): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -81,7 +81,7 @@ def test_command_check(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -95,7 +95,7 @@ def test_command_cleanup(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -109,7 +109,7 @@ def test_command_converge(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -124,13 +124,13 @@ def test_command_create(scenario_to_test, with_scenario, scenario_name, tmp_path [ pytest.param( "dependency", - "delegated", + "default", "shell", id="shell", ), pytest.param( "dependency", - "delegated", + "default", "ansible-galaxy", id="galaxy", ), @@ -151,7 +151,7 @@ def test_command_dependency(request, scenario_to_test, with_scenario, scenario_n @pytest.mark.extensive() @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), - [("driver/delegated", "delegated", "default")], + [("driver/delegated", "default", "default")], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) def test_command_destroy(scenario_to_test, with_scenario, scenario_name): @@ -164,7 +164,7 @@ def test_command_destroy(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -174,7 +174,7 @@ def test_command_idempotence(scenario_to_test, with_scenario, scenario_name): @pytest.mark.serial() def test_command_init_scenario(temp_dir): - init_scenario(temp_dir, "delegated") + init_scenario(temp_dir, "default") @pytest.mark.serial() @@ -183,8 +183,8 @@ def test_command_init_scenario(temp_dir): [ ( "driver/delegated", - "delegated", - "instance delegated ansible default", + "default", + "instance default ansible default", ), ], indirect=["scenario_to_test", "driver_name"], @@ -193,22 +193,12 @@ def test_command_list_with_format_plain(scenario_to_test, with_scenario, expecte list_with_format_plain(expected) -# @pytest.mark.parametrize( -# "scenario_to_test, driver_name, login_args, scenario_name", -# "driver/delegated", -# "delegated", -# "default", -# ), -# ], -# def test_command_login(scenario_to_test, with_scenario, login_args, scenario_name): - - @pytest.mark.serial() @pytest.mark.extensive() @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -225,7 +215,7 @@ def test_command_prepare(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -239,7 +229,7 @@ def test_command_side_effect(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -252,7 +242,7 @@ def test_command_syntax(scenario_to_test, with_scenario, scenario_name): @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) @@ -276,7 +266,7 @@ def run_test_with_platform_name( "--platform-name", platform_name, ] - if driver_name != "delegated": + if driver_name != "default": if scenario_name is None: cmd.append("--all") if parallel: @@ -289,7 +279,7 @@ def run_test_with_platform_name( @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name", "platform_name"), [ - ("driver/delegated", "delegated", "default", "instance"), + ("driver/delegated", "default", "default", "instance"), ], indirect=["scenario_to_test", "driver_name", "scenario_name", "platform_name"], ) @@ -309,7 +299,7 @@ def test_command_test_with_platform_name( [ ( "driver/delegated_invalid_role_name_with_role_name_check_equals_to_1", - "delegated", + "default", "default", ), ], @@ -329,7 +319,7 @@ def test_command_test_with_role_name_check_equals_to_1( @pytest.mark.parametrize( ("scenario_to_test", "driver_name", "scenario_name"), [ - ("driver/delegated", "delegated", "default"), + ("driver/delegated", "default", "default"), ], indirect=["scenario_to_test", "driver_name", "scenario_name"], ) diff --git a/src/molecule/test/resources/molecule.yml b/src/molecule/test/resources/molecule.yml index 74fd04b3d..6ac6979d8 100644 --- a/src/molecule/test/resources/molecule.yml +++ b/src/molecule/test/resources/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: [] provisioner: name: ansible diff --git a/src/molecule/test/resources/sample-collection/molecule/default/molecule.yml b/src/molecule/test/resources/sample-collection/molecule/default/molecule.yml index 74c855720..1cec4936a 100644 --- a/src/molecule/test/resources/sample-collection/molecule/default/molecule.yml +++ b/src/molecule/test/resources/sample-collection/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance provisioner: diff --git a/src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml b/src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml index 680058433..fdc964e5c 100644 --- a/src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml +++ b/src/molecule/test/resources/schema_instance_files/invalid/molecule_delegated.yml @@ -1,5 +1,5 @@ driver: - name: delegated + name: default platforms: - name: foo children: 2 # invalid, must be list of strings diff --git a/src/molecule/test/resources/schema_instance_files/valid/molecule.yml b/src/molecule/test/resources/schema_instance_files/valid/molecule.yml index c279ed8bf..3bda50eb1 100644 --- a/src/molecule/test/resources/schema_instance_files/valid/molecule.yml +++ b/src/molecule/test/resources/schema_instance_files/valid/molecule.yml @@ -10,7 +10,7 @@ dependency: FOO: bar driver: - name: delegated + name: default options: managed: false login_cmd_template: ... diff --git a/src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml b/src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml index f97aa6fb5..2097a9892 100644 --- a/src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/cleanup/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml b/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml index bbd515af5..a7d71ab8a 100644 --- a/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml +++ b/src/molecule/test/scenarios/dependency/molecule/ansible-galaxy/molecule.yml @@ -5,7 +5,7 @@ dependency: role-file: molecule/ansible-galaxy/requirements.yml requirements-file: molecule/ansible-galaxy/requirements.yml driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml b/src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml index 0c6f1c465..2e6ed269f 100644 --- a/src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml +++ b/src/molecule/test/scenarios/dependency/molecule/shell/molecule.yml @@ -7,7 +7,7 @@ dependency: ansible-galaxy role install -p '${MOLECULE_EPHEMERAL_DIRECTORY}/roles' ssbarnea.ansible_role_helloworld " driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml b/src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml index d88b332f6..1fb1f7040 100644 --- a/src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/driver/delegated/molecule/default/molecule.yml @@ -1,6 +1,6 @@ --- driver: - name: delegated + name: default platforms: - name: instance provisioner: diff --git a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml b/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml index e52066bef..0621031dc 100644 --- a/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/driver/delegated_invalid_role_name_with_role_name_check_equals_to_1/molecule/default/molecule.yml @@ -1,7 +1,7 @@ --- role_name_check: 1 driver: - name: delegated + name: default platforms: - name: instance provisioner: diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml b/src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml index 6edc13e88..3c05b1ebc 100644 --- a/src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/host_group_vars/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml b/src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml index 126680c3e..52356d03f 100644 --- a/src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml +++ b/src/molecule/test/scenarios/host_group_vars/molecule/links/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml b/src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml index 5eafe9bfd..34d5455c0 100644 --- a/src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml +++ b/src/molecule/test/scenarios/idempotence/molecule/raises/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml b/src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml index 59fefd18d..56ccfeb11 100644 --- a/src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/overrride_driver/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml b/src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml index be2a653ea..e4e57d5c9 100644 --- a/src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/side_effect/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml b/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml index 59fefd18d..56ccfeb11 100644 --- a/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml +++ b/src/molecule/test/scenarios/test_destroy_strategy/molecule/default/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml b/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml index 0c23618d7..016c3b00c 100644 --- a/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml +++ b/src/molecule/test/scenarios/verifier/molecule/testinfra-pre-commit/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE} diff --git a/src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml b/src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml index 0244dc12f..441463854 100644 --- a/src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml +++ b/src/molecule/test/scenarios/verifier/molecule/testinfra/molecule.yml @@ -2,7 +2,7 @@ dependency: name: galaxy driver: - name: delegated + name: default platforms: - name: instance image: ${TEST_BASE_IMAGE}