openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Remove ntp element from overcloud images"

Browse Source
This commit is contained in:
Jenkins 2016-02-02 14:55:12 +00:00 committed by Gerrit Code Review
commit cff4ff4e38
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

@ -120,7 +120,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 ntp sysctl hosts "
"overcloud-compute overcloud-ceph-storage sysctl hosts "
"baremetal dhcp-all-interfaces os-collect-config "
"heat-config-puppet heat-config-script puppet-modules hiera "
"os-net-config stable-interface-names grub2 "
@ -165,7 +165,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 ntp sysctl hosts "
"overcloud-compute overcloud-ceph-storage sysctl 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

@ -186,7 +186,6 @@ class BuildOvercloudImage(command.Command):
'overcloud-controller',
'overcloud-compute',
'overcloud-ceph-storage',
'ntp',
] + PUPPET_COMMON_ELEMENTS
AGENT_DIB_EXTRA_ARGS = [