openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Remove sysctl element from overcloud image"

This commit is contained in:
Jenkins 2016-07-04 08:09:01 +00:00 committed by Gerrit Code Review
parent 7910d07dfc 01d9ece5b3
commit d8b00a9517
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,7 @@ class TestOvercloudImageBuild(TestPluginV1):
self.mock_disk_image_create.assert_called_once_with(
"-a amd64 -o "
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
"overcloud-compute overcloud-ceph-storage sysctl hosts "
"overcloud-compute overcloud-ceph-storage hosts "
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"os-net-config stable-interface-names grub2 "
@ -162,7 +162,7 @@ class TestOvercloudImageBuild(TestPluginV1):
self.mock_disk_image_create.assert_called_once_with(
"-a amd64 -o "
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
"overcloud-compute overcloud-ceph-storage sysctl hosts "
"overcloud-compute overcloud-ceph-storage hosts "
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"os-net-config stable-interface-names grub2 "

1
tripleoclient/v1/overcloud_image.py
View File

@ -170,7 +170,6 @@ class BuildOvercloudImage(command.Command):
TRIPLEOPUPPETELEMENTS = "/usr/share/tripleo-puppet-elements"
INSTACKUNDERCLOUDELEMENTS = "/usr/share/instack-undercloud"
PUPPET_COMMON_ELEMENTS = [
'sysctl',
'hosts',
'baremetal',
'dhcp-all-interfaces',