x/monasca-vagrant
Code Issues Proposed changes

Moved to the monasca-notification cookbook

Browse Source 
Change-Id: Iff727dde0895c5737c49a184180e6f6e154afd33
This commit is contained in:
Tim Kuhlman 2014-07-16 16:15:22 -06:00
parent 5520c2e38c
commit 295606fcff
7 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Berksfile
View File

@ -10,7 +10,7 @@ cookbook 'ds-build', path: './cookbooks/ds-build'
cookbook 'mon_api', git: 'https://github.com/hpcloud-mon/cookbooks-mon_api' cookbook 'mon_api', git: 'https://github.com/hpcloud-mon/cookbooks-mon_api'
cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka' cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka'
cookbook 'mon_agent', git: 'https://github.com/hpcloud-mon/cookbooks-mon_agent' cookbook 'mon_agent', git: 'https://github.com/hpcloud-mon/cookbooks-mon_agent'
cookbook 'mon_notification', git: 'https://github.com/hpcloud-mon/cookbooks-mon_notification' cookbook 'monasca_notification', git: 'https://github.com/stackforge/cookbook-monasca-notification'
cookbook 'mon_persister', git: 'https://github.com/hpcloud-mon/cookbooks-mon_persister.git' cookbook 'mon_persister', git: 'https://github.com/hpcloud-mon/cookbooks-mon_persister.git'
cookbook 'mon_thresh', git: 'https://github.com/hpcloud-mon/cookbooks-mon_thresh' cookbook 'mon_thresh', git: 'https://github.com/hpcloud-mon/cookbooks-mon_thresh'
cookbook 'storm', git: 'https://github.com/tkuhlman/storm' cookbook 'storm', git: 'https://github.com/tkuhlman/storm'

0
data_bags/mon_notification/hosts.json → data_bags/monasca_notification/hosts.json
View File

2
roles/Mini-Mon.json
View File

@ -71,7 +71,7 @@
"recipe[kafka]", "recipe[kafka]",
"recipe[kafka::create_topics]", "recipe[kafka::create_topics]",
"recipe[mini-mon::postfix]", "recipe[mini-mon::postfix]",
"recipe[mon_notification]", "recipe[monasca_notification]",
"recipe[influxdb]", "recipe[influxdb]",
"recipe[mini-mon::influxdb]", "recipe[mini-mon::influxdb]",
"recipe[sysctl]", "recipe[sysctl]",

0
split/data_bags/mon_notification/hosts.json → split/data_bags/monasca_notification/hosts.json
View File

2
split/roles/Kafka.json
View File

@ -22,7 +22,7 @@
"recipe[kafka]", "recipe[kafka]",
"recipe[kafka::create_topics]", "recipe[kafka::create_topics]",
"recipe[mini-mon::postfix]", "recipe[mini-mon::postfix]",
"recipe[mon_notification]" "recipe[monasca_notification]"
], ],
"env_run_lists": { "env_run_lists": {
} }

2
tests/smoke.py
View File

@ -57,7 +57,7 @@ def wait_for_alarm_state_change(alarm_id, old_state):
def check_notifications(alarm_id, state_changes): def check_notifications(alarm_id, state_changes):
if not os.path.isfile('/etc/mon/notification.yaml'): if not os.path.isfile('/etc/monasca/notification.yaml'):
print('Notification Engine not installed on this VM,' + print('Notification Engine not installed on this VM,' +
' skipping Notifications test', ' skipping Notifications test',
file=sys.stderr) file=sys.stderr)

2
tests/utils.py
View File

@ -95,7 +95,7 @@ def create_mon_client():
def ensure_has_notification_engine(): def ensure_has_notification_engine():
if not os.path.isfile('/etc/mon/notification.yaml'): if not os.path.isfile('/etc/monasca/notification.yaml'):
print('Must be run on a VM with Notification Engine installed', print('Must be run on a VM with Notification Engine installed',
file=sys.stderr) file=sys.stderr)
return False return False