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

Moved ec2 driver to molecule-ec2 #2407

Merged
merged 1 commit into from
Oct 26, 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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ ENV PACKAGES="\
"
RUN apk add --update --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ ${PACKAGES}

ENV MOLECULE_EXTRAS="azure,docker,docs,ec2,openstack,vagrant,windows"
ENV MOLECULE_EXTRAS="azure,docker,docs,openstack,vagrant,windows"

# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917006
RUN pip3 install -U wheel
Expand Down Expand Up @@ -132,7 +132,7 @@ ENV GEM_PACKAGES="\
etc \
"

ENV MOLECULE_EXTRAS="azure,docker,docs,ec2,lxc,openstack,vagrant,windows"
ENV MOLECULE_EXTRAS="azure,docker,docs,lxc,openstack,vagrant,windows"

RUN \
apk add --update --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ ${BUILD_DEPS} ${PACKAGES} \
Expand Down
8 changes: 0 additions & 8 deletions docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,6 @@ Docker
.. autoclass:: molecule.driver.docker.Docker()
:undoc-members:

.. _ec2-driver:

EC2
^^^

.. autoclass:: molecule.driver.ec2.EC2()
:undoc-members:

Openstack
^^^^^^^^^

Expand Down
4 changes: 1 addition & 3 deletions docs/getting-started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,7 @@ keys represent the high level components that Molecule provides. These are:
dependencies.

* The :ref:`driver` provider. Molecule uses `Docker`_ by default. Molecule uses
the driver to delegate the task of creating instances. There are many
providers such as :ref:`ec2-driver`. Under the hood,
it's all Ansible modules.
the driver to delegate the task of creating instances.

* The :ref:`linters` provider. Molecule uses :std:doc:`Yamllint
<yamllint:index>` by default to ensure that best practices are encouraged
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ platforms:
{%- if cookiecutter.driver_name == 'docker' %}
- name: instance
image: docker.io/centos:7
{%- elif cookiecutter.driver_name == 'ec2' %}
- name: instance
image: ami-a5b196c0
instance_type: t2.micro
vpc_subnet_id: subnet-6456fd1f
{%- elif cookiecutter.driver_name == 'openstack' %}
- name: instance
image: Ubuntu-16.04
Expand Down
5 changes: 0 additions & 5 deletions molecule/cookiecutter/scenario/driver/ec2/cookiecutter.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading