NACK. I think this needs re-ordering/squashing. I believe we want to
gather up 2, 4, 5 of this series and treat them as an atomic unit.
On 12/01/2010 04:16 PM, Mohammed Morsi wrote:
> ---
> bin/dc-install | 2 +-
> bin/dc-services | 2 +-
> bin/dc-uninstall | 2 +-
> contrib/deltacloud_recipe.spec | 5 -----
> deltacloud_recipe/manifests/deltacloud.pp | 1 -
> 5 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/bin/dc-install b/bin/dc-install
> index efa1f5a..8583232 100755
> --- a/bin/dc-install
> +++ b/bin/dc-install
> @@ -1,4 +1,4 @@
> #!/bin/sh
>
> puppet /usr/share/deltacloud-recipe/deltacloud_recipe.pp \
> -
> --modulepath=/usr/share/deltacloud-recipe/modules/:/usr/share/ace/modules/
> + --modulepath=/usr/share/deltacloud-recipe/modules/
> diff --git a/bin/dc-services b/bin/dc-services
> index 415ba7b..0612c33 100755
> --- a/bin/dc-services
> +++ b/bin/dc-services
> @@ -1,4 +1,4 @@
> #!/bin/sh
>
> puppet /usr/share/deltacloud-recipe/deltacloud_stop_services.pp \
> -
> --modulepath=/usr/share/deltacloud-recipe/modules/:/usr/share/ace/modules/
> + --modulepath=/usr/share/deltacloud-recipe/modules/
> diff --git a/bin/dc-uninstall b/bin/dc-uninstall
> index 7cf4c69..02a99de 100755
> --- a/bin/dc-uninstall
> +++ b/bin/dc-uninstall
> @@ -1,4 +1,4 @@
> #!/bin/sh
>
> puppet /usr/share/deltacloud-recipe/deltacloud_uninstall.pp \
> -
> --modulepath=/usr/share/deltacloud-recipe/modules/:/usr/share/ace/modules/
> + --modulepath=/usr/share/deltacloud-recipe/modules/
> diff --git a/contrib/deltacloud_recipe.spec b/contrib/deltacloud_recipe.spec
> index 365d802..db645aa 100644
> --- a/contrib/deltacloud_recipe.spec
> +++ b/contrib/deltacloud_recipe.spec
> @@ -14,11 +14,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}
> BuildArch: noarch
> Requires: ruby
>
> -# We only leverage the firewall module from this,
> -# not worth the overhead of pulling this in, so
> -# we should implmenet our own
> -Requires: ace
> -
> # To send a request to iwhd rest interface to
> # create buckets, eventually replace w/ an
> # iwhd client
> diff --git a/deltacloud_recipe/manifests/deltacloud.pp
> b/deltacloud_recipe/manifests/deltacloud.pp
> index 0924075..8abb45b 100644
> --- a/deltacloud_recipe/manifests/deltacloud.pp
> +++ b/deltacloud_recipe/manifests/deltacloud.pp
> @@ -1,7 +1,6 @@
> # Deltacloud puppet definitions
>
> import "firewall"
> -
> import "postgres"
> import "rails"
> import "selinux"
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
