Fix untagged storage in ha_ceilometer_untag test

- Make storage network tagged to avoid two untagged networks
on one interface in ha_ceilometer_untag test

Change-Id: Ica95017202f35fd12d67ad7ef477e9993864e796
Closes-Bug: #1535248
This commit is contained in:
asledzinskiy 2016-01-19 17:52:15 +02:00
parent 2edc15eaa5
commit dbeea95118
1 changed files with 5 additions and 5 deletions

View File

@ -39,8 +39,8 @@ class MongoMultirole(TestBasic):
4. Add 3 controller
5. Add 1 compute
6. Add 3 mongo+cinder
7. Move Storage network to eth1
8. Move Management network to eth2 and untag it
7. Move Storage network to eth1 and specify vlan start
8. Move Management network to eth2 (it's untagged by default)
9. Verify networks
10. Deploy the environment
11. Verify networks
@ -84,7 +84,7 @@ class MongoMultirole(TestBasic):
)
self.show_step(7)
self.show_step(8)
vlan_turn_off = {'vlan_start': None}
vlan_turn_on = {'vlan_start': 102}
interfaces = {
iface_alias('eth0'): ['private'],
iface_alias('eth1'): ['storage', 'public'],
@ -98,8 +98,8 @@ class MongoMultirole(TestBasic):
for node in nailgun_nodes:
self.fuel_web.update_node_networks(node['id'], interfaces)
[net.update(vlan_turn_off) for net in nets
if net['name'] == 'management']
[net.update(vlan_turn_on) for net in nets
if net['name'] == 'storage']
self.fuel_web.client.update_network(cluster_id, networks=nets)
self.show_step(9)