From 7cd2248fb7d1ae0b491ee11e8e80eee105cd977b Mon Sep 17 00:00:00 2001 From: James Page Date: Fri, 17 Jun 2016 14:30:07 +0100 Subject: [PATCH] Drop ec2 from list of enabled API's ec2 is not needed on compute nodes (nova-api just provides metadata to instances on the local compute node), so drop from list of enabled API's. It's also dropped in later OpenStack releases. Change-Id: I52de3a8118af4828c146c92e140b58a0288744d7 --- templates/icehouse/nova.conf | 2 +- templates/juno/nova.conf | 2 +- templates/kilo/nova.conf | 2 +- templates/liberty/nova.conf | 2 +- templates/mitaka/nova.conf | 2 +- tests/basic_deployment.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/icehouse/nova.conf b/templates/icehouse/nova.conf index 8fa8e094..041ea4c5 100644 --- a/templates/icehouse/nova.conf +++ b/templates/icehouse/nova.conf @@ -26,7 +26,7 @@ libvirt_use_virtio_for_bridges=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -enabled_apis=ec2,osapi_compute,metadata +enabled_apis=osapi_compute,metadata auth_strategy=keystone compute_driver=libvirt.LibvirtDriver my_ip = {{ host_ip }} diff --git a/templates/juno/nova.conf b/templates/juno/nova.conf index 1a5e2db8..f53db4da 100644 --- a/templates/juno/nova.conf +++ b/templates/juno/nova.conf @@ -26,7 +26,7 @@ libvirt_use_virtio_for_bridges=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -enabled_apis=ec2,osapi_compute,metadata +enabled_apis=osapi_compute,metadata auth_strategy=keystone compute_driver=libvirt.LibvirtDriver my_ip = {{ host_ip }} diff --git a/templates/kilo/nova.conf b/templates/kilo/nova.conf index 37ca88f6..b7924542 100644 --- a/templates/kilo/nova.conf +++ b/templates/kilo/nova.conf @@ -17,7 +17,7 @@ force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -enabled_apis=ec2,osapi_compute,metadata +enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} diff --git a/templates/liberty/nova.conf b/templates/liberty/nova.conf index e14cb792..3831a0bb 100644 --- a/templates/liberty/nova.conf +++ b/templates/liberty/nova.conf @@ -17,7 +17,7 @@ force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -enabled_apis=ec2,osapi_compute,metadata +enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} diff --git a/templates/mitaka/nova.conf b/templates/mitaka/nova.conf index 34c9233d..c4f76040 100644 --- a/templates/mitaka/nova.conf +++ b/templates/mitaka/nova.conf @@ -17,7 +17,7 @@ force_dhcp_release=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -enabled_apis=ec2,osapi_compute,metadata +enabled_apis=osapi_compute,metadata auth_strategy=keystone my_ip = {{ host_ip }} diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index 0d08bf3e..a76d6631 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -426,7 +426,7 @@ class NovaBasicDeployment(OpenStackAmuletDeployment): 'use_syslog': 'False', 'ec2_private_dns_show_ip': 'True', 'api_paste_config': '/etc/nova/api-paste.ini', - 'enabled_apis': 'ec2,osapi_compute,metadata', + 'enabled_apis': 'osapi_compute,metadata', 'flat_interface': 'eth1', 'network_manager': 'nova.network.manager.FlatDHCPManager', 'volume_api_class': 'nova.volume.cinder.API',