diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-11-21 21:44:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-11-21 21:44:28 +0000 |
| commit | 1520f41a653b947817bbe2ca9c8910fb11ed538b (patch) | |
| tree | 9a3a82dab7fc31152a3cc400f6240798f0fe0c5a /docker/nova-base | |
| parent | 3c803b62be267c06fce3379bc280b5d06fdee778 (diff) | |
| parent | 05f352a12556e08ecf10155399b29360c491b76e (diff) | |
| download | kolla-1520f41a653b947817bbe2ca9c8910fb11ed538b.tar.gz kolla-1520f41a653b947817bbe2ca9c8910fb11ed538b.zip | |
Merge "Adds support for Functional Nova-Network"
Diffstat (limited to 'docker/nova-base')
| -rwxr-xr-x | docker/nova-base/config-nova.sh | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/docker/nova-base/config-nova.sh b/docker/nova-base/config-nova.sh index a0c121ac4..3f8e4c624 100755 --- a/docker/nova-base/config-nova.sh +++ b/docker/nova-base/config-nova.sh @@ -25,7 +25,6 @@ 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 ec2_listen 0.0.0.0 crudini --set $cfg DEFAULT osapi_compute_listen 0.0.0.0 @@ -36,13 +35,9 @@ crudini --set $cfg DEFAULT service_down_time 60 crudini --set $cfg DEFAULT rootwrap_config /etc/nova/rootwrap.conf crudini --set $cfg DEFAULT auth_strategy keystone crudini --set $cfg DEFAULT use_forwarded_for False -#crudini --set $cfg DEFAULT service_neutron_metadata_proxy True -#crudini --set $cfg DEFAULT neutron_metadata_proxy_shared_secret ${NEUTRON_SHARED_SECRET} -#crudini --set $cfg DEFAULT neutron_default_tenant_id default 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 network_api_class nova.network.neutronv2.api.API crudini --set $cfg DEFAULT metadata_host ${MY_IP} crudini --set $cfg DEFAULT cpu_allocation_ratio 16.0 crudini --set $cfg DEFAULT ram_allocation_ratio 1.5 @@ -50,7 +45,6 @@ crudini --set $cfg DEFAULT scheduler_default_filters RetryFilter,AvailabilityZon crudini --set $cfg DEFAULT compute_driver nova.virt.libvirt.LibvirtDriver crudini --set $cfg DEFAULT vif_plugging_is_fatal True crudini --set $cfg DEFAULT vif_plugging_timeout 300 -#crudini --set $cfg DEFAULT firewall_driver nova.virt.firewall.NoopFirewallDriver crudini --set $cfg DEFAULT novncproxy_base_url http://${PUBLIC_IP}:6080/vnc_auto.html crudini --set $cfg DEFAULT vncserver_listen 0.0.0.0 crudini --set $cfg DEFAULT vncserver_proxyclient_address ${MY_IP} @@ -67,18 +61,6 @@ crudini --set $cfg DEFAULT admin_token "${KEYSTONE_ADMIN_TOKEN}" crudini --set $cfg conductor workers 8 -crudini --set /etc/nova/nova.conf DEFAULT network_manager nova.network.manager.FlatDHCPManager -crudini --set /etc/nova/nova.conf DEFAULT firewall_driver nova.virt.libvirt.firewall.IptablesFirewallDriver -crudini --set /etc/nova/nova.conf DEFAULT network_size 254 -crudini --set /etc/nova/nova.conf DEFAULT allow_same_net_traffic False -crudini --set /etc/nova/nova.conf DEFAULT multi_host True -crudini --set /etc/nova/nova.conf DEFAULT send_arp_for_ha True -crudini --set /etc/nova/nova.conf DEFAULT share_dhcp_address True -crudini --set /etc/nova/nova.conf DEFAULT force_dhcp_release True -crudini --set /etc/nova/nova.conf DEFAULT flat_interface flat0 -crudini --set /etc/nova/nova.conf DEFAULT flat_network_bridge br100 -crudini --set /etc/nova/nova.conf DEFAULT public_interface eth0 - # disabled pending answers to http://lists.openstack.org/pipermail/openstack/2014-October/009997.html #for option in auth_protocol auth_host auth_port; do # crudini --del $cfg \ |