openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable Nova v3 API" into stable/liberty

This commit is contained in:
Jenkins 2016-04-08 12:19:25 +00:00 committed by Gerrit Code Review
parent 408102ae32 a5c2103b42
commit c3a8bc581e
3 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network/endpoints/endpoint_data.yaml
View File

@ -105,17 +105,14 @@ Nova:
vip_param: NovaApi
uri_suffixes:
'': /v2.1/%(tenant_id)s
V3: /v3
Public:
vip_param: Public
uri_suffixes:
'': /v2.1/%(tenant_id)s
V3: /v3
Admin:
vip_param: NovaApi
uri_suffixes:
'': /v2.1/%(tenant_id)s
V3: /v3
port: 8774
NovaEC2:

117
network/endpoints/endpoint_map.yaml
View File

@ -1183,123 +1183,6 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
NovaV3Admin:
host:
str_replace:
template:
get_param: [EndpointMap, NovaAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaAdmin, port]
protocol:
get_param: [EndpointMap, NovaAdmin, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaAdmin, port]
- /v3
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaAdmin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaAdmin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaAdmin, port]
NovaV3Internal:
host:
str_replace:
template:
get_param: [EndpointMap, NovaInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaInternal, port]
protocol:
get_param: [EndpointMap, NovaInternal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaInternal, port]
- /v3
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaInternal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaInternal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaInternal, port]
NovaV3Public:
host:
str_replace:
template:
get_param: [EndpointMap, NovaPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
port:
get_param: [EndpointMap, NovaPublic, port]
protocol:
get_param: [EndpointMap, NovaPublic, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
- /v3
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaPublic, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaPublic, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
NovaEC2Admin:
host:
str_replace:

1
puppet/hieradata/controller.yaml
View File

@ -80,7 +80,6 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
# nova
nova::notify_on_state_change: 'vm_and_task_state'
nova::api::default_floating_pool: 'public'
nova::api::osapi_v3: true
nova::scheduler::filter::ram_allocation_ratio: '1.0'
nova::cron::archive_deleted_rows::hour: '*/12'
nova::cron::archive_deleted_rows::destination: '/dev/null'