diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-30 00:07:28 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-04-30 00:07:28 -0400 |
commit | 65acd817cf2a807859f93cf5eb61127b6e5a6915 (patch) | |
tree | 507596f747449dcb01a4e453d7130fb4babef849 /meta-openstack/recipes-devtools/python/python-nova | |
parent | fbc0ca6e73d501f4dcb94eb8303f3906d3cc2fca (diff) | |
download | meta-cloud-services-65acd817cf2a807859f93cf5eb61127b6e5a6915.tar.gz |
nova: uprev to icehouse/stable support
Updating the recipe's branch and SRCREV to the icehouse/stable release
branch.
The configuration changes required for basic operation are limited, so
we keep nearly everything the same, and will update the config in
subsequent commits.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova/nova.conf | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.conf b/meta-openstack/recipes-devtools/python/python-nova/nova.conf index d763a8b..35eed8b 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.conf +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.conf | |||
@@ -56,6 +56,10 @@ neutron_admin_username=neutron | |||
56 | neutron_admin_password=password | 56 | neutron_admin_password=password |
57 | neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ | 57 | neutron_admin_auth_url=http://%CONTROLLER_IP%:5000/v2.0/ |
58 | 58 | ||
59 | # Disables reporting of network state to the controller | ||
60 | vif_plugging_timeout=10 | ||
61 | vif_plugging_is_fatal=False | ||
62 | |||
59 | # nova-compute configuration for ceilometer | 63 | # nova-compute configuration for ceilometer |
60 | instance_usage_audit=True | 64 | instance_usage_audit=True |
61 | instance_usage_audit_period=hour | 65 | instance_usage_audit_period=hour |
@@ -76,3 +80,14 @@ html5proxy_base_url=http://%CONTROLLER_IP%:6082/spice_auto.html | |||
76 | keymap=en-us | 80 | keymap=en-us |
77 | server_listen=%COMPUTE_IP% | 81 | server_listen=%COMPUTE_IP% |
78 | server_proxyclient_address=%COMPUTE_IP% | 82 | server_proxyclient_address=%COMPUTE_IP% |
83 | |||
84 | auth_strategy=keystone | ||
85 | [keystone_authtoken] | ||
86 | auth_host = %CONTROLLER_IP% | ||
87 | auth_port = 35357 | ||
88 | auth_protocol = http | ||
89 | admin_tenant_name = %SERVICE_TENANT_NAME% | ||
90 | admin_user = %SERVICE_USER% | ||
91 | admin_password = %SERVICE_PASSWORD% | ||
92 | |||
93 | |||