diff --git a/install.sh b/install.sh index 092d7d2f5d..d8f4bc3ec1 100755 --- a/install.sh +++ b/install.sh @@ -25,50 +25,68 @@ for d in $DIRS; do mkdir -p $DST_DIR$d done +# --- Programs & Scripts--- + inst_ln src/nebula/oned bin inst_ln src/scheduler/mm_sched bin + inst_ln src/client/ruby/onevm bin inst_ln src/client/ruby/onehost bin -inst_cp share/etc/oned.conf etc -inst_ln share/etc/mad/defaultrc etc - inst_ln share/scripts/madcommon.sh libexec +inst_ln share/scripts/one bin -inst_ln share/etc/mad/vmm_xenrc etc/vmm_xen -inst_ln share/etc/default/vmm_xen.conf etc/vmm_xen -inst_ln share/etc/mad/vmm_kvmrc etc/vmm_kvm -inst_ln share/etc/default/vmm_kvm.conf etc/vmm_kvm +# --- Ruby Libraries -inst_ln src/vmm_mad/xen/one_vmm_xen.rb bin -inst_ln src/vmm_mad/xen/one_vmm_xen bin +inst_ln src/mad/ruby/one_mad.rb lib/ruby +inst_ln src/mad/ruby/one_ssh.rb lib/ruby -inst_ln src/vmm_mad/kvm/one_vmm_kvm.rb bin -inst_ln src/vmm_mad/kvm/one_vmm_kvm bin - -inst_ln src/im_mad/im_ssh/one_im_ssh.rb bin -inst_ln src/im_mad/im_ssh/one_im_ssh bin -inst_ln src/im_mad/im_ssh/one_ssh.rb lib/ruby - -inst_ln share/etc/mad/im_kvmrc etc/im_kvm -inst_cp src/im_mad/kvm/im_kvm.conf etc/im_kvm -inst_cp src/im_mad/xen/im_xen.conf etc/im_xen -inst_ln share/etc/mad/im_xenrc etc/im_xen - - -inst_ln src/vmm_mad/xen/one_mad.rb lib/ruby inst_ln src/client/ruby/one.rb lib/ruby inst_ln src/client/ruby/client_utilities.rb lib/ruby inst_ln src/client/ruby/command_parse.rb lib/ruby -inst_ln src/im_mad/im_ssh/architecture.sh lib/im_probes -inst_ln src/im_mad/im_ssh/cpu.sh lib/im_probes -inst_ln src/im_mad/im_ssh/name.sh lib/im_probes +# --- ONE configuration files --- + +inst_cp share/etc/oned.conf etc +inst_cp share/etc/defaultrc etc + +# --- XEN driver & configuration files --- + +inst_ln src/vmm_mad/xen/one_vmm_xen.rb bin +inst_ln src/vmm_mad/xen/one_vmm_xen bin + inst_ln src/im_mad/xen/xen.rb lib/im_probes + +inst_cp src/vmm_mad/xen/vmm_xenrc etc/vmm_xen +inst_cp src/vmm_mad/xen/vmm_xen.conf etc/vmm_xen + +inst_cp src/im_mad/xen/im_xenrc etc/im_xen +inst_cp src/im_mad/xen/im_xen.conf etc/im_xen + +# --- KVM driver & configuration files --- + +inst_ln src/vmm_mad/kvm/one_vmm_kvm.rb bin +inst_ln src/vmm_mad/kvm/one_vmm_kvm bin + inst_ln src/im_mad/kvm/kvm.rb lib/im_probes -inst_cp share/scripts/one bin +inst_cp src/vmm_mad/kvm/vmm_kvmrc etc/vmm_kvm +inst_cp src/vmm_mad/kvm/vmm_kvm.conf etc/vmm_kvm + +inst_cp src/im_mad/kvm/im_kvmrc etc/im_kvm +inst_cp src/im_mad/kvm/im_kvm.conf etc/im_kvm + +# --- Information driver & probes --- + +inst_ln src/im_mad/im_ssh/one_im_ssh.rb bin +inst_ln src/im_mad/im_ssh/one_im_ssh bin + +inst_ln src/im_mad/host_probes/architecture.sh lib/im_probes +inst_ln src/im_mad/host_probes/cpu.sh lib/im_probes +inst_ln src/im_mad/host_probes/name.sh lib/im_probes + +# --- Examples --- inst_cp share/examples/vm.template share/examples - +inst_cp share/examples/vm.schema share/examples diff --git a/share/etc/default/vmm_kvm.conf b/share/etc/default/vmm_kvm.conf deleted file mode 100644 index 162f4c9290..0000000000 --- a/share/etc/default/vmm_kvm.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Default configuration attributes for the KVM driver -# (all domains will use these values as defaults) -# - diff --git a/share/etc/mad/defaultrc b/share/etc/defaultrc similarity index 100% rename from share/etc/mad/defaultrc rename to share/etc/defaultrc diff --git a/src/im_mad/im_ssh/architecture.sh b/src/im_mad/host_probes/architecture.sh similarity index 100% rename from src/im_mad/im_ssh/architecture.sh rename to src/im_mad/host_probes/architecture.sh diff --git a/src/im_mad/im_ssh/cpu.sh b/src/im_mad/host_probes/cpu.sh similarity index 100% rename from src/im_mad/im_ssh/cpu.sh rename to src/im_mad/host_probes/cpu.sh diff --git a/src/im_mad/im_ssh/name.sh b/src/im_mad/host_probes/name.sh similarity index 100% rename from src/im_mad/im_ssh/name.sh rename to src/im_mad/host_probes/name.sh diff --git a/share/etc/mad/im_kvmrc b/src/im_mad/kvm/im_kvmrc similarity index 100% rename from share/etc/mad/im_kvmrc rename to src/im_mad/kvm/im_kvmrc diff --git a/share/etc/mad/im_xenrc b/src/im_mad/xen/im_xenrc similarity index 100% rename from share/etc/mad/im_xenrc rename to src/im_mad/xen/im_xenrc diff --git a/src/vmm_mad/xen/one_mad.rb b/src/mad/ruby/one_mad.rb similarity index 100% rename from src/vmm_mad/xen/one_mad.rb rename to src/mad/ruby/one_mad.rb diff --git a/src/im_mad/im_ssh/one_ssh.rb b/src/mad/ruby/one_ssh.rb similarity index 100% rename from src/im_mad/im_ssh/one_ssh.rb rename to src/mad/ruby/one_ssh.rb diff --git a/src/vmm_mad/kvm/vmm_kvm.conf b/src/vmm_mad/kvm/vmm_kvm.conf new file mode 100644 index 0000000000..b29bf1c716 --- /dev/null +++ b/src/vmm_mad/kvm/vmm_kvm.conf @@ -0,0 +1,8 @@ +# Default configuration attributes for the KVM driver +# (all domains will use these values as defaults) +# Valid atributes are: +# - os [kernel,initrd,boot,root] +# - memory + +#MEMORY = 128 +#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1", boot=hd] \ No newline at end of file diff --git a/share/etc/mad/vmm_kvmrc b/src/vmm_mad/kvm/vmm_kvmrc similarity index 100% rename from share/etc/mad/vmm_kvmrc rename to src/vmm_mad/kvm/vmm_kvmrc diff --git a/share/etc/default/vmm_xen.conf b/src/vmm_mad/xen/vmm_xen.conf similarity index 59% rename from share/etc/default/vmm_xen.conf rename to src/vmm_mad/xen/vmm_xen.conf index 096d38fd08..d8998af6ad 100644 --- a/share/etc/default/vmm_xen.conf +++ b/src/vmm_mad/xen/vmm_xen.conf @@ -1,11 +1,10 @@ -# # Default configuration attributes for the Xen driver # (all domains will use these values as defaults) # Valid atributes: # - credit -# - os [memory,initr,boot] +# - os [kernel,initrd,root] # - memory -MEMORY = 128 -OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1" ] +#MEMORY = 128 +#OS = [ kernel="/vmlinuz", initrd="/initrd.img", root="sda1" ] CREDIT = 256 diff --git a/share/etc/mad/vmm_xenrc b/src/vmm_mad/xen/vmm_xenrc similarity index 100% rename from share/etc/mad/vmm_xenrc rename to src/vmm_mad/xen/vmm_xenrc