Merge "Moved to using the update 1.8 style of role requirements"

README.md

@@ -42,16 +42,16 @@ brew tap phinze/cask
 brew install brew-cask
 brew cask install virtualbox 
 brew cask install vagrant
-brew install ansible
-ansible-galaxy install -r ansible_roles -p ./roles
+brew install ansible  # Version 1.8+ is required
+ansible-galaxy install -r requirements.yml -p ./roles
 ```
 
 #### Linux (Ubuntu)
 ```
 sudo apt-get install virtualbox
 #Download and install latest vagrant from http://www.vagrantup.com/downloads.html
-sudo pip install ansible
-ansible-galaxy install -r ansible_roles -p ./roles
+sudo pip install ansible  # Version 1.8+ is required
+ansible-galaxy install -r requirements.yml -p ./roles
 ```
 
 # Using mini-mon
@@ -84,7 +84,7 @@ Alternatively a very simple playbook is available for running the test, `ansible
 When someone updates the config, this process should allow you update the VMs, though not every step is needed at all times.
 
 - `git pull`
-- `ansible-galaxy install -r ansible_roles -p ./roles -f`
+- `ansible-galaxy install -r requirements.yml -p ./roles -f`
 - `vagrant box update` Only needed rarely
 - `vagrant provision`, if the vms where halted run `vagrant up` first.
   - It is also possible to Ansible directly to update just parts of the system. See [Ansible Development](#ansible-development) for more info.

ansible_roles

@@ -1,13 +0,0 @@
-tkuhlman.kafka
-tkuhlman.monasca-agent
-tkuhlman.monasca-api
-tkuhlman.monasca-keystone
-tkuhlman.monasca-notification
-tkuhlman.monasca-persister
-tkuhlman.monasca-schema
-tkuhlman.monasca-thresh
-tkuhlman.monasca-ui
-tkuhlman.percona
-tkuhlman.storm
-tkuhlman.zookeeper
-stympy.influxdb

devstack.yml

@@ -37,8 +37,8 @@
 
   roles:
     - {role: cacert, cacert_name: monasca_test_ca.crt, tags: [cacert]}
-    - {role: tkuhlman.monasca-ui, tags: [ui]}
-    - {role: tkuhlman.monasca-keystone, keystone_url: 'http://192.168.10.5:35357/v2.0', tags: [devstack, keystone]}  # uses keystone v2 still
+    - {role: monasca-ui, tags: [ui]}
+    - {role: monasca-keystone, keystone_url: 'http://192.168.10.5:35357/v2.0', tags: [devstack, keystone]}  # uses keystone v2 still
     - {role: monasca-devstack, tags: [devstack]}
-    - {role: tkuhlman.monasca-agent, tags: [agent]}
+    - {role: monasca-agent, tags: [agent]}
 

mini-mon.yml

@@ -22,10 +22,10 @@
     - name: Install python-dev
       apt: name=python-dev state=present
   roles:
-    - {role: tkuhlman.zookeeper, tags: [zookeeper]}
-    - {role: tkuhlman.kafka, kafka_listen_address: "{{mini_mon_host}}", tags: [kafka]}
-    - {role: stympy.influxdb, tags: [influxdb]}
-    - {role: tkuhlman.percona, mysql_root_password: password, percona_package: percona-xtradb-cluster-56, tags: [mysql, percona]}
+    - {role: zookeeper, tags: [zookeeper]}
+    - {role: kafka, kafka_listen_address: "{{mini_mon_host}}", tags: [kafka]}
+    - {role: influxdb, tags: [influxdb]}
+    - {role: percona, mysql_root_password: password, percona_package: percona-xtradb-cluster-56, tags: [mysql, percona]}
     - {role: cacert, cacert_name: monasca_test_ca.crt, tags: [cacert]}
 
 - name: Sets up schema and Installs Monasca apps
@@ -70,8 +70,8 @@
     storm_worker_ports: [6701, 6702]
     zookeeper_hosts: "{{mini_mon_host}}:2181"
   roles:
-    - {role: tkuhlman.monasca-schema, tags: [schema]}
-    - {role: tkuhlman.monasca-api,
+    - {role: monasca-schema, tags: [schema]}
+    - {role: monasca-api,
        api_region: useast,
        influxdb_user: mon_api,
        influxdb_password: password,
@@ -82,21 +82,21 @@
        mysql_user: monapi,
        mysql_password: password,
        tags: [api]}
-    - {role: tkuhlman.monasca-persister,
+    - {role: monasca-persister,
        influxdb_user: mon_persister,
        influxdb_password: password,
        tags: [persister]}
-    - {role: tkuhlman.monasca-notification,
+    - {role: monasca-notification,
        mysql_user: notification,
        mysql_password: password,
        smtp_host: localhost,
        tags: [notification]}
-    - {role: tkuhlman.storm, nimbus_host: "{{mini_mon_host}}", storm_nimbus_enabled: true, storm_supervisor_enabled: true, tags: [storm]}
-    - {role: tkuhlman.monasca-thresh,
+    - {role: storm, nimbus_host: "{{mini_mon_host}}", storm_nimbus_enabled: true, storm_supervisor_enabled: true, tags: [storm]}
+    - {role: monasca-thresh,
        mysql_user: thresh,
        mysql_password: password,
        tags: [thresh]}
-    - {role: tkuhlman.monasca-agent, tags: [agent]}
+    - {role: monasca-agent, tags: [agent]}
 
 - name: Define default alarms
   hosts: mini-mon

requirements.yml

@@ -0,0 +1,26 @@
+- src: tkuhlman.kafka
+  name: kafka
+- src: tkuhlman.monasca-agent
+  name: monasca-agent
+- src: tkuhlman.monasca-api
+  name: monasca-api
+- src: tkuhlman.monasca-keystone
+  name: monasca-keystone
+- src: tkuhlman.monasca-notification
+  name: monasca-notification
+- src: tkuhlman.monasca-persister
+  name: monasca-persister
+- src: tkuhlman.monasca-schema
+  name: monasca-schema
+- src: tkuhlman.monasca-thresh
+  name: monasca-thresh
+- src: tkuhlman.monasca-ui
+  name: monasca-ui
+- src: tkuhlman.percona
+  name: percona
+- src: tkuhlman.storm
+  name: storm
+- src: tkuhlman.zookeeper
+  name: zookeeper
+- src: https://github.com/tkuhlman/ansible-influxdb
+  name: influxdb