From 526a35b663e9d97fcbde8f29b545239a70abc83c Mon Sep 17 00:00:00 2001 From: Rob Raymond Date: Tue, 11 Nov 2014 13:59:13 -0700 Subject: [PATCH] Reflect new location for config files Change-Id: I8400f1188b6348d50d1ae356ed98e482b9e6958a --- cookbooks/devstack/recipes/mon-ui.rb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cookbooks/devstack/recipes/mon-ui.rb b/cookbooks/devstack/recipes/mon-ui.rb index e528a4c..ed8801e 100644 --- a/cookbooks/devstack/recipes/mon-ui.rb +++ b/cookbooks/devstack/recipes/mon-ui.rb @@ -14,12 +14,9 @@ end # Set up symlinks # Use 'execute' resource because chef does not support symlinking directories if !::File.exists?("/opt/stack/horizon/monitoring") - execute "ln -sfv /usr/local/share/monasca/ui/enabled/* /opt/stack/horizon/openstack_dashboard/local/enabled/" + execute "ln -sfv /usr/local/lib/python2.7/dist-packages/monitoring/enabled/* /opt/stack/horizon/openstack_dashboard/local/enabled/" execute "ln -sv /usr/local/lib/python2.7/dist-packages/monitoring /opt/stack/horizon/monitoring" end -if ::File.readlines("/opt/stack/horizon/openstack_dashboard/local/local_settings.py").grep(/MONITORING_SERVICES/).size == 0 - execute "cat /usr/local/share/monasca/ui/local_settings.py >> /opt/stack/horizon/openstack_dashboard/local/local_settings.py" -end # install grafana and integrate with horizon if !::File.exists?("/usr/local/lib/python2.7/dist-packages/monitoring/static/grafana")