diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-09-27 02:19:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-27 02:19:51 +0000 |
| commit | 591b723e3d962c7d118497bbad4570eab8217390 (patch) | |
| tree | ed51e801eae756db6f3f4360fd50980c38701612 /deploy/environment.py | |
| parent | b224ded409981b390df213309c2ed6eaca14fa4b (diff) | |
| parent | 6c26da419ff6fd6f82377e8e19187af37fe8d783 (diff) | |
Merge "Use pxe bridge to replace the bridge in VM template" into stable/euphrates
Diffstat (limited to 'deploy/environment.py')
| -rw-r--r-- | deploy/environment.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/deploy/environment.py b/deploy/environment.py index 5371e6ca..14240549 100644 --- a/deploy/environment.py +++ b/deploy/environment.py @@ -135,7 +135,6 @@ class BareMetalEnvironment(DaisyEnvironmentBase): def create_daisy_server_vm(self): # TODO: refactor the structure of deploy.yml, add VM template param of Daisy Server - # add self.pxe_bridge into the vm template if 'template' in self.deploy_struct: # get VM name of Daisy Server from the template template = self.deploy_struct['template'] @@ -144,7 +143,8 @@ class BareMetalEnvironment(DaisyEnvironmentBase): create_vm(template, name=self.daisy_server_info['name'], - disks=[self.daisy_server_info['image']]) + disks=[self.daisy_server_info['image']], + physical_bridge=self.pxe_bridge) def reboot_nodes(self, boot_dev=None): for node in self.deploy_struct['hosts']: @@ -203,7 +203,6 @@ class VirtualEnvironment(DaisyEnvironmentBase): def create_daisy_server_vm(self): # TODO: refactor the structure of deploy.yml, add VM template param of Daisy Server - # add self.pxe_bridge into the vm template if 'template' in self.deploy_struct: # get VM name of Daisy Server from the template template = self.deploy_struct['template'] |