← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~harlowja/cloud-init:tpl-cloud-cfg into cloud-init:master

 

Largely seems ok.

A few things though:
 a.) seems unrelated to modify the rpm spec
 b.) what about setup.py? 
 c.) shouldnt' we 'git ignore config/cloud.cfg' ?


Diff comments:

> diff --git a/packages/redhat/cloud-init.spec.in b/packages/redhat/cloud-init.spec.in
> index d0ae048..9fb8721 100644
> --- a/packages/redhat/cloud-init.spec.in
> +++ b/packages/redhat/cloud-init.spec.in
> @@ -95,6 +95,10 @@ rm -rf \$RPM_BUILD_ROOT%{python_sitelib}/tests
>  mkdir -p \$RPM_BUILD_ROOT/%{_sharedstatedir}/cloud
>  mkdir -p \$RPM_BUILD_ROOT/%{_libexecdir}/%{name}
>  
> +# Remove these for now (not sure if they work)...

Unrelated change to the template, right ?

> +rm \$RPM_BUILD_ROOT/%{_sysconfdir}/NetworkManager/dispatcher.d/hook-network-manager
> +rm \$RPM_BUILD_ROOT/%{_sysconfdir}/dhcp/dhclient-exit-hooks.d/hook-dhclient
> +
>  #if $systemd
>  mkdir -p         \$RPM_BUILD_ROOT/%{_unitdir}
>  cp -p systemd/*  \$RPM_BUILD_ROOT/%{_unitdir}


-- 
https://code.launchpad.net/~harlowja/cloud-init/+git/cloud-init/+merge/307485
Your team cloud init development team is requested to review the proposed merge of ~harlowja/cloud-init:tpl-cloud-cfg into cloud-init:master.


References