Merge pull request #57 from cloudalchemy/molecule2

upgrade to molecule 2.x

Author: Jesse Pretorius

.travis.yml

@@ -8,9 +8,9 @@ env:
   - ANSIBLE='ansible>=2.4.0,<2.5.0'
   - ANSIBLE='ansible>=2.5.0,<2.6.0'
 install:
-  - pip install ${ANSIBLE} 'ansible-lint>=3.4.15' 'molecule==1.25.0' docker git-semver 'testinfra>=1.7.0,<=1.10.1'
+  - pip install ${ANSIBLE} 'ansible-lint>=3.4.15' 'molecule>=2.13.0' docker git-semver 'testinfra>=1.7.0'
 script:
-  - molecule test
+  - molecule test --all
 deploy:
   provider: script
   skip_cleanup: true

.travis/images.sh

@@ -0,0 +1,14 @@
+extends: default
+ignore: |
+  .travis/
+  .travis.yml
+  meta/
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  line-length: disable

.yamllint

@@ -4,9 +4,13 @@ This document provides an overview of how you can participate in improving this
 
 ## Communication
 
+### IRC
+
+You can talk with us on #cloudalchemy channel on freenode.
+
 ### GitHub repositories
 
-Much of the issues, goals and ideas are tracked in the respective projects in GitHub. Please use this channel to report bugs and post ideas.
+Much of the issues, goals and ideas are tracked in the respective projects in GitHub. Please use this channel to report bugs.
 
 ## git and GitHub
 
@@ -28,7 +32,15 @@ Some great guidelines can be found [here](https://wiki.openstack.org/wiki/GitCom
 
 ## Releases
 
-Generally we try to stick to semantic versioning, where every accepted PR is treated as patch or minor feature and version is released accordingly by our CI pipeline.
+We try to stick to semantic versioning and our releases are made by CI pipeline. It is done by assigning a keyword (in a way similar to travis [`[ci skip]`](https://docs.travis-ci.com/user/customizing-the-build#Skipping-a-build)) to a commit with merge request. Available keywords are (square brackets are important!):
+ 
+* `[patch]`, `[fix]` - for PATCH version release
+* `[minor]`, `[feature]`, `[feat]` - for MINOR version release
+* `[major]`, `[breaking change]` - for MAJOR version release
+ 
+## Changelog
+ 
+Changelog is generateg automatically on every merged Pull Request and all information is taken from github issues, PRs and labels.
 
 ## Expectations
 
@@ -45,13 +57,16 @@ We try to provide production ready ansible roles which should be as much zero-co
 
 ### Add tests
 
-We try to have as much tests written in testinfra framework as possible, so when you copy file, some template or starting some server just add couple of lines in [/tests/test)default.py](test_default.py) file. If you want to know how to write tests in testinfra, go to their [docs](http://testinfra.readthedocs.io/en/latest/index.html).
+Currently we are using two test scenarios located in [/molecule](molecule) directory. First ([default](molecule/default/molecule.yml)) one is testing default configuration without any additional variables, second one ([alternative](molecule/alternative/molecule.yml)) is testing what happens when many variables from [/defaults/main.yml](defaults/main.yml) are changed. When adding new functionalities please add tests to proper scenarios. Tests are written in testinfra framework and are located in `/tests` subdirectory of scenario directory (for example default tests are in [/molecule/default/tests](molecule/default/tests)).
+More information about:
+  - [testinfra](http://testinfra.readthedocs.io/en/latest/index.html)
+  - [molecule](https://molecule.readthedocs.io/en/latest/index.html)
 
 ### Follow best practices
 
 Please follow [ansible best practices](http://docs.ansible.com/ansible/latest/playbooks_best_practices.html) and especially provide meaningful names to tasks and even comments where needed.
 
-Our test framework automatically lints code with [`ansible-lint`](https://github.com/willthames/ansible-lint) command so be sure to follow it's rules.
+Our test framework automatically lints code with [`yamllint`](https://yamllint.readthedocs.io) and [`ansible-lint`](https://github.com/willthames/ansible-lint) programs so be sure to follow their rules.
 
 Remember: Code is generally read much more often than written.
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2018 Pawel Krupa and Roman Demachkovych
+Copyright (c) 2017-2018 Pawel Krupa, Roman Demachkovych
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE

@@ -72,17 +72,21 @@ We provide demo site for full monitoring solution based on prometheus and grafan
 
 ## Local Testing
 
-The preferred way of locally testing the role is to use Docker and [molecule](https://github.com/metacloud/molecule) (v1.25). You will have to install Docker on your system. See Get started for a Docker package suitable to for your system.
+The preferred way of locally testing the role is to use Docker and [molecule](https://github.com/metacloud/molecule) (v2.x). You will have to install Docker on your system. See Get started for a Docker package suitable to for your system.
 All packages you need to can be specified in one line:
 ```sh
-pip install ansible 'ansible-lint>=3.4.15' 'molecule==1.25.0' docker 'testinfra>=1.7.0,<=1.10.1'
+pip install ansible 'ansible-lint>=3.4.15' 'molecule>2.13.0' docker 'testinfra>=1.7.0' jmespath
 ```
-This should be similiar to one listed in `.travis.yml` file in `install` section. 
+This should be similar to one listed in `.travis.yml` file in `install` section.
 After installing test suit you can run test by running
 ```sh
-molecule test
+molecule test --all
 ```
-For more information about molecule go to their [docs](http://molecule.readthedocs.io/en/stable-1.25/).
+For more information about molecule go to their [docs](http://molecule.readthedocs.io/en/latest/).
+
+## Travis CI
+
+Combining molecule and travis CI allows us to test how new PRs will behave when used with multiple ansible versions and multiple operating systems. This also allows use to create test scenarios for different role configurations. As a result we have a quite large test matrix (42 parallel role executions in case of [ansible-prometheus](https://github.com/cloudalchemy/ansible-prometheus)) which will take more time than local testing, so please be patient.
 
 ## Contributing
 

README.md

@@ -21,7 +21,7 @@ grafana_server:
   socket: ""
   cert_key: ""
   cert_file: ""
-  enable_gzip: False
+  enable_gzip: false
   static_root_path: public
   router_logging: false
 
@@ -34,7 +34,7 @@ grafana_security:
 #  login_remember_days: 7
 #  cookie_username: grafana_user
 #  cookie_remember_name: grafana_remember
-#  disable_gravatar: True
+#  disable_gravatar: true
 #  data_source_proxy_whitelist:
 
 # Database setup
@@ -52,17 +52,17 @@ grafana_database:
 #  log_queries: ""
 
 # User management and registration
-grafana_welcome_email_on_sign_up: False
+grafana_welcome_email_on_sign_up: false
 grafana_users:
-  allow_sign_up: False
-#  allow_org_create: True
-#  auto_assign_org: True
+  allow_sign_up: false
+  # allow_org_create: true
+  # auto_assign_org: true
   auto_assign_org_role: Viewer
-#  login_hint: "email or username"
+  # login_hint: "email or username"
   default_theme: dark
-#  external_manage_link_url: ""
-#  external_manage_link_name: ""
-#  external_manage_info: ""
+  # external_manage_link_url: ""
+  # external_manage_link_name: ""
+  # external_manage_info: ""
 
 # grafana authentication mechanisms
 grafana_auth: {}
@@ -74,14 +74,14 @@ grafana_auth: {}
 #  ldap:
 #    config_file: "/etc/grafana/ldap.toml"
 #    allow_sign_up: False
-#  basic: True
+#  basic: true
 
 grafana_session: {}
 #  provider: file
 #  provider_config: "sessions"
 
 grafana_analytics: {}
-#  reporting_enabled: True
+#  reporting_enabled: true
 #  google_analytics_ua_id: ""
 
 # Set this for mail notifications
@@ -92,7 +92,7 @@ grafana_smtp: {}
 #  from_address:
 
 # Enable grafana alerting mechanism
-grafana_alerting: True
+grafana_alerting: true
 
 # Internal grafana metrics system
 grafana_metrics: {}
@@ -109,10 +109,10 @@ grafana_tracing: {}
 #  sampler_param: 1
 
 grafana_snapshots: {}
-#  external_enabled: True
+#  external_enabled: true
 #  external_snapshot_url: "https://snapshots-origin.raintank.io"
 #  external_snapshot_name: "Publish to snapshot.raintank.io"
-#  snapshot_remove_expired: True
+#  snapshot_remove_expired: true
 #  snapshot_TTL_days: 90
 
 # External image store

defaults/main.yml

@@ -0,0 +1,54 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: bionic
+    image: paulfantom/ubuntu-molecule:18.04
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: xenial
+    image: paulfantom/ubuntu-molecule:16.04
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: stretch
+    image: paulfantom/debian-molecule:9
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: jessie
+    image: paulfantom/debian-molecule:8
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: centos7
+    image: paulfantom/centos-molecule:7
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+  - name: fedora
+    image: paulfantom/fedora-molecule:27
+    privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+  playbooks:
+    create: ../default/create.yml
+    prepare: ../default/prepare.yml
+    converge: playbook.yml
+    destroy: ../default/destroy.yml
+scenario:
+  name: alternative
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+    enabled: true

molecule.yml

@@ -0,0 +1,45 @@
+---
+- hosts: all
+  any_errors_fatal: true
+  roles:
+    - ansible-grafana
+  vars:
+    grafana_version: 5.1.0
+    grafana_security:
+      admin_user: admin
+      admin_password: "password"
+    grafana_address: "127.0.0.1"
+    grafana_auth:
+      disable_login_form: false
+      disable_signout_menu: false
+      anonymous:
+        org_name: "Main Organization"
+        org_role: Viewer
+      basic: true
+    grafana_api_keys:
+      - name: "admin"
+        role: "Admin"
+      - name: "viewer"
+        role: "Viewer"
+      - name: "editor"
+        role: "Editor"
+    grafana_api_keys_dir: "/tmp/grafana/keys"
+    grafana_plugins:
+      - raintank-worldping-app
+    grafana_dashboards:
+      - dashboard_id: '1860'
+        revision_id: '4'
+        datasource: 'Prometheus'
+      - dashboard_id: '358'
+        revision_id: '1'
+        datasource: 'Prometheus'
+    grafana_datasources:
+      - name: "Prometheus"
+        type: "prometheus"
+        access: "proxy"
+        url: "http://prometheus.mydomain"
+        basicAuth: true
+        basicAuthUser: "admin"
+        basicAuthPassword: "password"
+        isDefault: true
+        jsonData: '{"tlsAuth":false,"tlsAuthWithCACert":false,"tlsSkipVerify":true}'