openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Install cisco networking packages"

This commit is contained in:
Brad P. Crochet 2015-09-03 17:57:27 +02:00 committed by Gerrit Code Review
parent abd32f923c 9de8cfc8bc
commit 646028f82e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rdomanager_oscplugin/tests/v1/overcloud_image/test_overcloud_image.py
View File

@ -112,7 +112,8 @@ class TestOvercloudImageBuild(TestPluginV1):
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"os-net-config stable-interface-names grub2-deprecated "
"-p python-psutil,python-debtcollector,plotnetcfg,sos "
"-p python-psutil,python-debtcollector,plotnetcfg,sos,"
"python-cisco-networking,python-UcsSdk "
"element-manifest network-gateway epel rdo-release "
"undercloud-package-install "
"pip-and-virtualenv-override 2>&1 | tee dib-overcloud-full.log")

3
rdomanager_oscplugin/v1/overcloud_image.py
View File

@ -52,7 +52,8 @@ class BuildOvercloudImage(command.Command):
'os-net-config',
'stable-interface-names',
'grub2-deprecated',
'-p python-psutil,python-debtcollector,plotnetcfg,sos',
'-p python-psutil,python-debtcollector,plotnetcfg,sos,'
'python-cisco-networking,python-UcsSdk'
]
OVERCLOUD_FULL_DIB_EXTRA_ARGS = [