Skip to content
This repository has been archived by the owner on Jun 9, 2019. It is now read-only.

Commit

Permalink
Fix: ansible-galaxy minus to underscore
Browse files Browse the repository at this point in the history
  • Loading branch information
donvipre committed Jul 7, 2018
1 parent 808d79d commit 06e2320
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 32 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
# TODO: Build better testing for multiple containers and os support
language: python
python:
- "2.7"
Expand All @@ -12,6 +11,8 @@ addons:
apt:
packages:
- python-pip
- aspell
- aspell-en

install:
# Install ansible
Expand All @@ -22,16 +23,15 @@ install:
# Check ansible version
- ansible --version

# Create ansible.cfg with correct roles_path
- printf '[defaults]\nroles_path=../' >ansible.cfg

# Link github repo to ansible-galaxy name
- ln -s $PWD ../while-true-do.mariadb
- ln -s $PWD ../while_true_do.mariadb

# Run the tests
script:
- chmod +x tests/test.sh
- tests/test.sh
- chmod +x tests/test-ansible.sh
- tests/test-ansible.sh
- chmod +x tests/test-spelling.sh
- tests/test-spelling.sh

notifications:
webhooks:
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
Installing MariaDB together with "MySQL secure installation".

## Installation
Install from [Ansible Galaxy](https://galaxy.ansible.com/while-true-do.mariadb)
Install from [Ansible Galaxy](https://galaxy.ansible.com/while_true_do.mariadb)

```
ansible-galaxy install while-true-do.mariadb
ansible-galaxy install while_true_do.mariadb
```

Install from [Github](https://github.com/while-true-do/ansible-role-mariadb)

```
git clone https://github.com/while-true-do/ansible-role-mariadb.git while-true-do.mariadb
git clone https://github.com/while-true-do/ansible-role-mariadb.git while_true_do.mariadb
```

## Requirements
Expand All @@ -34,7 +34,7 @@ Module requirements

## Dependencies

This role depends on <https://galaxy.ansible.com/while-true-do/repo-mariadb>. You have to install the role:
This role depends on <https://galaxy.ansible.com/while_true_do/repo-mariadb>. You have to install the role:

```
ansible-galaxy install -r requirements.yml
Expand All @@ -55,7 +55,7 @@ You have to set a password for 'wtd_mariadb_root_password'.
# repository:
# - default -> will use the distribution specific repository
# - repo_mariadb -> will use the official upstream repository
# there is also a dependency to while-true-do.repo-mariadb
# there is also a dependency to while_true_do.repo-mariadb
#
# Also some common best practices are applied like innodb tuning, activating query cache and setting default charset to utf8m4
#
Expand Down Expand Up @@ -117,7 +117,7 @@ Simple Example:
```yaml
- hosts: servers
roles:
- { role: while-true-do.mariadb, wtd_mariadb_root_password: 'PASSWORD' }
- { role: while_true_do.mariadb, wtd_mariadb_root_password: 'PASSWORD' }
```
## Testing
Expand Down
5 changes: 2 additions & 3 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
dependencies:
- { role: while-true-do.repo-mariadb, when: wtd_mariadb_repository == "repo_mariadb" }
- { role: while_true_do.repo-mariadb, when: wtd_mariadb_repository == "repo_mariadb" }

galaxy_info:
author: while-true-do.org
description: This role installs and configures MariaDB
company: while-true-do.org

issue_tracker_url: https://github.com/while-true-do/ansible-role-mariadb/issues
github_branch: master
github_branch: master
license: BSD

min_ansible_version: 2.2
Expand Down
4 changes: 2 additions & 2 deletions requirements.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
# Install while-true-do.repo-mariadb from galaxy
- src: while-true-do.repo-mariadb
# Install while_true_do.repo-mariadb from galaxy
- src: while_true_do.repo-mariadb
13 changes: 0 additions & 13 deletions tests/test.sh

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
- hosts: localhost
remote_user: root
roles:
- while-true-do.mariadb
- while_true_do.mariadb

0 comments on commit 06e2320

Please sign in to comment.