diff --git a/Berksfile b/Berksfile index 7a51ba9..ed64656 100644 --- a/Berksfile +++ b/Berksfile @@ -10,7 +10,7 @@ cookbook 'ds-build', path: './cookbooks/ds-build' cookbook 'mon_api', git: 'https://github.com/hpcloud-mon/cookbooks-mon_api' cookbook 'kafka', git: 'https://github.com/hpcloud-mon/cookbooks-kafka' 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_thresh', git: 'https://github.com/hpcloud-mon/cookbooks-mon_thresh' cookbook 'storm', git: 'https://github.com/tkuhlman/storm' diff --git a/data_bags/mon_notification/hosts.json b/data_bags/monasca_notification/hosts.json similarity index 100% rename from data_bags/mon_notification/hosts.json rename to data_bags/monasca_notification/hosts.json diff --git a/roles/Mini-Mon.json b/roles/Mini-Mon.json index d81aa9e..d71d4c4 100644 --- a/roles/Mini-Mon.json +++ b/roles/Mini-Mon.json @@ -71,7 +71,7 @@ "recipe[kafka]", "recipe[kafka::create_topics]", "recipe[mini-mon::postfix]", - "recipe[mon_notification]", + "recipe[monasca_notification]", "recipe[influxdb]", "recipe[mini-mon::influxdb]", "recipe[sysctl]", diff --git a/split/data_bags/mon_notification/hosts.json b/split/data_bags/monasca_notification/hosts.json similarity index 100% rename from split/data_bags/mon_notification/hosts.json rename to split/data_bags/monasca_notification/hosts.json diff --git a/split/roles/Kafka.json b/split/roles/Kafka.json index afdcd9c..f32aac4 100644 --- a/split/roles/Kafka.json +++ b/split/roles/Kafka.json @@ -22,7 +22,7 @@ "recipe[kafka]", "recipe[kafka::create_topics]", "recipe[mini-mon::postfix]", - "recipe[mon_notification]" + "recipe[monasca_notification]" ], "env_run_lists": { } diff --git a/tests/smoke.py b/tests/smoke.py index 4f2d7af..3c92016 100755 --- a/tests/smoke.py +++ b/tests/smoke.py @@ -57,7 +57,7 @@ def wait_for_alarm_state_change(alarm_id, old_state): 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,' + ' skipping Notifications test', file=sys.stderr) diff --git a/tests/utils.py b/tests/utils.py index 677edbc..b0434bc 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -95,7 +95,7 @@ def create_mon_client(): 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', file=sys.stderr) return False