git://git.onelab.eu
/
plstackapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Controller replaces Deployment
[plstackapi.git]
/
opencloud.spec
diff --git
a/opencloud.spec
b/opencloud.spec
index
ad39606
..
31ab169
100644
(file)
--- a/
opencloud.spec
+++ b/
opencloud.spec
@@
-1,7
+1,7
@@
Summary: OpenCloud core services
Name: opencloud
Summary: OpenCloud core services
Name: opencloud
-Version: 1.0.2
3
-Release:
0
+Version: 1.0.2
8
+Release:
5
License: GPL+
Group: Development/Tools
Source0: %{_tmppath}/%{name}-%{version}.tar.gz
License: GPL+
Group: Development/Tools
Source0: %{_tmppath}/%{name}-%{version}.tar.gz
@@
-18,7
+18,7
@@
requires: tar
requires: gcc
requires: python-httplib2
requires: GeoIP
requires: gcc
requires: python-httplib2
requires: GeoIP
-requires:
python-keyczar
+requires:
wget
%description
%{summary}
%description
%{summary}
@@
-30,7
+30,7
@@
requires: python-keyczar
# Empty section.
%pre
# Empty section.
%pre
-#pip-python install django==1.5
+pip-python install django==1.7
pip-python install djangorestframework
pip-python install markdown # Markdown support for the browseable API.
pip-python install pyyaml # YAML content-type support.
pip-python install djangorestframework
pip-python install markdown # Markdown support for the browseable API.
pip-python install pyyaml # YAML content-type support.
@@
-48,12
+48,20
@@
pip-python install django-evolution
pip-python install django-bitfield
pip-python install django-ipware
pip-python install django-encrypted-fields
pip-python install django-bitfield
pip-python install django-ipware
pip-python install django-encrypted-fields
+pip-python install python-keyczar
+pip-python install python-keystoneclient
+pip-python install python-novaclient
+pip-python install python-neutronclient
+pip-python install python-glanceclient
+
easy_install django_evolution
easy_install python_gflags
easy_install google_api_python_client
easy_install django_evolution
easy_install python_gflags
easy_install google_api_python_client
-wget -P /usr/lib/python2.7/site-packages/suit/static/suit/js http://code.jquery.com/jquery-1.9.1.min.js
+if [ ! -f /usr/lib/python2.7/site-packages/suit/static/suit/js/jquery-1.9.1.min.js ]; then
+ wget -P /usr/lib/python2.7/site-packages/suit/static/suit/js http://code.jquery.com/jquery-1.9.1.min.js
+fi
if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then
rm -f /usr/share/GeoIP/GeoLiteCity.*
if [ ! -f /usr/share/GeoIP/GeoLiteCity.dat ]; then
rm -f /usr/share/GeoIP/GeoLiteCity.*
@@
-96,6
+104,7
@@
comm -13 %{_tmppath}/config-files.sorted %{_tmppath}/tmp-filelist.sorted > %{_tm
cp %{_tmppath}/tmp-filelist /tmp/tmp-filelist
cp %{_tmppath}/tmp-filelist /tmp/tmp-filelist
+
%clean
rm -rf %{buildroot}
%clean
rm -rf %{buildroot}
@@
-103,18
+112,35
@@
rm -rf %{buildroot}
%defattr(-,root,root,-)
%config /opt/planetstack/plstackapi_config
%config /opt/planetstack/deployment_auth.py
%defattr(-,root,root,-)
%config /opt/planetstack/plstackapi_config
%config /opt/planetstack/deployment_auth.py
+%config /opt/planetstack/model-deps
%post
ln -s ec2_observer /opt/planetstack/observer
ln -s config-opencloud.py /opt/planetstack/syndicate_observer/syndicatelib_config/config.py
%post
ln -s ec2_observer /opt/planetstack/observer
ln -s config-opencloud.py /opt/planetstack/syndicate_observer/syndicatelib_config/config.py
+if [ ! -e /opt/planetstack/public_keys ]; then
+ cd /opt/planetstack
+ scripts/opencloud genkeys
+fi
+
if [ "$1" == 1 ] ; then
echo "NEW INSTALL - initializing database"
/opt/planetstack/scripts/opencloud initdb
else
if [ "$1" == 1 ] ; then
echo "NEW INSTALL - initializing database"
/opt/planetstack/scripts/opencloud initdb
else
- echo "UPGRADE - doing evolution"
+ # scripts/opencloud will choose evolve or migrate depending on django version
+ echo "UPGRADE - doing evolution/migration"
/opt/planetstack/scripts/opencloud evolvedb
fi
/opt/planetstack/scripts/opencloud evolvedb
fi
+
+# Clone ansible with latest openstack modules
+git clone --recursive git://github.com/ansible/ansible.git /opt/ansible
+mkdir -p /etc/ansible
+echo > /etc/ansible/hosts << "EOF"
+[localhost]
+127.0.0.1
+EOF
+
+
# start the server
/opt/planetstack/scripts/opencloud runserver
# start the server
/opt/planetstack/scripts/opencloud runserver