diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-09-13 21:10:40 +0800 |
|---|---|---|
| committer | Alex Yang <yangyang1@zte.com.cn> | 2017-09-21 09:12:58 +0800 |
| commit | 56975272e92efa3f5f6f719028dc147c1d90e9ce (patch) | |
| tree | 9a1b8fe1c6a4bf3c82e3fdefa5ef51efc829d2d7 /deploy/deploy.py | |
| parent | f29220417793f6cd7630ce6b1551b3e952da567b (diff) | |
Use pxe bridge to replace the bridge in VM template
1. Eliminate hard code about pxe bridge
2. Replace the bridge in daisy VM template with the pxe bridge
provided by jenkins
Change-Id: I7a8463181847417d10705ce9ff4db6e68d505c6d
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'deploy/deploy.py')
| -rw-r--r-- | deploy/deploy.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py index 71c39742..42a9d2f7 100644 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -11,11 +11,11 @@ # TODO: # [ ] 1. specify VM templates (Server, Controller & Compute) in deploy.yml # [ ] 2. specify network templates in deploy.yml -# [ ] 3. specify adapter(ipmi, libvirt) in deploy.yml -# [ ] 4. get ipmi user/password from PDF (Pod Descriptor File) -# [ ] 5. get pxe bridge from jjb -# [ ] 6. enlarge the vm size of Controller & Compute in deploy.yml -# [ ] 7. support scenarios options and configuration +# [x] 3. specify adapter(ipmi, libvirt) in deploy.yml +# [x] 4. get ipmi user/password from PDF (Pod Descriptor File) +# [x] 5. get pxe bridge from jjb +# [x] 6. enlarge the vm size of Controller & Compute in deploy.yml +# [x] 7. support scenarios options and configuration ############################################################################## import argparse @@ -85,11 +85,11 @@ class DaisyDeployment(object): self.adapter = self._get_adapter_info() LI('The adapter is %s' % self.adapter) - # TODO: modify the jjb code to provide bridge name + # Virtual deployment always uses 'daisy1' as default bridge. if self.adapter == 'libvirt': self.pxe_bridge = 'daisy1' - else: - self.pxe_bridge = 'br7' + + LI('Use %s as the bridge name in daisy deployment.' % self.pxe_bridge) self.daisy_server_info = self._get_daisy_server_info() |