diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-09-25 06:07:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-25 06:07:13 +0000 |
| commit | fcbe5420d31bf04b1d8bdf47994c174795718e66 (patch) | |
| tree | 850910b866d69533dd1061ff598d2974d509f011 /deploy/environment.py | |
| parent | d6a3c3524894e40f2f1279fde8ff93cd1857e2b0 (diff) | |
| parent | 56975272e92efa3f5f6f719028dc147c1d90e9ce (diff) | |
Merge "Use pxe bridge to replace the bridge in VM template"
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'] |