Skip to content

Commit

Permalink
Merge branch 'main' into docs/fix_podman_login_4057
Browse files Browse the repository at this point in the history
  • Loading branch information
ssbarnea authored Oct 16, 2023
2 parents 514ec2f + 85258d1 commit e77e9e8
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .config/requirements-docs.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mkdocs-ansible[lock]>=0.1.4
pipdeptree>=2.4.0
linkchecker
linkchecker==10.2.1
2 changes: 1 addition & 1 deletion docs/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ scenario's generated `molecule.yml` file.

## Docker With Non-Privileged User

The default Molecule Docker driver executes Ansible playbooks as the
The Molecule Docker driver executes Ansible playbooks as the
root user. If your workflow requires adding support for running as a
non-privileged user, then adapt `molecule.yml` and `Dockerfile.j2` as
follows.
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@ components that Molecule provides. These are:
uses [galaxy development guide]
by default to resolve your role dependencies.
- The [driver](configuration.md#driver) provider. Molecule uses
[Docker](https://docs.docker.com/) by default. Molecule uses the
driver to delegate the task of creating instances.
the [Delegated](configuration.md#delegated) driver by default.
Molecule uses the driver to delegate the task of creating instances.
- The [platforms](configuration.md#platforms) definitions. Molecule
relies on this to know which instances to create, name and to which
group each instance belongs. If you need to test your role against
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@
{{ instance_conf | to_json | from_json | to_yaml }}
dest: "{{ molecule_instance_config }}"
mode: 0600
mode: "0600"
2 changes: 1 addition & 1 deletion molecule/default/destroy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@
{{ instance_conf | to_json | from_json | to_yaml }}
dest: "{{ molecule_instance_config }}"
mode: 0600
mode: "0600"
when: server.changed | default(false) | bool # noqa no-handler
3 changes: 1 addition & 2 deletions src/molecule/data/templates/scenario/create.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
gather_facts: false
# no_log: "{{ molecule_no_log }}"
tasks:

# TODO: Developer must implement and populate 'server' variable

- name: Create instance config
Expand Down Expand Up @@ -34,5 +33,5 @@

{{ instance_conf | to_json | from_json | to_yaml }}
dest: "{{ molecule_instance_config }}"
mode: 0600
mode: "0600"
{%- endraw %}
2 changes: 1 addition & 1 deletion src/molecule/data/templates/scenario/destroy.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

{{ instance_conf | to_json | from_json | to_yaml }}
dest: "{{ molecule_instance_config }}"
mode: 0600
mode: "0600"
when: server.changed | default(false) | bool # noqa no-handler
{%- endraw %}
2 changes: 1 addition & 1 deletion src/molecule/driver/delegated.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
class Delegated(Driver):
r"""The class responsible for managing default instances.
Delegated is `not` the default driver used in Molecule.
Delegated is the default driver used in Molecule.
Under this driver, it is the developers responsibility to implement the
create and destroy playbooks. ``Managed`` is the default behaviour of all
Expand Down

0 comments on commit e77e9e8

Please sign in to comment.