stackforge/puppet-openstack-cloud
Code Issues Proposed changes

drop path param

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-04 13:32:17 +01:00
parent 7aa33e29ac
commit 5653e58523
6 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/compute.pp
View File

@ -95,9 +95,8 @@ class cloud::compute(
# We check if DB tables are created, if not we populate Nova DB.
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'nova_db_sync':
command => 'nova-manage db sync',
path => '/usr/bin',
unless => "mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
command => '/usr/bin/nova-manage db sync',
unless => "/usr/bin/mysql nova -h ${nova_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
}
}

5
manifests/identity.pp
View File

@ -529,9 +529,8 @@ class cloud::identity (
# We check if DB tables are created, if not we populate Keystone DB.
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'keystone_db_sync':
command => 'keystone-manage db_sync',
path => '/usr/bin',
unless => "mysql keystone -h ${keystone_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
command => '/usr/bin/keystone-manage db_sync',
unless => "/usr/bin/mysql keystone -h ${keystone_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
}
@@haproxy::balancermember{"${::fqdn}-keystone_api":

2
manifests/image.pp
View File

@ -131,7 +131,7 @@ class cloud::image(
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'glance_db_sync':
command => '/usr/bin/glance-manage db_sync',
unless => '/usr/bin/mysql glance -e "show tables" | /bin/grep Tables'
unless => "/usr/bin/mysql glance -h ${glance_db_host} -u ${encoded_glance_user} -p${encoded_glance_password} -e \"show tables\" | /bin/grep Tables"
}
# TODO(EmilienM) For later, I'll also add internal network support in HAproxy for all OpenStack API, to optimize North / South network traffic

5
manifests/network/controller.pp
View File

@ -49,9 +49,8 @@ class cloud::network::controller(
# We check if DB tables are created, if not we populate Neutron DB.
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'neutron_db_sync':
command => 'neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
path => '/usr/bin',
unless => "mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
command => '/usr/bin/neutron-db-manage --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini upgrade head',
unless => "/usr/bin/mysql neutron -h ${neutron_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
}
@@haproxy::balancermember{"${::fqdn}-neutron_api":

5
manifests/orchestration.pp
View File

@ -56,9 +56,8 @@ class cloud::orchestration(
# We check if DB tables are created, if not we populate Heat DB.
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'heat_db_sync':
command => 'heat-manage --config-file /etc/heat/heat.conf db_sync',
path => '/usr/bin',
unless => "mysql heat -h ${heat_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
command => '/usr/bin/heat-manage --config-file /etc/heat/heat.conf db_sync',
unless => "/usr/bin/mysql heat -h ${heat_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
}
}

5
manifests/volume.pp
View File

@ -50,9 +50,8 @@ class cloud::volume(
# We check if DB tables are created, if not we populate Cinder DB.
# It's a hack to fit with our setup where we run MySQL/Galera
exec {'cinder_db_sync':
command => 'cinder-manage db sync',
path => '/usr/bin',
unless => "mysql cinder -h ${cinder_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
command => '/usr/bin/cinder-manage db sync',
unless => "/usr/bin/mysql cinder -h ${cinder_db_host} -u ${encoded_user} -p${encoded_password} -e \"show tables\" | grep Tables"
}
}