diff options
| author | Daneyon Hansen <danehans@cisco.com> | 2015-03-24 18:29:30 +0000 |
|---|---|---|
| committer | Daneyon Hansen <danehans@cisco.com> | 2015-03-25 17:27:44 +0000 |
| commit | 1182e060cb721db124e825e2447d0a27b9946bc9 (patch) | |
| tree | a2e91486e8f273d08c7747166e9f033e1543118d /docker | |
| parent | 81d65f0b3d7098366234cf292595fe513b1c9b98 (diff) | |
| download | kolla-1182e060cb721db124e825e2447d0a27b9946bc9.tar.gz kolla-1182e060cb721db124e825e2447d0a27b9946bc9.zip | |
Extends Nova Metadata Service Parameterization and Composition
Previously, nova enabled_apis was hard coded and metdata_host
was using PUBLIC_IP param instead of exposing an individual
param.
Extending these params and creating a separate compose yml that
includes compute/libvirt/network/api is required to support
nova network multi_host.
Additional details can be found here:
http://docs.openstack.org/admin-guide-cloud/content/section_metadata-service.html
Change-Id: I5d417a0ee460f8ad9b2982fe83d63ab57013918e
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index e756a21ff..0764964d5 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -12,6 +12,8 @@ : ${NETWORK_MANAGER:=nova} : ${FLAT_NETWORK:=eth1} : ${PUBLIC_NETWORK:=eth0} +: ${ENABLED_APIS:=ec2,osapi_compute,metadata} +: ${METADATA_HOST:=$PUBLIC_IP} check_required_vars KEYSTONE_ADMIN_TOKEN NOVA_DB_PASSWORD \ RABBITMQ_SERVICE_HOST GLANCE_API_SERVICE_HOST \ @@ -30,10 +32,11 @@ crudini --set $cfg DEFAULT rabbit_password "${RABBIT_PASSWORD}" crudini --set $cfg DEFAULT rabbit_virtual_host / crudini --set $cfg DEFAULT rabbit_ha_queues False crudini --set $cfg DEFAULT rpc_backend nova.openstack.common.rpc.impl_kombu -crudini --set $cfg DEFAULT enabled_apis ec2,osapi_compute,metadata +crudini --set $cfg DEFAULT enabled_apis ${ENABLED_APIS} crudini --set $cfg DEFAULT ec2_listen 0.0.0.0 crudini --set $cfg DEFAULT osapi_compute_listen 0.0.0.0 crudini --set $cfg DEFAULT osapi_compute_workers 8 +crudini --set $cfg DEFAULT metadata_host ${METADATA_HOST} crudini --set $cfg DEFAULT metadata_listen 0.0.0.0 crudini --set $cfg DEFAULT metadata_workers 8 crudini --set $cfg DEFAULT service_down_time 60 @@ -43,7 +46,6 @@ crudini --set $cfg DEFAULT use_forwarded_for False crudini --set $cfg DEFAULT novncproxy_host 0.0.0.0 crudini --set $cfg DEFAULT novncproxy_port 6080 crudini --set $cfg DEFAULT glance_api_servers ${GLANCE_API_SERVICE_HOST}:9292 -crudini --set $cfg DEFAULT metadata_host ${PUBLIC_IP} crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter |