Skip to content

Commit 90904e4

Browse files
committed
Merge branch 'release/4.2.0'
2 parents 5cfe142 + 77c0ac9 commit 90904e4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1153
-648
lines changed

.travis.lxd.yml

-51
This file was deleted.

.travis.yml

+17-9
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,41 @@
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"
1821

1922
before_install:
2023
- |
21-
sudo apt-get -y purge lxc-* lxd-* && sudo apt-get -y autoremove
22-
sudo apt-get update && sudo apt-get install -y snapd
23-
sudo snap refresh && sudo snap install lxd
24-
sudo lxd init --preseed < .travis.lxd.yml
24+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb
25+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_SHA256SUMS
26+
curl -Os https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_SHA256SUMS.sig
27+
gpg --receive-key 51852D87348FFC4C
28+
gpg --verify vagrant_2.2.7_SHA256SUMS.sig vagrant_2.2.7_SHA256SUMS
29+
sha256sum -c vagrant_2.2.7_SHA256SUMS 2>&1 | grep OK
30+
sudo apt-get update && sudo apt-get install -y bridge-utils dnsmasq-base ebtables libvirt-bin libvirt-dev qemu-kvm qemu-utils ruby-dev
31+
sudo dpkg -i vagrant_2.2.7_x86_64.deb
32+
sudo vagrant plugin install vagrant-libvirt
2533
2634
- |
2735
sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove
28-
sudo apt-get update && sudo apt-get -y install curl gcc libffi-dev libssl-dev make python3 python3-dev
36+
sudo apt-get update && sudo apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
2937
curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3
30-
sudo -H pip3 install --upgrade --ignore-installed --requirement requirements.txt
38+
sudo -H pip3 install --upgrade --ignore-installed --requirement requirements.txt
3139
3240
install:
3341
- |

CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
# AlviStack-Ansible
22

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

55
### Major Changes
66

7+
## 4.2.0 - 2020-02-15
8+
9+
### Major Changes
10+
11+
- Migrate molecule driver to Libvirt
12+
- Migrate molecule verifier to Ansible
13+
- Support Ubuntu 19.10
714
- Add `operator-sdk`
815
- Replace `duplicity` with `restic`
916
- Default with `mainline` kernel

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AlviStack-Ansible provides Ansible playbooks and roles for the deployment and co
1212

1313
This playbook require Ansible 2.9 or higher.
1414

15-
This playbook was designed for Ubuntu 16.04/18.04 or RHEL/CentOS 7 or openSUSE Leap 15.1.
15+
This playbook was designed for Ubuntu 16.04/18.04/19.10 or RHEL/CentOS 7 or openSUSE Leap 15.1.
1616

1717
## Quick Start
1818

ansible.cfg

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
control_path = %(directory)s/%%h-%%p-%%r
33
pipelining = true
44
scp_if_ssh = true
5+
ssh_args = -o ControlMaster=auto -o ControlPersist=600s
56

67
[defaults]
78
ansible_managed = Ansible managed: Do NOT edit this file manually!
8-
forks = 10
9+
display_failed_stderr = true
10+
forks = 20
911
host_key_checking = false
10-
interpreter_python = python3
12+
interpreter_python = auto
1113
nocows = 1
1214
retry_files_enabled = false

inventory/lxd/group_vars/all/all.yml

-98
This file was deleted.

inventory/lxd/host_vars/localhost.yml

-1
This file was deleted.

inventory/lxd/hosts

-23
This file was deleted.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../inventory/lxd/group_vars/all/all.yml
1+
../../../../inventory/vagrant/group_vars/all/all.yml

molecule/centos-7/molecule.yml

+23-8
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,23 @@
1515
# limitations under the License.
1616

1717
driver:
18-
name: lxd
18+
name: vagrant
19+
provider:
20+
name: libvirt
1921
platforms:
2022
- name: ${MOLECULE_INSTANCE_NAME}-1
21-
url: unix:/var/snap/lxd/common/lxd/unix.socket
22-
source:
23-
server: https://images.linuxcontainers.org
24-
protocol: simplestreams
25-
alias: centos/7/amd64
23+
box: generic/centos7
24+
cpu: 2
25+
memory: 2048
26+
interfaces:
27+
- auto_config: true
28+
network_name: private_network
29+
type: dhcp
30+
provider_raw_config_args:
31+
- 'nic_model_type = "virtio"'
32+
- 'disk_bus = "virtio"'
33+
- 'volume_cache = "none"'
34+
- 'storage :file, bus: "virtio", cache: "none"'
2635
groups:
2736
- ceph-mon
2837
- ceph-mgr
@@ -43,6 +52,12 @@ provisioner:
4352
name: ansible
4453
env:
4554
ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
55+
config_options:
56+
defaults:
57+
forks: 20
58+
ssh_connection:
59+
pipelining: true
60+
ssh_args: -o ControlMaster=auto -o ControlPersist=600s
4661
lint:
4762
name: ansible-lint
4863
inventory:
@@ -51,6 +66,6 @@ provisioner:
5166
playbooks:
5267
prepare: prepare.yml
5368
verifier:
54-
name: testinfra
69+
name: ansible
5570
lint:
56-
name: flake8
71+
name: ansible-lint

molecule/centos-7/prepare.yml

+22-8
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,25 @@
88
- name: cp -rfT /etc/skel /root
99
raw: |
1010
cp -rfT /etc/skel /root
11+
changed_when: false
12+
ignore_errors: true
13+
14+
- name: setenforce 0
15+
raw: |
16+
setenforce 0
17+
changed_when: false
1118
ignore_errors: true
1219

1320
- name: systemctl stop firewalld.service
1421
raw: |
1522
systemctl stop firewalld.service
23+
changed_when: false
1624
ignore_errors: true
1725

1826
- name: systemctl stop ufw.service
1927
raw: |
2028
systemctl stop ufw.service
29+
changed_when: false
2130
ignore_errors: true
2231

2332
- name: redhat-7 | subscription-manager register
@@ -26,21 +35,26 @@
2635
--username={{ lookup('env', 'REDHAT_USERNAME') }} \
2736
--password={{ lookup('env', 'REDHAT_PASSWORD') }} \
2837
--autosubscribe
38+
changed_when: false
2939
ignore_errors: true
3040

31-
- name: redhat | yum install -y ca-certificates curl python3 sudo
41+
- name: debian | apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
3242
raw: |
33-
yum install -y ca-certificates curl python3 sudo
43+
apt-get update
44+
apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
45+
changed_when: false
3446
ignore_errors: true
3547

36-
- name: suse | zypper -n install -y ca-certificates curl python3 sudo
48+
- name: redhat | yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
3749
raw: |
38-
zypper -n --gpg-auto-import-keys refresh
39-
zypper -n install -y ca-certificates curl python3 sudo
50+
yum makecache fast
51+
yum install -y ca-certificates curl gcc iproute python3 python3-devel sudo
52+
changed_when: false
4053
ignore_errors: true
4154

42-
- name: debian | apt-get install -y ca-certificates curl python3 sudo
55+
- name: suse | zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
4356
raw: |
44-
apt-get update
45-
apt-get install -y ca-certificates curl python3 sudo
57+
zypper -n --gpg-auto-import-keys refresh
58+
zypper -n install -y ca-certificates curl gcc iproute2 python3 python3-devel sudo
59+
changed_when: false
4660
ignore_errors: true

0 commit comments

Comments
 (0)