From 6dce72d18ddbcd027a6522f50841e600b971f347 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Mon, 27 Jan 2020 13:47:04 +0100 Subject: [PATCH] remove block storage attachment --- README.md | 4 ++-- meta/main.yml | 4 ++-- molecule/centos7/create.yml | 18 ------------------ molecule/centos7/destroy.yml | 17 ----------------- molecule/centos8/create.yml | 18 ------------------ molecule/centos8/destroy.yml | 17 ----------------- 6 files changed, 4 insertions(+), 74 deletions(-) diff --git a/README.md b/README.md index 128657d..30396df 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # xoxys.smb - + [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.smb?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.smb) -[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](LICENSE) +[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) Mount a list of Samba shares. diff --git a/meta/main.yml b/meta/main.yml index 4aeb9f7..14fd7a2 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -6,8 +6,8 @@ galaxy_info: # @meta description: > # [![Source Code](https://img.shields.io/badge/gitea-source%20code-blue?logo=gitea&logoColor=white)](https://gitea.rknet.org/ansible/xoxys.smb) # [![Build Status](https://img.shields.io/drone/build/ansible/xoxys.smb?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/ansible/xoxys.smb) -# [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?label=license)](LICENSE) -# +# [![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) +# # Mount a list of Samba shares. # @end description: Mount a list of Samba shares diff --git a/molecule/centos7/create.yml b/molecule/centos7/create.yml index a9dae89..8d67247 100644 --- a/molecule/centos7/create.yml +++ b/molecule/centos7/create.yml @@ -49,24 +49,6 @@ retries: 300 loop: "{{ server.results }}" - - name: Create new block storage - digital_ocean_block_storage: - state: present - command: create - region: "{{ item.data.droplet.region.slug }}" - block_size: 2 - volume_name: "{{ item.data.droplet.name }}-blk" - loop: "{{ digitalocean_jobs.results }}" - - - name: Attach block storage to instance - digital_ocean_block_storage: - state: present - command: attach - volume_name: "{{ item.data.droplet.name }}-blk" - region: "{{ item.data.droplet.region.slug }}" - droplet_id: "{{ item.data.droplet.id }}" - loop: "{{ digitalocean_jobs.results }}" - # Mandatory configuration for Molecule to function. - name: Populate instance config dict diff --git a/molecule/centos7/destroy.yml b/molecule/centos7/destroy.yml index e6c36c1..19c8c93 100644 --- a/molecule/centos7/destroy.yml +++ b/molecule/centos7/destroy.yml @@ -16,15 +16,6 @@ instance_conf: {} skip_instances: true - - name: Detach block storage from instance - digital_ocean_block_storage: - state: absent - command: attach - volume_name: "{{ item.instance }}-blk" - region: "{{ item.droplet_region }}" - droplet_id: "{{ item.droplet_id }}" - loop: "{{ instance_conf | flatten(levels=1) }}" - - name: Destroy molecule instance(s) digital_ocean_droplet: name: "{{ item.instance }}" @@ -44,14 +35,6 @@ retries: 300 loop: "{{ server.results }}" - - name: Delete block storage - digital_ocean_block_storage: - state: absent - command: create - region: "{{ item.droplet_region }}" - volume_name: "{{ item.instance }}-blk" - loop: "{{ instance_conf | flatten(levels=1) }}" - - name: Delete remote keypair digital_ocean_sshkey: fingerprint: "{{ item.ssh_key_id }}" diff --git a/molecule/centos8/create.yml b/molecule/centos8/create.yml index a9dae89..8d67247 100644 --- a/molecule/centos8/create.yml +++ b/molecule/centos8/create.yml @@ -49,24 +49,6 @@ retries: 300 loop: "{{ server.results }}" - - name: Create new block storage - digital_ocean_block_storage: - state: present - command: create - region: "{{ item.data.droplet.region.slug }}" - block_size: 2 - volume_name: "{{ item.data.droplet.name }}-blk" - loop: "{{ digitalocean_jobs.results }}" - - - name: Attach block storage to instance - digital_ocean_block_storage: - state: present - command: attach - volume_name: "{{ item.data.droplet.name }}-blk" - region: "{{ item.data.droplet.region.slug }}" - droplet_id: "{{ item.data.droplet.id }}" - loop: "{{ digitalocean_jobs.results }}" - # Mandatory configuration for Molecule to function. - name: Populate instance config dict diff --git a/molecule/centos8/destroy.yml b/molecule/centos8/destroy.yml index e6c36c1..19c8c93 100644 --- a/molecule/centos8/destroy.yml +++ b/molecule/centos8/destroy.yml @@ -16,15 +16,6 @@ instance_conf: {} skip_instances: true - - name: Detach block storage from instance - digital_ocean_block_storage: - state: absent - command: attach - volume_name: "{{ item.instance }}-blk" - region: "{{ item.droplet_region }}" - droplet_id: "{{ item.droplet_id }}" - loop: "{{ instance_conf | flatten(levels=1) }}" - - name: Destroy molecule instance(s) digital_ocean_droplet: name: "{{ item.instance }}" @@ -44,14 +35,6 @@ retries: 300 loop: "{{ server.results }}" - - name: Delete block storage - digital_ocean_block_storage: - state: absent - command: create - region: "{{ item.droplet_region }}" - volume_name: "{{ item.instance }}-blk" - loop: "{{ instance_conf | flatten(levels=1) }}" - - name: Delete remote keypair digital_ocean_sshkey: fingerprint: "{{ item.ssh_key_id }}"