openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "fix cisco networking rpm name"

This commit is contained in:
Jenkins 2015-10-13 08:00:10 +00:00 committed by Gerrit Code Review
parent d9b54d6c52 76f05eaac6
commit 853aace442
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/tests/v1/overcloud_image/test_overcloud_image.py
View File

@ -124,7 +124,7 @@ class TestOvercloudImageBuild(TestPluginV1):
"heat-config-puppet heat-config-script puppet-modules hiera " "heat-config-puppet heat-config-script puppet-modules hiera "
"os-net-config stable-interface-names grub2-deprecated " "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 " "python-networking-cisco,python-UcsSdk "
"element-manifest network-gateway epel rdo-release " "element-manifest network-gateway epel rdo-release "
"undercloud-package-install " "undercloud-package-install "
"pip-and-virtualenv-override 2>&1 | tee dib-overcloud-full.log") "pip-and-virtualenv-override 2>&1 | tee dib-overcloud-full.log")

2
tripleoclient/v1/overcloud_image.py
View File

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