Skip to content

Commit

Permalink
Removed migration and vagrant driver
Browse files Browse the repository at this point in the history
- Configuration migration from v1 to v2 is removed.
- Vagrant driver is removed, as this will be developed externally
  from https://github.com/pycontribs/molecule-vagrant

Fixes: 2315
Signed-off-by: Sorin Sbarnea <ssbarnea@redhat.com>
  • Loading branch information
ssbarnea committed Oct 27, 2019
1 parent 6938066 commit f34f578
Show file tree
Hide file tree
Showing 52 changed files with 11 additions and 2,814 deletions.
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,vagrant,windows"
ENV MOLECULE_EXTRAS="docker,docs,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,lxc,vagrant,windows"
ENV MOLECULE_EXTRAS="docker,docs,windows"

RUN \
apk add --update --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ ${BUILD_DEPS} ${PACKAGES} \
Expand Down
128 changes: 0 additions & 128 deletions contrib/convert.py

This file was deleted.

2 changes: 1 addition & 1 deletion docs/ci.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ A ``.travis.yml`` testing a role named foo1 with the Docker driver.
- sudo apt-get -qq update
install:
- pip install molecule
# - pip install required driver (e.g. docker, python-vagrant, shade, boto, apache-libcloud)
# - pip install required driver (e.g. docker, shade, boto, apache-libcloud)
script:
- molecule test
Expand Down
157 changes: 0 additions & 157 deletions docs/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -82,163 +82,6 @@ Podman
.. autoclass:: molecule.driver.podman.Podman()
:undoc-members:

Vagrant
^^^^^^^

.. autoclass:: molecule.driver.vagrant.Vagrant()
:undoc-members:

.. _molecule_vagrant_module:

Molecule Vagrant Module
^^^^^^^^^^^^^^^^^^^^^^^

Molecule manages Vagrant via an internal Ansible module. The following belongs
in the appropriate create or destroy playbooks, and uses the default provider.

Supported Providers:

* VirtualBox (default)
* VMware (vmware_fusion, vmware_workstation and vmware_desktop)
* Parallels
* Libvirt (requires vagrant-libvirt plugin)

Create instances.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Create instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
state: up
with_items:
- instance-1
- instance-2
Destroy instances.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Destroy instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
state: destroy
with_items:
- instance-1
- instance-2
Halt instances (shutdown without destroy).

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Halt instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
state: halt
with_items:
- instance-1
- instance-2
Create instances with interfaces.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Create instance with interfaces
molecule_vagrant:
instance_name: instance-1
instance_interfaces:
- auto_config: true
network_name: private_network
type: dhcp
- auto_config: false
network_name: private_network
type: dhcp
- auto_config: true
ip: 192.168.11.3
network_name: private_network
type: static
platform_box: ubuntu/trusty64
state: up
Create instances with additional provider options.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Create instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
provider_name: virtualbox
provider_memory: 1024
provider_cpus: 4
provider_raw_config_args:
- "customize ['modifyvm', :id, '--cpuexecutioncap', '50']"
provider_options:
gui: true
provision: true
state: up
with_items:
- instance-1
- instance-2
Create instances with additional instance options.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Create instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
instance_raw_config_args:
- "vm.network 'forwarded_port', guest: 80, host: 8080"
state: up
with_items:
- instance-1
- instance-2
Create instances on a remote Libvirt node using default create/destroy
templates.

.. code-block:: yaml
- hosts: localhost
connection: local
tasks:
- name: Create instances
molecule_vagrant:
instance_name: "{{ item }}"
platform_box: ubuntu/trusty64
provider_raw_config_args:
- 'host = "remote-node.example.com"'
- 'connect_via_ssh = "True"'
- 'username = "sshuser"'
- 'driver = "kvm"'
- 'cpu_mode = "host-passthrough"'
state: up
with_items:
- instance-1
- instance-2

.. _linters:

Expand Down
24 changes: 0 additions & 24 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,6 @@ project.
env:
ANSIBLE_$VAR: $VALUE
Vagrant Proxy Settings
======================

One way of passing in proxy settings to the Vagrant provider is using the
vagrant-proxyconf plugin and adding the vagrant-proxyconf configurations to
~/.vagrant.d/Vagrantfile.

To install the plugin run:

.. code-block:: bash
$ vagrant plugin install vagrant-proxyconf
On linux add the following Vagrantfile to ~/.vagrant.d/Vagrantfile.

.. code-block:: ruby
Vagrant.configure("2") do |config|
if Vagrant.has_plugin?("vagrant-proxyconf")
config.proxy.http = ENV['HTTP_PROXY']
config.proxy.https = ENV['HTTP_PROXY']
config.proxy.no_proxy = ENV['NO_PROXY']
end
end
Sharing Across Scenarios
========================
Expand Down
1 change: 0 additions & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Contents:
usage
examples
configuration
porting
testing
contributing
development
Expand Down
Loading

0 comments on commit f34f578

Please sign in to comment.