openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Replace agent elements with package python-heat-agent-puppet"

This commit is contained in:
Jenkins 2016-09-08 09:03:26 +00:00 committed by Gerrit Code Review
parent d490fd2794 b0f8708bc5
commit 817f84d043
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,13 +120,13 @@ class TestOvercloudImageBuild(TestPluginV1):
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
"overcloud-compute overcloud-ceph-storage hosts "
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"puppet-modules hiera "
"os-net-config stable-interface-names grub2 "
"-p python-psutil,python-debtcollector,plotnetcfg,sos,"
"python-networking-cisco,python-UcsSdk,"
"device-mapper-multipath,python-networking-bigswitch,"
"openstack-neutron-bigswitch-lldp,"
"openstack-neutron-bigswitch-agent "
"openstack-neutron-bigswitch-agent,python-heat-agent-puppet "
"dynamic-login element-manifest network-gateway epel "
"enable-packages-install "
"pip-and-virtualenv-override --min-tmpfs 5 2>&1 | "
@ -164,13 +164,13 @@ class TestOvercloudImageBuild(TestPluginV1):
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
"overcloud-compute overcloud-ceph-storage hosts "
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"puppet-modules hiera "
"os-net-config stable-interface-names grub2 "
"-p python-psutil,python-debtcollector,plotnetcfg,sos,"
"python-networking-cisco,python-UcsSdk,"
"device-mapper-multipath,python-networking-bigswitch,"
"openstack-neutron-bigswitch-lldp,"
"openstack-neutron-bigswitch-agent "
"openstack-neutron-bigswitch-agent,python-heat-agent-puppet "
"dynamic-login element-manifest network-gateway epel "
"enable-packages-install "
"pip-and-virtualenv-override overcloud-network-midonet "

5
tripleoclient/v1/overcloud_image.py
View File

@ -176,8 +176,6 @@ class BuildOvercloudImage(command.Command):
'baremetal',
'dhcp-all-interfaces',
'os-collect-config',
'heat-config-puppet',
'heat-config-script',
'puppet-modules',
'hiera',
'os-net-config',
@ -186,7 +184,7 @@ class BuildOvercloudImage(command.Command):
'-p python-psutil,python-debtcollector,plotnetcfg,sos,'
'python-networking-cisco,python-UcsSdk,device-mapper-multipath,'
'python-networking-bigswitch,openstack-neutron-bigswitch-lldp,'
'openstack-neutron-bigswitch-agent'
'openstack-neutron-bigswitch-agent,python-heat-agent-puppet'
]
OVERCLOUD_FULL_DIB_EXTRA_ARGS = [
@ -268,7 +266,6 @@ class BuildOvercloudImage(command.Command):
self.TRIPLEOPUPPETELEMENTS,
self.INSTACKUNDERCLOUDELEMENTS,
'/usr/share/tripleo-image-elements',
'/usr/share/openstack-heat-templates/'
'software-config/elements',
])),
help=_("Full elements path, separated by %s") % os.pathsep,