switch to molecule ec2

.drone.jsonnet

@@ -45,24 +45,20 @@ local PipelineDeployment = {
   steps: [
     {
       name: "molecule",
-      image: "xoxys/molecule:gce-linux-amd64",
+      image: "xoxys/molecule:ec2-linux-amd64",
       pull: "always",
       environment: {
-        GCE_SSH_KEY: { "from_secret": "gce_ssh_key" },
-        GCE_SERVICE_ACCOUNT_EMAIL: { "from_secret": "gce_service_account_email" },
-        GCE_PROJECT_ID: { "from_secret": "gce_project_id" },
-        GCE_CREDENTIALS_JSON: { "from_secret": "gce_credentials_json" },
-        GCE_SSH_USER: { "from_secret": "gce_ssh_user" },
-        GCE_CREDENTIALS_FILE: "/root/ansible-testing.json",
+        EC2_ACCESS_KEY: { "from_secret": "ec2_access_key" },
+        EC2_SECURITY_TOKEN: { "from_secret": "ec2_security_token" },
+        EC2_REGION: "eu-central-1",
         MOLECULE_CUSTOM_MODULES_REPO: "https://gitea.rknet.org/ansible/custom_modules",
         PY_COLORS: 1
       },
       commands: [
-        "/bin/bash /docker-entrypoint.sh",
-        "molecule create --scenario-name gce-centos-7",
-        "molecule converge --scenario-name gce-centos-7",
-        "molecule verify --scenario-name gce-centos-7",
-        "molecule destroy --scenario-name gce-centos-7",
+        "molecule create --scenario-name ec2-centos-7",
+        "molecule converge --scenario-name ec2-centos-7",
+        "molecule verify --scenario-name ec2-centos-7",
+        "molecule destroy --scenario-name ec2-centos-7",
       ],
     },
   ],

.drone.yml

@@ -52,26 +52,18 @@ workspace:
 steps:
 - name: molecule
   pull: always
-  image: xoxys/molecule:gce-linux-amd64
+  image: xoxys/molecule:ec2-linux-amd64
   commands:
-  - /bin/bash /docker-entrypoint.sh
-  - /bin/cat /root/ansible-testing.json
-  - molecule create --scenario-name gce-centos-7
-  - molecule converge --scenario-name gce-centos-7
-  - molecule verify --scenario-name gce-centos-7
-  - molecule destroy --scenario-name gce-centos-7
+  - molecule create --scenario-name ec2-centos-7
+  - molecule converge --scenario-name ec2-centos-7
+  - molecule verify --scenario-name ec2-centos-7
+  - molecule destroy --scenario-name ec2-centos-7
   environment:
-    GCE_CREDENTIALS_FILE: /root/ansible-testing.json
-    GCE_CREDENTIALS_JSON:
-      from_secret: gce_credentials_json
-    GCE_PROJECT_ID:
-      from_secret: gce_project_id
-    GCE_SERVICE_ACCOUNT_EMAIL:
-      from_secret: gce_service_account_email
-    GCE_SSH_KEY:
-      from_secret: gce_ssh_key
-    GCE_SSH_USER:
-      from_secret: gce_ssh_user
+    EC2_ACCESS_KEY:
+      from_secret: ec2_access_key
+    EC2_REGION: eu-central-1
+    EC2_SECURITY_TOKEN:
+      from_secret: ec2_security_token
     MOLECULE_CUSTOM_MODULES_REPO: https://gitea.rknet.org/ansible/custom_modules
     PY_COLORS: 1
 

molecule/default/INSTALL.rst

@@ -0,0 +1,22 @@
+*******
+Amazon Web Services driver installation guide
+*******
+
+Requirements
+============
+
+* An AWS credentials rc file
+
+Install
+=======
+
+Please refer to the `Virtual environment`_ documentation for installation best
+practices. If not using a virtual environment, please consider passing the
+widely recommended `'--user' flag`_ when invoking ``pip``.
+
+.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
+.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
+
+.. code-block:: bash
+
+    $ pip install 'molecule[ec2]'

molecule/default/create.yml

@@ -0,0 +1,125 @@
+---
+- name: Create
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
+  vars:
+    ssh_user: ubuntu
+    ssh_port: 22
+
+    security_group_name: molecule
+    security_group_description: Security group for testing Molecule
+    security_group_rules:
+      - proto: tcp
+        from_port: "{{ ssh_port }}"
+        to_port: "{{ ssh_port }}"
+        cidr_ip: '0.0.0.0/0'
+      - proto: icmp
+        from_port: 8
+        to_port: -1
+        cidr_ip: '0.0.0.0/0'
+    security_group_rules_egress:
+      - proto: -1
+        from_port: 0
+        to_port: 0
+        cidr_ip: '0.0.0.0/0'
+
+    keypair_name: molecule_key
+    keypair_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key"
+  tasks:
+    - name: Create security group
+      ec2_group:
+        name: "{{ security_group_name }}"
+        description: "{{ security_group_name }}"
+        rules: "{{ security_group_rules }}"
+        rules_egress: "{{ security_group_rules_egress }}"
+
+    - name: Test for presence of local keypair
+      stat:
+        path: "{{ keypair_path }}"
+      register: keypair_local
+
+    - name: Delete remote keypair
+      ec2_key:
+        name: "{{ keypair_name }}"
+        state: absent
+      when: not keypair_local.stat.exists
+
+    - name: Create keypair
+      ec2_key:
+        name: "{{ keypair_name }}"
+      register: keypair
+
+    - name: Persist the keypair
+      copy:
+        dest: "{{ keypair_path }}"
+        content: "{{ keypair.key.private_key }}"
+        mode: 0600
+      when: keypair.changed
+
+    - name: Create molecule instance(s)
+      ec2:
+        key_name: "{{ keypair_name }}"
+        image: "{{ item.image }}"
+        instance_type: "{{ item.instance_type }}"
+        vpc_subnet_id: "{{ item.vpc_subnet_id }}"
+        group: "{{ security_group_name }}"
+        instance_tags:
+          instance: "{{ item.name }}"
+        wait: true
+        assign_public_ip: true
+        exact_count: 1
+        count_tag:
+          instance: "{{ item.name }}"
+      register: server
+      with_items: "{{ molecule_yml.platforms }}"
+      async: 7200
+      poll: 0
+
+    - name: Wait for instance(s) creation to complete
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      register: ec2_jobs
+      until: ec2_jobs.finished
+      retries: 300
+      with_items: "{{ server.results }}"
+
+    # Mandatory configuration for Molecule to function.
+
+    - name: Populate instance config dict
+      set_fact:
+        instance_conf_dict: {
+          'instance': "{{ item.instances[0].tags.instance }}",
+          'address': "{{ item.instances[0].public_ip }}",
+          'user': "{{ ssh_user }}",
+          'port': "{{ ssh_port }}",
+          'identity_file': "{{ keypair_path }}",
+          'instance_ids': "{{ item.instance_ids }}", }
+      with_items: "{{ ec2_jobs.results }}"
+      register: instance_config_dict
+      when: server.changed | bool
+
+    - name: Convert instance config dict to a list
+      set_fact:
+        instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
+      when: server.changed | bool
+
+    - name: Dump instance config
+      copy:
+        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+        dest: "{{ molecule_instance_config }}"
+      when: server.changed | bool
+
+    - name: Wait for SSH
+      wait_for:
+        port: "{{ ssh_port }}"
+        host: "{{ item.address }}"
+        search_regex: SSH
+        delay: 10
+        timeout: 320
+      with_items: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
+
+    - name: Wait for boot process to finish
+      pause:
+        minutes: 2

molecule/default/destroy.yml

@@ -5,24 +5,32 @@
   gather_facts: false
   no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
   tasks:
+    - block:
+        - name: Populate instance config
+          set_fact:
+            instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
+            skip_instances: false
+      rescue:
+        - name: Populate instance config when file missing
+          set_fact:
+            instance_conf: {}
+            skip_instances: true
+
     - name: Destroy molecule instance(s)
-      gce:
-        instance_names: "{{ item.name }}"
+      ec2:
         state: absent
-        zone: "{{ item.zone }}"
-        service_account_email: "{{ lookup('env', 'GCE_SERVICE_ACCOUNT_EMAIL') }}"
-        credentials_file: "{{ lookup('env', 'GCE_CREDENTIALS_FILE') }}"
-        project_id: "{{ lookup('env', 'GCE_PROJECT_ID') }}"
+        instance_ids: "{{ item.instance_ids }}"
       register: server
-      with_items: "{{ molecule_yml.platforms }}"
+      with_items: "{{ instance_conf }}"
+      when: not skip_instances
       async: 7200
       poll: 0
 
     - name: Wait for instance(s) deletion to complete
       async_status:
         jid: "{{ item.ansible_job_id }}"
-      register: gce_jobs
-      until: gce_jobs.finished
+      register: ec2_jobs
+      until: ec2_jobs.finished
       retries: 300
       with_items: "{{ server.results }}"
 

molecule/default/molecule.yml

@@ -0,0 +1,20 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+lint:
+  name: yamllint
+platforms:
+  - name: instance
+    image: ami-a5b196c0
+    instance_type: t2.micro
+    vpc_subnet_id: subnet-6456fd1f
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/playbook.yml

@@ -1,8 +1,5 @@
 ---
 - name: Converge
   hosts: all
-  vars:
-    nginx_default_page_enabled: True
-
   roles:
     - role: xoxys.nginx

molecule/default/tests/test_default.py

@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'

molecule/ec2-centos-7/INSTALL.rst

@@ -0,0 +1,22 @@
+*******
+Amazon Web Services driver installation guide
+*******
+
+Requirements
+============
+
+* An AWS credentials rc file
+
+Install
+=======
+
+Please refer to the `Virtual environment`_ documentation for installation best
+practices. If not using a virtual environment, please consider passing the
+widely recommended `'--user' flag`_ when invoking ``pip``.
+
+.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
+.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
+
+.. code-block:: bash
+
+    $ pip install 'molecule[ec2]'

molecule/ec2-centos-7/create.yml

@@ -0,0 +1,125 @@
+---
+- name: Create
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
+  vars:
+    ssh_user: centos
+    ssh_port: 22
+
+    security_group_name: molecule
+    security_group_description: Security group for testing Molecule
+    security_group_rules:
+      - proto: tcp
+        from_port: "{{ ssh_port }}"
+        to_port: "{{ ssh_port }}"
+        cidr_ip: '0.0.0.0/0'
+      - proto: icmp
+        from_port: 8
+        to_port: -1
+        cidr_ip: '0.0.0.0/0'
+    security_group_rules_egress:
+      - proto: -1
+        from_port: 0
+        to_port: 0
+        cidr_ip: '0.0.0.0/0'
+
+    keypair_name: molecule_key
+    keypair_path: "{{ lookup('env', 'MOLECULE_EPHEMERAL_DIRECTORY') }}/ssh_key"
+  tasks:
+    - name: Create security group
+      ec2_group:
+        name: "{{ security_group_name }}"
+        description: "{{ security_group_name }}"
+        rules: "{{ security_group_rules }}"
+        rules_egress: "{{ security_group_rules_egress }}"
+
+    - name: Test for presence of local keypair
+      stat:
+        path: "{{ keypair_path }}"
+      register: keypair_local
+
+    - name: Delete remote keypair
+      ec2_key:
+        name: "{{ keypair_name }}"
+        state: absent
+      when: not keypair_local.stat.exists
+
+    - name: Create keypair
+      ec2_key:
+        name: "{{ keypair_name }}"
+      register: keypair
+
+    - name: Persist the keypair
+      copy:
+        dest: "{{ keypair_path }}"
+        content: "{{ keypair.key.private_key }}"
+        mode: 0600
+      when: keypair.changed
+
+    - name: Create molecule instance(s)
+      ec2:
+        key_name: "{{ keypair_name }}"
+        image: "{{ item.image }}"
+        instance_type: "{{ item.instance_type }}"
+        vpc_subnet_id: "{{ item.vpc_subnet_id }}"
+        group: "{{ security_group_name }}"
+        instance_tags:
+          instance: "{{ item.name }}"
+        wait: true
+        assign_public_ip: true
+        exact_count: 1
+        count_tag:
+          instance: "{{ item.name }}"
+      register: server
+      with_items: "{{ molecule_yml.platforms }}"
+      async: 7200
+      poll: 0
+
+    - name: Wait for instance(s) creation to complete
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      register: ec2_jobs
+      until: ec2_jobs.finished
+      retries: 300
+      with_items: "{{ server.results }}"
+
+    # Mandatory configuration for Molecule to function.
+
+    - name: Populate instance config dict
+      set_fact:
+        instance_conf_dict: {
+          'instance': "{{ item.instances[0].tags.instance }}",
+          'address': "{{ item.instances[0].public_ip }}",
+          'user': "{{ ssh_user }}",
+          'port': "{{ ssh_port }}",
+          'identity_file': "{{ keypair_path }}",
+          'instance_ids': "{{ item.instance_ids }}", }
+      with_items: "{{ ec2_jobs.results }}"
+      register: instance_config_dict
+      when: server.changed | bool
+
+    - name: Convert instance config dict to a list
+      set_fact:
+        instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
+      when: server.changed | bool
+
+    - name: Dump instance config
+      copy:
+        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+        dest: "{{ molecule_instance_config }}"
+      when: server.changed | bool
+
+    - name: Wait for SSH
+      wait_for:
+        port: "{{ ssh_port }}"
+        host: "{{ item.address }}"
+        search_regex: SSH
+        delay: 10
+        timeout: 320
+      with_items: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
+
+    - name: Wait for boot process to finish
+      pause:
+        minutes: 2

molecule/ec2-centos-7/destroy.yml

@@ -0,0 +1,47 @@
+---
+- name: Destroy
+  hosts: localhost
+  connection: local
+  gather_facts: false
+  no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
+  tasks:
+    - block:
+        - name: Populate instance config
+          set_fact:
+            instance_conf: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
+            skip_instances: false
+      rescue:
+        - name: Populate instance config when file missing
+          set_fact:
+            instance_conf: {}
+            skip_instances: true
+
+    - name: Destroy molecule instance(s)
+      ec2:
+        state: absent
+        instance_ids: "{{ item.instance_ids }}"
+      register: server
+      with_items: "{{ instance_conf }}"
+      when: not skip_instances
+      async: 7200
+      poll: 0
+
+    - name: Wait for instance(s) deletion to complete
+      async_status:
+        jid: "{{ item.ansible_job_id }}"
+      register: ec2_jobs
+      until: ec2_jobs.finished
+      retries: 300
+      with_items: "{{ server.results }}"
+
+    # Mandatory configuration for Molecule to function.
+
+    - name: Populate instance config
+      set_fact:
+        instance_conf: {}
+
+    - name: Dump instance config
+      copy:
+        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
+        dest: "{{ molecule_instance_config }}"
+      when: server.changed | bool

molecule/ec2-centos-7/molecule.yml

@@ -0,0 +1,18 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: ec2
+platforms:
+  - name: centos-7-nginx
+    image: ami-0957ba512eafd08d9
+    instance_type: t2.micro
+    vpc_subnet_id: vpc-03382e68
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/ec2-centos-7/playbook.yml

@@ -0,0 +1,5 @@
+---
+- name: Converge
+  hosts: all
+  roles:
+    - role: xoxys.nginx

molecule/ec2-centos-7/prepare.yml

@@ -0,0 +1,9 @@
+---
+- name: Prepare
+  hosts: all
+  gather_facts: false
+  tasks:
+    - name: Install python for Ansible
+      raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal python-zipstream)
+      become: true
+      changed_when: false

molecule/ec2-centos-7/tests/test_default.py

@@ -0,0 +1,14 @@
+import os
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
+
+
+def test_hosts_file(host):
+    f = host.file('/etc/hosts')
+
+    assert f.exists
+    assert f.user == 'root'
+    assert f.group == 'root'

molecule/gce-centos-7/create.yml

@@ -1,73 +0,0 @@
----
-- name: Create
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  #no_log: "{{ not (lookup('env', 'MOLECULE_DEBUG') | bool or molecule_yml.provisioner.log|default(false) | bool) }}"
-  vars:
-    ssh_port: 22
-    ssh_user: "{{ lookup('env', 'GCE_SSH_USER') }}"
-    ssh_identity_file: "{{ lookup('env', 'HOME') }}/.ssh/google_compute_engine"
-  tasks:
-    - name: Create molecule instance(s)
-      gce:
-        instance_names: "{{ item.name }}"
-        zone: "{{ item.zone }}"
-        machine_type: "{{ item.machine_type }}"
-        image: "{{ item.image }}"
-        service_account_email: "{{ lookup('env', 'GCE_SERVICE_ACCOUNT_EMAIL') }}"
-        credentials_file: "{{ lookup('env', 'GCE_CREDENTIALS_FILE') }}"
-        project_id: "{{ lookup('env', 'GCE_PROJECT_ID') }}"
-      register: server
-      with_items: "{{ molecule_yml.platforms }}"
-      loop_control:
-        label: "{{ item.name }}:{{ item.machine_type }}"
-      async: 7200
-      poll: 0
-
-    - name: Wait for instance(s) creation to complete
-      async_status:
-        jid: "{{ item.ansible_job_id }}"
-      register: gce_jobs
-      until: gce_jobs.finished
-      retries: 300
-      with_items: "{{ server.results }}"
-      loop_control:
-        label: "{{ item.item.name }}:{{ item.item.machine_type }}"
-
-    # Mandatory configuration for Molecule to function.
-
-    - name: Populate instance config dict
-      set_fact:
-        instance_conf_dict: {
-          'instance': "{{ item.instance_data[0].name }}",
-          'address': "{{ item.instance_data[0].public_ip }}",
-          'user': "{{ ssh_user }}",
-          'port': "{{ ssh_port }}",
-          'identity_file': "{{ ssh_identity_file }}", }
-      with_items: "{{ gce_jobs.results }}"
-      loop_control:
-        label: "{{ item.instance_data[0].name }}:{{ item.instance_data[0].machine_type }}"
-      register: instance_config_dict
-      when: server.changed | bool
-
-    - name: Convert instance config dict to a list
-      set_fact:
-        instance_conf: "{{ instance_config_dict.results | map(attribute='ansible_facts.instance_conf_dict') | list }}"
-      when: server.changed | bool
-
-    - name: Dump instance config
-      copy:
-        content: "{{ instance_conf | to_json | from_json | molecule_to_yaml | molecule_header }}"
-        dest: "{{ molecule_instance_config }}"
-      when: server.changed | bool
-
-    - name: Wait for SSH
-      wait_for:
-        port: "{{ ssh_port }}"
-        host: "{{ item.address }}"
-        search_regex: SSH
-        delay: 10
-      with_items: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
-      loop_control:
-        label: "{{ item.instance }}"

molecule/gce-centos-7/molecule.yml

@@ -1,28 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: gce
-lint:
-  name: yamllint
-  enabled: False
-platforms:
-  - name: gce-centos-7-nginx
-    zone: europe-north1-a
-    machine_type: f1-micro
-    image: centos-7
-provisioner:
-  name: ansible
-  lint:
-    name: ansible-lint
-scenario:
-  name: gce-centos-7
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
-ansible:
-  ansiblecfg_defaults:
-    force_color: true
-    roles_path: /drone/src
-    timeout: 60

molecule/gce-centos-7/tests/test_default.py

@@ -1,30 +0,0 @@
-import os
-
-import testinfra.utils.ansible_runner
-
-import warnings
-warnings.filterwarnings("ignore", category=DeprecationWarning)
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
-
-
-def test_nginx_is_installed(host):
-    nginx = host.package("nginx")
-    assert nginx.is_installed
-
-def test_nginx_running_and_enabled(host):
-    nginx = host.service("nginx")
-    assert nginx.is_running
-    assert nginx.is_enabled
-
-def test_nginx_process(host):
-    # Verify worker procs are running
-    master = host.process.get(user="root", comm="nginx")
-    workers = host.process.filter(ppid=master.pid)
-    assert len(workers) > 0
-
-def test_nginx_socket(host):
-    # Verify the socket is listening for HTTP traffic
-    assert host.socket("tcp://0.0.0.0:80").is_listening
-