Moved ec2 driver to molecule-ec2 (#2407)

The driver has its own repository now: https://github.com/pycontribs/molecule-ec2 Fixes: #2313 Signed-off-by: Sorin Sbarnea <[email protected]>
ansible · Oct 26, 2019 · beaba20 · beaba20
1 parent 16342db
commit beaba20
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 1,380 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -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
@@ -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} \

diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -75,14 +75,6 @@ Docker
 .. autoclass:: molecule.driver.docker.Docker()
    :undoc-members:
 
-.. _ec2-driver:
-
-EC2
-^^^
-
-.. autoclass:: molecule.driver.ec2.EC2()
-   :undoc-members:
-
 Openstack
 ^^^^^^^^^
 

diff --git a/docs/getting-started.rst b/docs/getting-started.rst
@@ -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

diff --git a/...le_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml b/...le_name}}/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/molecule.yml
@@ -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

diff --git a/molecule/cookiecutter/scenario/driver/ec2/cookiecutter.json b/molecule/cookiecutter/scenario/driver/ec2/cookiecutter.json
diff --git a/.../{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/INSTALL.rst b/.../{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/INSTALL.rst
diff --git a/.../driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml b/.../driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml
diff --git a/...driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/destroy.yml b/...driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/destroy.yml
diff --git a/...river/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/playbook.yml b/...river/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/playbook.yml
diff --git a/...driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml b/...driver/ec2/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/prepare.yml