diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-04-14 16:36:31 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-04-16 16:34:49 +0000 |
commit | bb75c8e90d0acf298f3ffea8917c78a4922ee8a8 (patch) | |
tree | fb8f0c84abea3690031ae898dbef2929b3e58309 /openstack-nova.configure | |
parent | f139ff5be6eb7a84cd6cfd1a6a8764360e75eefc (diff) | |
download | definitions-bb75c8e90d0acf298f3ffea8917c78a4922ee8a8.tar.gz |
Integrate Nova with Ironicbaserock/tiagogomes/openstack-in-baserock/ironic
Change-Id: I2eee55408b174dc820ce713e6821f200a1532a48
Diffstat (limited to 'openstack-nova.configure')
-rw-r--r-- | openstack-nova.configure | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/openstack-nova.configure b/openstack-nova.configure index b1ad237f..2e22a498 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -27,7 +27,6 @@ enable(){ # Check variables ########################################################################## - if [ -z "$NOVA_SERVICE_USER" -a \ -z "$NOVA_SERVICE_PASSWORD" -a \ -z "$NOVA_DB_USER" -a \ @@ -35,6 +34,8 @@ if [ -z "$NOVA_SERVICE_USER" -a \ -z "$NOVA_VIRT_TYPE" -a \ -z "$NEUTRON_SERVICE_USER" -a \ -z "$NEUTRON_SERVICE_PASSWORD" -a \ + -z "$IRONIC_SERVICE_USER" -a \ + -z "$IRONIC_SERVICE_PASSWORD" -a \ -z "$METADATA_PROXY_SHARED_SECRET" -a \ -z "$RABBITMQ_HOST" -a \ -z "$RABBITMQ_USER" -a \ @@ -54,6 +55,8 @@ if [ -z "$NOVA_SERVICE_USER" -o \ -z "$NOVA_VIRT_TYPE" -o \ -z "$NEUTRON_SERVICE_USER" -o \ -z "$NEUTRON_SERVICE_PASSWORD" -o \ + -z "$IRONIC_SERVICE_USER" -a \ + -z "$IRONIC_SERVICE_PASSWORD" -a \ -z "$METADATA_PROXY_SHARED_SECRET" -o \ -z "$RABBITMQ_HOST" -o \ -z "$RABBITMQ_USER" -o \ @@ -126,11 +129,27 @@ fi sed -i "s/192\.168\.122\./192\.168\.1\./g" \ "$ROOT"/etc/libvirt/qemu/networks/default.xml - ########################################################################## # Generate configuration file ########################################################################## +case "$NOVA_BAREMETAL_SCHEDULING" in + True|true|yes) + export COMPUTE_MANAGER=ironic.nova.compute.manager.ClusteredComputeManager + export RESERVED_HOST_MEMORY_MB=0 + export SCHEDULER_HOST_MANAGER=nova.scheduler.ironic_host_manager.IronicHostManager + export RAM_ALLOCATION_RATIO=1.0 + export COMPUTE_DRIVER=nova.virt.ironic.IronicDriver + ;; + *) + export COMPUTE_MANAGER=nova.compute.manager.ComputeManager + export RESERVED_HOST_MEMORY_MB=512 + export SCHEDULER_HOST_MANAGER=nova.scheduler.host_manager.HostManager + export RAM_ALLOCATION_RATIO=1.5 + export COMPUTE_DRIVER=libvirt.LibvirtDriver + ;; +esac + OPENSTACK_DATA="$ROOT/etc/openstack" mkdir -p "$OPENSTACK_DATA" @@ -143,8 +162,15 @@ nova_configuration={ 'NOVA_DB_USER': os.environ['NOVA_DB_USER'], 'NOVA_DB_PASSWORD': os.environ['NOVA_DB_PASSWORD'], 'NOVA_VIRT_TYPE': os.environ['NOVA_VIRT_TYPE'], + 'COMPUTE_MANAGER': os.environ['COMPUTE_MANAGER'], + 'RESERVED_HOST_MEMORY_MB': os.environ['RESERVED_HOST_MEMORY_MB'], + 'SCHEDULER_HOST_MANAGER': os.environ['SCHEDULER_HOST_MANAGER'], + 'RAM_ALLOCATION_RATIO': os.environ['RAM_ALLOCATION_RATIO'], + 'COMPUTE_DRIVER': os.environ['COMPUTE_DRIVER'], 'NEUTRON_SERVICE_USER': os.environ['NEUTRON_SERVICE_USER'], 'NEUTRON_SERVICE_PASSWORD': os.environ['NEUTRON_SERVICE_PASSWORD'], + 'IRONIC_SERVICE_USER': os.environ['IRONIC_SERVICE_USER'], + 'IRONIC_SERVICE_PASSWORD': os.environ['IRONIC_SERVICE_PASSWORD'], 'METADATA_PROXY_SHARED_SECRET': os.environ['METADATA_PROXY_SHARED_SECRET'], 'RABBITMQ_HOST': os.environ['RABBITMQ_HOST'], 'RABBITMQ_USER': os.environ['RABBITMQ_USER'], |