Merge branch 'release/12.4.0-4alvistack2' into master

alvistack · Aug 26, 2020 · f2a28ac · f2a28ac
2 parents 86586ad + b163623
commit f2a28ac
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 # Docker Image Packaging for PostgreSQL
 
-## 12.3.0-XalvistackY - TBC
+## 12.4.0-XalvistackY - TBC
 
 ### Major Changes
 
+## 12.4.0-4alvistack2 - 2020-08-26
+
+### Major Changes
+
+  - Upgrade minimal Ansible Lint support to 4.3.2
   - Upgrade Travis CI test as Ubuntu Focal based
   - Upgrade minimal Ansible support to 2.10.0
 

diff --git a/requirements.txt b/requirements.txt
@@ -12,15 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ansible~=2.10.0a9
-ansible-lint~=4.3.0a6
+ansible>=2.10.0a9,<2.11.0
+ansible-lint>=4.3.2,<4.4.0
 ansible-runner
 ansible-runner-http
 argcomplete
 docker
 flake8
 jmespath
-molecule~=3.0.2
+molecule>=3.0.8,<3.1.0
 molecule-vagrant
 netaddr
 openshift

diff --git a/roles/catatonit b/roles/catatonit
diff --git a/roles/gosu b/roles/gosu
diff --git a/roles/locales b/roles/locales
diff --git a/roles/postgres b/roles/postgres
diff --git a/roles/python b/roles/python
diff --git a/roles/timezone b/roles/timezone
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
@@ -41,3 +41,6 @@ curl -skL https://bootstrap.pypa.io/get-pip.py | python3 - --prefix=/usr/local
 
 # Install PIP dependencies
 pip3 install --prefix=/usr/local --upgrade --ignore-installed --requirement requirements.txt
+
+# Install Ansible Collection dependencies
+ansible-galaxy collection install --force --requirements-file ansible-galaxy-requirements.yml
diff --git a/scripts/bootstrap-vagrant.sh b/scripts/bootstrap-vagrant.sh
@@ -22,27 +22,27 @@ cd "$(cd "$(dirname "$0")"; pwd -P)/../"
 if [ -x "$(command -v apt-get)" ]; then
     apt-get update
     apt-get install -y binutils bridge-utils dnsmasq-base ebtables libvirt-clients libvirt-daemon-system libvirt-dev make qemu-kvm qemu-utils ruby-dev
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.deb
-    dpkg -i vagrant_2.2.9_x86_64.deb
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.deb
+    dpkg -i vagrant_2.2.10_x86_64.deb
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare YUM dependencies
 if [ -x "$(command -v yum)" ]; then
     yum makecache
     yum install -y binutils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-img qemu-kvm ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    yum localinstall vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    yum localinstall vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Prepare Zypper dependencies
 if [ -x "$(command -v zypper)" ]; then
     zypper -n --gpg-auto-import-keys refresh
     zypper -n install -y binutils-gold bridge-utils dnsmasq ebtables libvirt libvirt-client libvirt-devel make qemu-kvm qemu-tools ruby-devel virt-install
-    curl -Os https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.rpm
-    zypper install vagrant_2.2.9_x86_64.rpm
-    rm -rf vagrant_2.2.9_*
+    curl -Os https://releases.hashicorp.com/vagrant/2.2.10/vagrant_2.2.10_x86_64.rpm
+    zypper install vagrant_2.2.10_x86_64.rpm
+    rm -rf vagrant_2.2.10_*
 fi
 
 # Install vagrant-libvirt