Skip to content
This repository was archived by the owner on Nov 12, 2020. It is now read-only.

Commit 2a443c5

Browse files
chore: sync with master repository (#11)
1 parent 2f77dd7 commit 2a443c5

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,3 @@ jobs:
4444
python: 3.8
4545
script: bash scripts/trigger-travis.sh osism docker-osism-ansible $TRAVIS_ACCESS_TOKEN "triggered by $TRAVIS_REPO_SLUG ($TRAVIS_COMMIT)"
4646
if: branch = "master" AND type = "push"
47-
48-
notifications:
49-
irc:
50-
channels:
51-
- "irc.freenode.org#osism"
52-
template:
53-
- "%{result} %{repository_slug}: %{commit_subject} %{build_url}"
54-
skip_join: true

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Ansible osism.hosts
22

33
[![Build Status](https://travis-ci.org/osism/ansible-hosts.svg?branch=master)](https://travis-ci.org/osism/ansible-hosts)
4-
[![Ansible Galaxy](https://img.shields.io/badge/Ansible%20Galaxy-osism.hosts-blue.svg)](https://galaxy.ansible.com/osism/hosts/)
54
![Ansible 2.8](https://img.shields.io/badge/Ansible-2.8-green.png?style=flat)
65
![Ansible 2.9](https://img.shields.io/badge/Ansible-2.9-green.png?style=flat)
76
![Ubuntu 16.04](https://img.shields.io/badge/Ubuntu-16.04-orange.png?style=flat)

gilt.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
- git: https://github.com/osism/travis-master.git
33
version: master
44
files:
5+
- src: github/*.yml
6+
dst: .github/
57
- src: molecule/ansible.cfg
68
dst: molecule/default/ansible.cfg
79
- src: molecule/*.yml

molecule/default/create.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Create
2+
- name: Playbook for resource creation
33
hosts: localhost
44
connection: local
55
gather_facts: false
@@ -23,7 +23,7 @@
2323
remote_ip_prefix: "{{ item.cidr | default(omit) }}"
2424
remote_group: "{{ item.group | default(omit) }}"
2525
ethertype: "{{ item.ethertype | default(omit) }}"
26-
with_items: "{{ security_group_rules }}"
26+
loop: "{{ security_group_rules }}"
2727

2828
- name: Test for presence of local keypair
2929
stat:
@@ -50,11 +50,6 @@
5050
mode: 0600
5151
when: keypair.changed
5252

53-
- name: Gather facts about network for use with instance creation
54-
os_networks_facts:
55-
cloud: molecule
56-
name: "{{ nova.network_name }}"
57-
5853
- name: Create molecule instance(s)
5954
os_server:
6055
cloud: molecule
@@ -66,13 +61,13 @@
6661
- "{{ security_group_name }}"
6762
key_name: "{{ keypair_name }}"
6863
nics:
69-
- net-id: "{{ openstack_networks[0]['id'] }}"
64+
- net-name: "{{ nova.network_name }}"
7065
config_drive: yes
7166
delete_fip: yes
7267
auto_ip: no
7368
timeout: 360
7469
register: server
75-
with_items: "{{ molecule_yml.platforms }}"
70+
loop: "{{ molecule_yml.platforms }}"
7671
async: 7200
7772
poll: 0
7873

@@ -82,7 +77,7 @@
8277
register: os_jobs_server
8378
until: os_jobs_server.finished
8479
retries: 300
85-
with_items: "{{ server.results }}"
80+
loop: "{{ server.results }}"
8681

8782
- name: Assing public address(es)
8883
os_floating_ip:
@@ -91,7 +86,7 @@
9186
network: "{{ nova.floating_ip_pool }}"
9287
wait: yes
9388
register: floating_ip
94-
with_items: "{{ molecule_yml.platforms }}"
89+
loop: "{{ molecule_yml.platforms }}"
9590
async: 7200
9691
poll: 0
9792

@@ -101,7 +96,7 @@
10196
register: os_jobs_floating_ip
10297
until: os_jobs_floating_ip.finished
10398
retries: 300
104-
with_items: "{{ floating_ip.results }}"
99+
loop: "{{ floating_ip.results }}"
105100

106101
# Mandatory configuration for molecule to function.
107102

@@ -135,5 +130,4 @@
135130
port: "{{ ssh_port }}"
136131
host: "{{ item.address }}"
137132
search_regex: SSH
138-
delay: 10
139-
with_items: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"
133+
loop: "{{ lookup('file', molecule_instance_config) | molecule_from_yaml }}"

molecule/default/destroy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
- name: Destroy
2+
- name: Playbook for resource destruction
33
hosts: localhost
44
connection: local
55
gather_facts: false
@@ -13,7 +13,7 @@
1313
delete_fip: yes
1414
state: absent
1515
register: server
16-
with_items: "{{ molecule_yml.platforms }}"
16+
loop: "{{ molecule_yml.platforms }}"
1717
async: 7200
1818
poll: 0
1919

@@ -23,7 +23,7 @@
2323
register: os_jobs
2424
until: os_jobs.finished
2525
retries: 300
26-
with_items: "{{ server.results }}"
26+
loop: "{{ server.results }}"
2727

2828
- name: Delete remote keypair
2929
os_keypair:

molecule/default/molecule.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,13 @@ verifier:
1919
enabled: false
2020
scenario:
2121
name: default
22+
test_sequence:
23+
- dependency
24+
- lint
25+
- syntax
26+
- create
27+
- prepare
28+
- converge
29+
- idempotence
30+
- verify
31+
- destroy

molecule/default/yamllint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ extends: default
44
ignore: |
55
.tox
66
.git
7+
.github
78
89
rules:
910
line-length:

test-requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ molecule-openstack
33
molecule>=3.0
44
openstacksdk
55
paramiko
6-
shade
76
testinfra

0 commit comments

Comments
 (0)