openstack/tripleo-image-elements
Code Issues Proposed changes

Add openstack-clients dependency

Browse Source 
Add dependency on openstack-clients element to correct
"Command not found" error. Also a little code clean up
so that it is more readable.

fixes bug 1196681
Change-Id: Id192e8c89fb48182d69171fc754b1bfeee145a3a
Authored-by: Chris Krelle <nobodycam@gmail.com>
This commit is contained in:
Chris Krelle 2013-06-28 11:18:50 -07:00
parent b70c2918cd
commit 59f898fc9a
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/nagios3/element-deps
View File

@ -3,3 +3,4 @@ os-refresh-config
heat-cfntools
postfix
apache2
openstack-clients

3
elements/nagios3/install.d/17-nagios
View File

@ -1,7 +1,4 @@
#!/bin/bash
# Install Nagios
set -eux
install-packages python-pip nagios3

7
elements/nagios3/os-refresh-config/post-configure.d/17-nagios
View File

@ -6,11 +6,8 @@ DEFAULTS=/etc/nagios3/nova_access_info
[ -e $DEFAULTS ] || exit 0
source $DEFAULTS
echo "defaults loaded."
# set the nagiosadmin web password
passwd_cmd="htpasswd -bc /etc/nagios3/htpasswd.users nagiosadmin $nagiosadmin_pass"
cmd_run=$($passwd_cmd)
get_ip_cmd="nova list | awk -F'|' '/$split_key/ { split(\$5,x,\"=\"); print x[2] }'"
nova_ip_list=$(eval $get_ip_cmd)
htpasswd -bc /etc/nagios3/htpasswd.users nagiosadmin $nagiosadmin_pass
nova_ip_list=$(nova list | awk -F"|" '/'$split_key'/ { split($7,x,"="); print x[2] }')
echo "Found $nova_ip_list"
for node_ip in $nova_ip_list
do