Commit c696f223 authored by Thomas Goirand's avatar Thomas Goirand

Fix block-device list in ENC.

parent f7efa532
......@@ -18,6 +18,8 @@ openstack-cluster-installer (21) UNRELEASED; urgency=medium
* Add a cluster-show command.
* Add the setup of chrony on all machines, with customization of time server
host for the clock source.
* Fix block device list for swiftstore (statsd hostname was breaking it,
ordering was broken).
[ Oliver Chaze ]
* swift: do not log in syslog general logs
......
......@@ -256,9 +256,10 @@ function api_actions($con,$conf){
$network_cidr = $network["cidr"];
// Fetch all controllers
$enc_amhn .= " all_masters:\n";
$enc_amip .= " all_masters_ip:\n";
$enc_nids .= " all_masters_ids:\n";
$enc_amhn = " all_masters:\n";
$enc_amip = " all_masters_ip:\n";
$enc_nids = " all_masters_ids:\n";
$q = "SELECT machines.hostname AS hostname, machines.id AS nodeid, INET_NTOA(ips.ip) AS ipaddr FROM machines, ips, networks WHERE machines.role='controller' AND machines.cluster='$cluster_id' AND machines.id=ips.machine AND ips.network=networks.id AND networks.is_public='no' AND networks.role!='vm-net' AND networks.role!='ovs-bridge'";
$r = mysqli_query($con, $q);
if($r === FALSE){
......@@ -915,7 +916,6 @@ function api_actions($con,$conf){
$enc_file .= " network_cidr: $network_cidr\n";
$enc_file .= " zoneid: $machine_location\n";
$enc_file .= " block_devices:\n";
$enc_file .= " statsd_hostname: $cluster_statsd_hostname\n";
$q = "SELECT * FROM blockdevices WHERE machine_id='$machine_id' AND name NOT LIKE '%da'";
$r = mysqli_query($con, $q);
......@@ -931,6 +931,8 @@ function api_actions($con,$conf){
$enc_file .= " - $hdd_name\n";
}
$enc_file .= " statsd_hostname: $cluster_statsd_hostname\n";
$json = get_cluster_password($con, $conf, $cluster_id, 'swift', 'hashpathsuffix');
if($json["status"] != "success"){ return $json; }
$enc_file .= " pass_swift_hashpathsuffix: " . $json["data"] . "\n";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment