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

Commit f9129a0

Browse files
hswong3ihswong3i
committed
Merge branch 'release/4.2.0'
2 parents bd592bb + 7a49014 commit f9129a0

36 files changed

+371
-138
lines changed

‎.travis.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
---
22

3+
os: linux
4+
35
dist: bionic
46

5-
language: minimal
7+
language: shell
68

79
env:
8-
matrix:
10+
jobs:
911
- MOLECULE_SCENARIO_NAME="centos-7"
1012
- MOLECULE_SCENARIO_NAME="suse-15"
1113
- MOLECULE_SCENARIO_NAME="ubuntu-16.04"
1214
- MOLECULE_SCENARIO_NAME="ubuntu-18.04"
15+
- MOLECULE_SCENARIO_NAME="ubuntu-19.10"
1316

14-
matrix:
17+
jobs:
1518
allow_failures:
1619
- env: MOLECULE_SCENARIO_NAME="centos-7"
1720
- env: MOLECULE_SCENARIO_NAME="suse-15"

‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
# Ansible Role for LXD
22

3-
## 4.2.0 - TBC
3+
## 4.3.0 - TBC
44

55
### Major Changes
66

7-
- Migrate molecule tests to Libvirt
7+
## 4.2.0 - 2020-02-13
8+
9+
### Major Changes
10+
11+
- Migrate molecule driver to Libvirt
12+
- Migrate molecule verifier to Ansible
13+
- Support Ubuntu 19.10
814

915
## 4.1.0 - 2020-01-16
1016

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Ansible Role for LXD Installation.
1111

1212
This role require Ansible 2.9 or higher.
1313

14-
This role was designed for Ubuntu 16.04/18.04 or RHEL/CentOS 7 or openSUSE Leap 15.1.
14+
This role was designed for Ubuntu 16.04/18.04/19.10 or RHEL/CentOS 7 or openSUSE Leap 15.1.
1515

1616
## Role Variables
1717

‎meta/main.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ galaxy_info:
2626
versions:
2727
- xenial
2828
- bionic
29+
- eoan
2930
- name: EL
3031
versions:
3132
- 7

‎molecule/centos-7/molecule.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ provisioner:
5858
playbooks:
5959
prepare: prepare.yml
6060
verifier:
61-
name: testinfra
61+
name: ansible
6262
lint:
63-
name: flake8
63+
name: ansible-lint

‎molecule/centos-7/playbook.yml

-9
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@
2020
roles:
2121
- role: snapd
2222
- role: lxd
23-
24-
- hosts: all
25-
remote_user: root
26-
become: true
27-
tasks:
28-
- name: lxd --version
29-
command: lxd --version
30-
register: result
31-
changed_when: result is not succeeded

‎molecule/centos-7/prepare.yml

+8
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@
88
- name: cp -rfT /etc/skel /root
99
raw: |
1010
cp -rfT /etc/skel /root
11+
changed_when: false
1112
ignore_errors: true
1213

1314
- name: setenforce 0
1415
raw: |
1516
setenforce 0
17+
changed_when: false
1618
ignore_errors: true
1719

1820
- name: systemctl stop firewalld.service
1921
raw: |
2022
systemctl stop firewalld.service
23+
changed_when: false
2124
ignore_errors: true
2225

2326
- name: systemctl stop ufw.service
2427
raw: |
2528
systemctl stop ufw.service
29+
changed_when: false
2630
ignore_errors: true
2731

2832
- name: redhat-7 | subscription-manager register
@@ -31,22 +35,26 @@
3135
--username={{ lookup('env', 'REDHAT_USERNAME') }} \
3236
--password={{ lookup('env', 'REDHAT_PASSWORD') }} \
3337
--autosubscribe
38+
changed_when: false
3439
ignore_errors: true
3540

3641
- name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
3742
raw: |
3843
apt-get update
3944
apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
45+
changed_when: false
4046
ignore_errors: true
4147

4248
- name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
4349
raw: |
4450
yum makecache fast
4551
yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
52+
changed_when: false
4653
ignore_errors: true
4754

4855
- name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
4956
raw: |
5057
zypper -n --gpg-auto-import-keys refresh
5158
zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
59+
changed_when: false
5260
ignore_errors: true

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

-15
This file was deleted.

‎molecule/centos-7/verify.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
3+
# (c) Wong Hoi Sing Edison <[email protected]>
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
- hosts: all
18+
remote_user: root
19+
become: true
20+
tasks:
21+
- name: lxd --version
22+
command: lxd --version
23+
register: result
24+
changed_when: result is not succeeded

‎molecule/redhat-7/molecule.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ provisioner:
5858
playbooks:
5959
prepare: prepare.yml
6060
verifier:
61-
name: testinfra
61+
name: ansible
6262
lint:
63-
name: flake8
63+
name: ansible-lint

‎molecule/redhat-7/playbook.yml

-9
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@
2020
roles:
2121
- role: snapd
2222
- role: lxd
23-
24-
- hosts: all
25-
remote_user: root
26-
become: true
27-
tasks:
28-
- name: lxd --version
29-
command: lxd --version
30-
register: result
31-
changed_when: result is not succeeded

‎molecule/redhat-7/prepare.yml

+8
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@
88
- name: cp -rfT /etc/skel /root
99
raw: |
1010
cp -rfT /etc/skel /root
11+
changed_when: false
1112
ignore_errors: true
1213

1314
- name: setenforce 0
1415
raw: |
1516
setenforce 0
17+
changed_when: false
1618
ignore_errors: true
1719

1820
- name: systemctl stop firewalld.service
1921
raw: |
2022
systemctl stop firewalld.service
23+
changed_when: false
2124
ignore_errors: true
2225

2326
- name: systemctl stop ufw.service
2427
raw: |
2528
systemctl stop ufw.service
29+
changed_when: false
2630
ignore_errors: true
2731

2832
- name: redhat-7 | subscription-manager register
@@ -31,22 +35,26 @@
3135
--username={{ lookup('env', 'REDHAT_USERNAME') }} \
3236
--password={{ lookup('env', 'REDHAT_PASSWORD') }} \
3337
--autosubscribe
38+
changed_when: false
3439
ignore_errors: true
3540

3641
- name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
3742
raw: |
3843
apt-get update
3944
apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
45+
changed_when: false
4046
ignore_errors: true
4147

4248
- name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
4349
raw: |
4450
yum makecache fast
4551
yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
52+
changed_when: false
4653
ignore_errors: true
4754

4855
- name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
4956
raw: |
5057
zypper -n --gpg-auto-import-keys refresh
5158
zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
59+
changed_when: false
5260
ignore_errors: true

‎molecule/redhat-7/tests/test_default.py

-15
This file was deleted.

‎molecule/redhat-7/verify.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
3+
# (c) Wong Hoi Sing Edison <[email protected]>
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
- hosts: all
18+
remote_user: root
19+
become: true
20+
tasks:
21+
- name: lxd --version
22+
command: lxd --version
23+
register: result
24+
changed_when: result is not succeeded

‎molecule/suse-15/molecule.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ provisioner:
5858
playbooks:
5959
prepare: prepare.yml
6060
verifier:
61-
name: testinfra
61+
name: ansible
6262
lint:
63-
name: flake8
63+
name: ansible-lint

‎molecule/suse-15/playbook.yml

-9
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,3 @@
2020
roles:
2121
- role: snapd
2222
- role: lxd
23-
24-
- hosts: all
25-
remote_user: root
26-
become: true
27-
tasks:
28-
- name: lxd --version
29-
command: lxd --version
30-
register: result
31-
changed_when: result is not succeeded

‎molecule/suse-15/prepare.yml

+8
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@
88
- name: cp -rfT /etc/skel /root
99
raw: |
1010
cp -rfT /etc/skel /root
11+
changed_when: false
1112
ignore_errors: true
1213

1314
- name: setenforce 0
1415
raw: |
1516
setenforce 0
17+
changed_when: false
1618
ignore_errors: true
1719

1820
- name: systemctl stop firewalld.service
1921
raw: |
2022
systemctl stop firewalld.service
23+
changed_when: false
2124
ignore_errors: true
2225

2326
- name: systemctl stop ufw.service
2427
raw: |
2528
systemctl stop ufw.service
29+
changed_when: false
2630
ignore_errors: true
2731

2832
- name: redhat-7 | subscription-manager register
@@ -31,22 +35,26 @@
3135
--username={{ lookup('env', 'REDHAT_USERNAME') }} \
3236
--password={{ lookup('env', 'REDHAT_PASSWORD') }} \
3337
--autosubscribe
38+
changed_when: false
3439
ignore_errors: true
3540

3641
- name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
3742
raw: |
3843
apt-get update
3944
apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
45+
changed_when: false
4046
ignore_errors: true
4147

4248
- name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
4349
raw: |
4450
yum makecache fast
4551
yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
52+
changed_when: false
4653
ignore_errors: true
4754

4855
- name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
4956
raw: |
5057
zypper -n --gpg-auto-import-keys refresh
5158
zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
59+
changed_when: false
5260
ignore_errors: true

‎molecule/suse-15/tests/test_default.py

-15
This file was deleted.

0 commit comments

Comments
 (0)