Merge "Drop ec2 from list of enabled API's"

This commit is contained in:
Jenkins 2016-06-20 18:24:11 +00:00 committed by Gerrit Code Review
commit db07b684b0
6 changed files with 6 additions and 6 deletions

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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 }}

View File

@ -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',