From: Sapan Bhatia Date: Fri, 14 Nov 2014 20:27:33 +0000 (-0500) Subject: Added a default model-deps for bootstrapping. Move ansible install to X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=5bc0fb63a28f136bc8590712c59ff5b2d4c083ca Added a default model-deps for bootstrapping. Move ansible install to post. --- diff --git a/opencloud.spec b/opencloud.spec index 6d79ed5..e67b63b 100644 --- a/opencloud.spec +++ b/opencloud.spec @@ -104,13 +104,6 @@ comm -13 %{_tmppath}/config-files.sorted %{_tmppath}/tmp-filelist.sorted > %{_tm cp %{_tmppath}/tmp-filelist /tmp/tmp-filelist -# 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 %clean rm -rf %{buildroot} @@ -119,6 +112,7 @@ rm -rf %{buildroot} %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 @@ -138,6 +132,15 @@ else /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 diff --git a/planetstack/model-deps b/planetstack/model-deps new file mode 100644 index 0000000..68a4889 --- /dev/null +++ b/planetstack/model-deps @@ -0,0 +1,104 @@ +{ + "Slice": [ + "Site", + "Service", + "ServiceClass" + ], + "ImageDeployments": [ + "Image", + "Deployment" + ], + "ReservedResource": [ + "Sliver" + ], + "NetworkSlice": [ + "Network", + "Slice" + ], + "Charge": [ + "Account", + "Slice", + "Invoice" + ], + "SliceDeployments": [ + "Slice", + "Deployment" + ], + "Sliver": [ + "Image", + "Slice", + "Node" + ], + "Node": [ + "Site", + "Deployment" + ], + "UserDashboardView": [ + "User", + "DashboardView" + ], + "Tag": [ + "Service" + ], + "User": [ + "Site" + ], + "SliceTag": [ + "Slice" + ], + "Reservation": [ + "Slice" + ], + "ServiceResource": [ + "ServiceClass" + ], + "Payment": [ + "Account" + ], + "UserDeployments": [ + "User", + "Deployment" + ], + "Account": [ + "Site" + ], + "ServiceAttribute": [ + "Service" + ], + "SlicePrivilege": [ + "User", + "Slice", + "Role" + ], + "NetworkSliver": [ + "Network", + "Sliver" + ], + "SitePrivilege": [ + "User", + "Site", + "Role" + ], + "NetworkDeployments": [ + "Network", + "Deployment", + "SliceDeployments" + ], + "SiteDeployments": [ + "Site", + "Deployment" + ], + "DeploymentPrivilege": [ + "User", + "Deployment", + "Role" + ], + "PlanetStackPrivilege": [ + "User", + "PlanetStack", + "Role" + ], + "Invoice": [ + "Account" + ] +}