- Change bin/* to match the deltacloud-configure equivalents
- Update bin/* to reference new pathes
- Update spec file to reflect new package name
---
Rakefile | 4 +-
bin/dc-install | 4 --
bin/dc-services | 4 --
bin/dc-uninstall | 4 --
bin/deltacloud-cleanup | 4 ++
bin/deltacloud-configure | 4 ++
bin/deltacloud-services | 4 ++
contrib/deltacloud-configure.spec | 76 +++++++++++++++++++++++++++++++++++++
contrib/deltacloud_recipe.spec | 73 -----------------------------------
9 files changed, 90 insertions(+), 87 deletions(-)
delete mode 100755 bin/dc-install
delete mode 100755 bin/dc-services
delete mode 100755 bin/dc-uninstall
create mode 100755 bin/deltacloud-cleanup
create mode 100755 bin/deltacloud-configure
create mode 100755 bin/deltacloud-services
create mode 100644 contrib/deltacloud-configure.spec
delete mode 100644 contrib/deltacloud_recipe.spec
diff --git a/Rakefile b/Rakefile
index 18ba513..f203717 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,8 +10,8 @@ YUM_REPO = "#{CURRENT_DIR}/repo"
CLEAN.include('pkg', 'build', 'repo')
CLOBBER.include('deltacloud')
-PKG_NAME = "deltacloud_recipe"
-RPM_SPEC = "contrib/deltacloud_recipe.spec"
+PKG_NAME = "deltacloud-configure"
+RPM_SPEC = "contrib/deltacloud-configure.spec"
# Build the rpm
rpm_task =
diff --git a/bin/dc-install b/bin/dc-install
deleted file mode 100755
index 8583232..0000000
--- a/bin/dc-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-puppet /usr/share/deltacloud-recipe/deltacloud_recipe.pp \
- --modulepath=/usr/share/deltacloud-recipe/modules/
diff --git a/bin/dc-services b/bin/dc-services
deleted file mode 100755
index 0612c33..0000000
--- a/bin/dc-services
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-puppet /usr/share/deltacloud-recipe/deltacloud_stop_services.pp \
- --modulepath=/usr/share/deltacloud-recipe/modules/
diff --git a/bin/dc-uninstall b/bin/dc-uninstall
deleted file mode 100755
index 02a99de..0000000
--- a/bin/dc-uninstall
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-puppet /usr/share/deltacloud-recipe/deltacloud_uninstall.pp \
- --modulepath=/usr/share/deltacloud-recipe/modules/
diff --git a/bin/deltacloud-cleanup b/bin/deltacloud-cleanup
new file mode 100755
index 0000000..a359fce
--- /dev/null
+++ b/bin/deltacloud-cleanup
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+puppet /usr/share/deltacloud-configure/deltacloud_uninstall.pp \
+ --modulepath=/usr/share/deltacloud-configure/modules/
diff --git a/bin/deltacloud-configure b/bin/deltacloud-configure
new file mode 100755
index 0000000..c034d4c
--- /dev/null
+++ b/bin/deltacloud-configure
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+puppet /usr/share/deltacloud-configure/deltacloud_recipe.pp \
+ --modulepath=/usr/share/deltacloud-configure/modules/
diff --git a/bin/deltacloud-services b/bin/deltacloud-services
new file mode 100755
index 0000000..0612c33
--- /dev/null
+++ b/bin/deltacloud-services
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+puppet /usr/share/deltacloud-recipe/deltacloud_stop_services.pp \
+ --modulepath=/usr/share/deltacloud-recipe/modules/
diff --git a/contrib/deltacloud-configure.spec
b/contrib/deltacloud-configure.spec
new file mode 100644
index 0000000..04ff82d
--- /dev/null
+++ b/contrib/deltacloud-configure.spec
@@ -0,0 +1,76 @@
+%define dchome /usr/share/deltacloud-configure
+%define pbuild %{_builddir}/%{name}-%{version}
+
+Summary: DeltaCloud Configure Puppet Recipe
+Name: deltacloud-configure
+Version: 2.0.0
+Release: 1%{?dist}
+
+Group: Applications/Internet
+License: GPLv2+
+URL: http://deltacloud.org
+Source0: %{name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}
+BuildArch: noarch
+Requires: puppet
+
+# To send a request to iwhd rest interface to
+# create buckets, eventually replace w/ an
+# iwhd client
+Requires: curl
+
+%description
+Deltacloud Configure Puppet Recipe
+
+%prep
+%setup -q
+
+%build
+
+%install
+rm -rf %{buildroot}
+%{__mkdir} -p %{buildroot}/%{dchome}/modules/deltacloud_recipe
%{buildroot}/%{_sbindir}
+%{__cp} -R %{pbuild}/recipes/deltacloud_recipe/deltacloud_recipe.pp
%{buildroot}/%{dchome}
+%{__cp} -R %{pbuild}/recipes/deltacloud_recipe/deltacloud_uninstall.pp
%{buildroot}/%{dchome}
+%{__cp} -R %{pbuild}/recipes/deltacloud_recipe/*/
%{buildroot}/%{dchome}/modules/deltacloud_recipe
+%{__cp} -R %{pbuild}/recipes/firewall/ %{buildroot}/%{dchome}/modules/firewall
+%{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{dchome}/modules/ntp
+%{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{dchome}/modules/postgres
+%{__cp} -R %{pbuild}/bin/deltacloud-configure %{buildroot}/%{_sbindir}/
+%{__cp} -R %{pbuild}/bin/deltacloud-cleanup %{buildroot}/%{_sbindir}/
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%attr(0755, root, root) %{_sbindir}/deltacloud-configure
+%attr(0755, root, root) %{_sbindir}/deltacloud-cleanup
+%{dchome}
+
+%changelog
+* Mon Jan 10 2011 Mike Orazi <[email protected]> 2.0.0-1
+- Make this a drop in replacement for the old deltacloud-configure scripts
+
+* Wed Dec 22 2010 Mohammed Morsi <[email protected]> 0.0.4-1
+- Revamp deltacloud recipe to make it more puppetized,
+ use general purpose firewall, postgres, ntp modules,
+ and to fix many various things
+
+* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.3-1
+- Renamed package from deltacloud appliance
+- to deltacloud recipe
+
+* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.2-3
+- Include curl-devel for typhoeus gem
+
+* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.2-2
+- Updated to pull in latest git changes
+
+* Fri Sep 17 2010 Mohammed Morsi <[email protected]> 0.0.2-1
+- Updated packages pulled in to latest versions
+- Various fixes
+- Added initial image warehouse bits
+
+* Thu Sep 02 2010 Mohammed Morsi <[email protected]> 0.0.1-1
+- Initial package
diff --git a/contrib/deltacloud_recipe.spec b/contrib/deltacloud_recipe.spec
deleted file mode 100644
index 9ad3a62..0000000
--- a/contrib/deltacloud_recipe.spec
+++ /dev/null
@@ -1,73 +0,0 @@
-%define dchome /usr/share/deltacloud-recipe
-%define pbuild %{_builddir}/%{name}-%{version}
-
-Summary: DeltaCloud Puppet Recipe
-Name: deltacloud_recipe
-Version: 0.0.4
-Release: 1%{?dist}
-
-Group: Applications/Internet
-License: GPLv2+
-URL: http://deltacloud.org
-Source0: %{name}-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}
-BuildArch: noarch
-Requires: puppet
-
-# To send a request to iwhd rest interface to
-# create buckets, eventually replace w/ an
-# iwhd client
-Requires: curl
-
-%description
-Deltacloud Puppet Recipe
-
-%prep
-%setup -q
-
-%build
-
-%install
-rm -rf %{buildroot}
-%{__mkdir} -p %{buildroot}/%{dchome}/modules/%{name} %{buildroot}/%{_sbindir}
-%{__cp} -R %{pbuild}/recipes/%{name}/deltacloud_recipe.pp
%{buildroot}/%{dchome}
-%{__cp} -R %{pbuild}/recipes/%{name}/deltacloud_uninstall.pp
%{buildroot}/%{dchome}
-%{__cp} -R %{pbuild}/recipes/%{name}/*/ %{buildroot}/%{dchome}/modules/%{name}
-%{__cp} -R %{pbuild}/recipes/firewall/ %{buildroot}/%{dchome}/modules/firewall
-%{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{dchome}/modules/ntp
-%{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{dchome}/modules/postgres
-%{__cp} -R %{pbuild}/bin/dc-install %{buildroot}/%{_sbindir}/
-%{__cp} -R %{pbuild}/bin/dc-uninstall %{buildroot}/%{_sbindir}/
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%attr(0755, root, root) %{_sbindir}/dc-install
-%attr(0755, root, root) %{_sbindir}/dc-uninstall
-%{dchome}
-
-%changelog
-* Wed Dec 22 2010 Mohammed Morsi <[email protected]> 0.0.4-1
-- Revamp deltacloud recipe to make it more puppetized,
- use general purpose firewall, postgres, ntp modules,
- and to fix many various things
-
-* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.3-1
-- Renamed package from deltacloud appliance
-- to deltacloud recipe
-
-* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.2-3
-- Include curl-devel for typhoeus gem
-
-* Wed Sep 29 2010 Mohammed Morsi <[email protected]> 0.0.2-2
-- Updated to pull in latest git changes
-
-* Fri Sep 17 2010 Mohammed Morsi <[email protected]> 0.0.2-1
-- Updated packages pulled in to latest versions
-- Various fixes
-- Added initial image warehouse bits
-
-* Thu Sep 02 2010 Mohammed Morsi <[email protected]> 0.0.1-1
-- Initial package
--
1.7.3.4
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
