mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
Merge branch 'master' of opennebula.org:one
This commit is contained in:
commit
a8fc2c1529
3 files changed
+10
-4
No files matched your search
+1
-2
@@ -76,8 +76,7 @@ main_env.Append(LIBPATH=[
|
||||
# Compile flags
|
||||
main_env.Append(CPPFLAGS=[
|
||||
"-g",
|
||||
"-Wall",
|
||||
"-Werror",
|
||||
"-Wall"
|
||||
])
|
||||
|
||||
# Linking flags
|
||||
|
||||
@@ -50,8 +50,7 @@ main_env.Append(LIBPATH=[
|
||||
# Compile flags
|
||||
main_env.Append(CPPFLAGS=[
|
||||
"-g",
|
||||
"-Wall",
|
||||
"-Werror"
|
||||
"-Wall"
|
||||
])
|
||||
|
||||
# Linking flags
|
||||
|
||||
@@ -55,6 +55,7 @@ int XenDriver::deployment_description(
|
||||
|
||||
const VectorAttribute * nic;
|
||||
|
||||
string ip = "";
|
||||
string mac = "";
|
||||
string bridge = "";
|
||||
string model = "";
|
||||
@@ -346,6 +347,7 @@ int XenDriver::deployment_description(
|
||||
|
||||
file << " '";
|
||||
|
||||
ip = nic->vector_value("IP");
|
||||
mac = nic->vector_value("MAC");
|
||||
bridge = nic->vector_value("BRIDGE");
|
||||
model = nic->vector_value("MODEL");
|
||||
@@ -362,6 +364,12 @@ int XenDriver::deployment_description(
|
||||
pre_char = ',';
|
||||
}
|
||||
|
||||
if( !ip.empty() )
|
||||
{
|
||||
file << pre_char << "ip=" << ip;
|
||||
pre_char = ',';
|
||||
}
|
||||
|
||||
if( !bridge.empty() )
|
||||
{
|
||||
file << pre_char << "bridge=" << bridge;
|
||||
|
||||
Reference in new issue
Block a user