Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typo on OVERRIDEN #2338

Merged
merged 1 commit into from
Sep 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Unreleased
==========

* MAJOR: Removed LXC and LXD providers
* MINOR: Fixed typo with OVERRIDDEN placeholder in templates
* Supported Ansible versions are now 2.9, 2.8, 2.7
* The Linode driver now uses the ``linode_v4`` module.
* Removed goss verifier
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Driver
Molecule uses `Ansible`_ to manage instances to operate on. Molecule supports
any provider `Ansible`_ supports. This work is offloaded to the `provisioner`.

The driver's name is specified in `molecule.yml`, and can be overriden on the
The driver's name is specified in `molecule.yml`, and can be overridden on the
command line. Molecule will remember the last successful driver used, and

continue to use the driver for all subsequent subcommands, or until the
Expand Down
14 changes: 7 additions & 7 deletions molecule/cookiecutter/molecule/cookiecutter.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"molecule_directory": "molecule",
"dependency_name": "OVERRIDEN",
"driver_name": "OVERRIDEN",
"lint_name": "OVERRIDEN",
"provisioner_name": "OVERRIDEN",
"dependency_name": "OVERRIDDEN",
"driver_name": "OVERRIDDEN",
"lint_name": "OVERRIDDEN",
"provisioner_name": "OVERRIDDEN",
"provisioner_lint_name": "ansible-lint",
"scenario_name": "OVERRIDEN",
"role_name": "OVERRIDEN",
"verifier_name": "OVERRIDEN",
"scenario_name": "OVERRIDDEN",
"role_name": "OVERRIDDEN",
"verifier_name": "OVERRIDDEN",
"verifier_lint_name": "flake8"
}
4 changes: 2 additions & 2 deletions molecule/cookiecutter/role/cookiecutter.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
4 changes: 2 additions & 2 deletions molecule/cookiecutter/scenario/driver/ec2/cookiecutter.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
4 changes: 2 additions & 2 deletions molecule/cookiecutter/scenario/driver/gce/cookiecutter.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"molecule_directory": "molecule",

"role_name": "OVERRIDEN",
"role_name": "OVERRIDDEN",
"scenario_name": "default"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"molecule_directory": "molecule",

"role_name": "OVERRIDEN",
"role_name": "OVERRIDDEN",
"scenario_name": "default",
"verifier_directory": "tests"
}
2 changes: 1 addition & 1 deletion molecule/provisioner/ansible.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class Ansible(base.Base):

The create/destroy playbooks for Docker and Vagrant are bundled with
Molecule. These playbooks have a clean API from `molecule.yml`, and
are the most commonly used. The bundled playbooks can still be overriden.
are the most commonly used. The bundled playbooks can still be overridden.

The playbook loading order is:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"molecule_directory": "molecule",
"role_name": "OVERRIDEN",
"scenario_name": "OVERRIDEN"
"role_name": "OVERRIDDEN",
"scenario_name": "OVERRIDDEN"
}
4 changes: 2 additions & 2 deletions molecule/test/unit/test_scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,13 @@ def test_ephemeral_directory():
assert os.access(scenario.ephemeral_directory('foo/bar'), os.W_OK)


def test_ephemeral_directory_overriden_via_env_var(monkeypatch):
def test_ephemeral_directory_OVERRIDDEN_via_env_var(monkeypatch):
monkeypatch.setenv('MOLECULE_EPHEMERAL_DIRECTORY', 'foo/bar')

assert os.access(scenario.ephemeral_directory('foo/bar'), os.W_OK)


def test_ephemeral_directory_overriden_via_env_var_uses_absolute_path(monkeypatch):
def test_ephemeral_directory_OVERRIDDEN_via_env_var_uses_absolute_path(monkeypatch):
monkeypatch.setenv('MOLECULE_EPHEMERAL_DIRECTORY', "foo/bar")

assert os.path.isabs(scenario.ephemeral_directory())
2 changes: 1 addition & 1 deletion molecule/test/unit/verifier/test_testinfra.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def _verifier_testinfra_directory_section_data():
@pytest.mark.parametrize(
'config_instance', ['_verifier_testinfra_directory_section_data'], indirect=True
)
def test_directory_property_overriden(_instance):
def test_directory_property_overridden(_instance):
assert '/tmp/foo/bar' == _instance.directory


Expand Down