Skip to content

Commit

Permalink
removed broken gce module
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Anderson committed Jun 19, 2019
1 parent a6c315f commit 76e7d6e
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 136 deletions.
21 changes: 21 additions & 0 deletions .yamllint
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
# Based on ansible-lint config
extends: default

rules:
braces: {max-spaces-inside: 1, level: error}
brackets: {max-spaces-inside: 1, level: error}
colons: {max-spaces-after: -1, level: error}
commas: {max-spaces-after: -1, level: error}
comments: disable
comments-indentation: disable
document-start: disable
empty-lines: {max: 3, level: error}
hyphens: {level: error}
indentation: disable
key-duplicates: enable
line-length: disable
new-line-at-end-of-file: disable
new-lines: {type: unix}
trailing-spaces: disable
truthy: disable
12 changes: 0 additions & 12 deletions molecule/default/.yamllint

This file was deleted.

2 changes: 1 addition & 1 deletion molecule/default/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM {{ item.image }}
{% endif %}

RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
Expand Down
67 changes: 0 additions & 67 deletions molecule/default/gce/create.yml

This file was deleted.

39 changes: 0 additions & 39 deletions molecule/default/gce/destroy.yml

This file was deleted.

1 change: 0 additions & 1 deletion molecule/default/gce/verify.yml

This file was deleted.

19 changes: 3 additions & 16 deletions molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,16 @@
dependency:
name: galaxy
driver:
name: gce
ssh_connection_options:
- -o ControlPath=~/.ansible/cp/%r@%h-%p
name: docker
lint:
name: yamllint
options:
config-file: molecule/default/.yamllint
platforms:
- name: avicontroller-debian-8-test
zone: us-west1-b
machine_type: n1-standard-4
image: ${MOLECULE_IMAGE:-debian-8}
disk_size: 80
- name: instance
image: centos:7
provisioner:
name: ansible
lint:
name: ansible-lint
playbooks:
create: gce/create.yml
verify: gce/verify.yml
destroy: gce/destroy.yml
scenario:
name: default
verifier:
name: testinfra
lint:
Expand Down

0 comments on commit 76e7d6e

Please sign in to comment.