openstack
/
sahara
Code Issues Proposed changes

Merge "Fix scaling with Heat and Neutron"

This commit is contained in:
Jenkins 2014-10-04 07:59:12 +00:00 committed by Gerrit Code Review
parent 2637625a1e 4e9c29facb
commit f80cc70959
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sahara/resources/neutron-port.heat
View File

@ -2,6 +2,7 @@
"Type" : "OS::Neutron::Port",
"Properties" : {
%(security_groups)s
"network_id" : "%(fixed_net_id)s"
"network_id" : "%(fixed_net_id)s",
"replacement_policy": "AUTO"
}
}

11
sahara/tests/unit/resources/test_serialize_resources_aa.heat
View File

@ -13,7 +13,8 @@
"cluster-worker-001-port" : {
"Type" : "OS::Neutron::Port",
"Properties" : {
"network_id" : "private_net"
"network_id" : "private_net",
"replacement_policy": "AUTO"
}
},
"cluster-worker-001-floating" : {
@ -41,7 +42,8 @@
"cluster-worker-002-port" : {
"Type" : "OS::Neutron::Port",
"Properties" : {
"network_id" : "private_net"
"network_id" : "private_net",
"replacement_policy": "AUTO"
}
},
"cluster-worker-002-floating" : {
@ -69,7 +71,8 @@
"cluster-master-001-port" : {
"Type" : "OS::Neutron::Port",
"Properties" : {
"network_id" : "private_net"
"network_id" : "private_net",
"replacement_policy": "AUTO"
}
},
"cluster-master-001-floating" : {
@ -96,4 +99,4 @@
},
"Outputs" : {}
}
}

8
sahara/tests/unit/resources/test_serialize_resources_use_neutron.heat
View File

@ -6,7 +6,8 @@
"cluster-worker-001-port" : {
"Type" : "OS::Neutron::Port",
"Properties" : {
"network_id" : "private_net"
"network_id" : "private_net",
"replacement_policy": "AUTO"
}
},
"cluster-worker-001-floating" : {
@ -63,7 +64,8 @@
"cluster-master-001-port" : {
"Type" : "OS::Neutron::Port",
"Properties" : {
"network_id" : "private_net"
"network_id" : "private_net",
"replacement_policy": "AUTO"
}
},
"cluster-master-001-floating" : {
@ -90,4 +92,4 @@
},
"Outputs" : {}
}
}