Skip to content

Commit

Permalink
Merge pull request #162 from lemberg/feature/161-upgrade-mysql
Browse files Browse the repository at this point in the history
Update Ansible MySQL role geerlingguy.mysql to 3.0.0
  • Loading branch information
T2L committed Mar 2, 2020
2 parents 10ca37a + f6035f5 commit 6f0537e
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## Draft Environment 3.x.x (unreleased)

Updates:
- [GH-161](https://github.com/lemberg/draft-environment/issues/161) - Updated Ansible MySQL role to 3.0.0
- [GH-159](https://github.com/lemberg/draft-environment/issues/159) - Upgraded Molecule framework (2 => 3)
- [GH-157](https://github.com/lemberg/draft-environment/issues/157) - Switched to unofficial PPA for Vagrant on Travis; Vagrant 2.2.7 supports VirtualBox 6.1.x

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Dramatically increases disk IO on Windows by adding NFS support.
- [geerlingguy.mailhog @ 2.2.0](https://github.com/geerlingguy/ansible-role-mailhog/tree/2.2.0)
- git_config (internal)
- apache2 (internal)
- [geerlingguy.mysql @ 2.9.5](https://github.com/geerlingguy/ansible-role-mysql/tree/2.9.5)
- [geerlingguy.mysql @ 3.0.0](https://github.com/geerlingguy/ansible-role-mysql/tree/3.0.0)
- [T2L.php @ 1.2.1](https://github.com/T2L/ansible-role-php/tree/1.2.1)
- [T2L.composer @ 2.0.2](https://github.com/T2L/ansible-role-composer/tree/2.0.2)
- [T2L.java @ 1.2.0](https://github.com/T2L/ansible-role-java/tree/1.2.0)
Expand Down
3 changes: 3 additions & 0 deletions default.vm-settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ mysql_packages:
- mysql-common
- mysql-server

# If you need to explicitly set the MySQL Python package, you can set it here. If not set, it will default to `python-mysqldb` for Python 2 and `python3-mysqldb` for Python 3.
mysql_python_package_debian: ''

# MySQL connection settings.
mysql_port: "3306"
mysql_bind_address: '0.0.0.0'
Expand Down
14 changes: 13 additions & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@
become: true

pre_tasks:

- name: Ensure base packages are installed
apt:
name:
- libxml2-dev
- libxslt-dev
- python3-dev
- python3-lxml
- rsync
state: present
update_cache: true

- name: Add vagrant user
user:
name: vagrant
Expand Down Expand Up @@ -39,7 +51,7 @@
- ../../provisioning/roles/draft
- ../../provisioning/roles/git_config
- ../../provisioning/roles/apache2
- geerlingguy.mysql
- { role: geerlingguy.mysql, mysql_python_package_debian: python3-mysqldb }
- geerlingguy.mailhog
- T2L.php
- T2L.composer
Expand Down
2 changes: 1 addition & 1 deletion provisioning/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
- src: geerlingguy.mailhog
version: 2.2.0
- src: geerlingguy.mysql
version: 2.9.5
version: 3.0.0
- src: T2L.php
version: 1.2.1
- src: T2L.composer
Expand Down

0 comments on commit 6f0537e

Please sign in to comment.