Merge "Remove sysctl element from overcloud image"
This commit is contained in:
commit
d8b00a9517
|
@ -118,7 +118,7 @@ class TestOvercloudImageBuild(TestPluginV1):
|
||||||
self.mock_disk_image_create.assert_called_once_with(
|
self.mock_disk_image_create.assert_called_once_with(
|
||||||
"-a amd64 -o "
|
"-a amd64 -o "
|
||||||
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
|
"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 "
|
"baremetal dhcp-all-interfaces os-collect-config "
|
||||||
"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 "
|
"os-net-config stable-interface-names grub2 "
|
||||||
|
@ -162,7 +162,7 @@ class TestOvercloudImageBuild(TestPluginV1):
|
||||||
self.mock_disk_image_create.assert_called_once_with(
|
self.mock_disk_image_create.assert_called_once_with(
|
||||||
"-a amd64 -o "
|
"-a amd64 -o "
|
||||||
"overcloud-full.qcow2 rhel7 overcloud-full overcloud-controller "
|
"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 "
|
"baremetal dhcp-all-interfaces os-collect-config "
|
||||||
"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 "
|
"os-net-config stable-interface-names grub2 "
|
||||||
|
|
|
@ -170,7 +170,6 @@ class BuildOvercloudImage(command.Command):
|
||||||
TRIPLEOPUPPETELEMENTS = "/usr/share/tripleo-puppet-elements"
|
TRIPLEOPUPPETELEMENTS = "/usr/share/tripleo-puppet-elements"
|
||||||
INSTACKUNDERCLOUDELEMENTS = "/usr/share/instack-undercloud"
|
INSTACKUNDERCLOUDELEMENTS = "/usr/share/instack-undercloud"
|
||||||
PUPPET_COMMON_ELEMENTS = [
|
PUPPET_COMMON_ELEMENTS = [
|
||||||
'sysctl',
|
|
||||||
'hosts',
|
'hosts',
|
||||||
'baremetal',
|
'baremetal',
|
||||||
'dhcp-all-interfaces',
|
'dhcp-all-interfaces',
|
||||||
|
|
Loading…
Reference in New Issue