Remove Nova EC2 deployment

Nova EC2 does not exist anymore since Mitaka, parameters are already
deprecated in Mitaka and send warnings to the Puppet catalog.
The service has been replaced by ec2api project, where Puppet OpenStack
team is currently writting a module.

In the meantime we add support in TripleO, this patch removes all
occurences of Nova EC2 configuration, which are useless and send
warnings for nothing.

Change-Id: Ief2d0e5c77b5ac58560606fee930fbd66c40ffc3
changes/60/316360/2
Emilien Macchi 6 years ago
parent 0d3dacec4b
commit e148af8483
  1. 3
      environments/enable-tls.yaml
  2. 15
      network/endpoints/endpoint_data.yaml
  3. 120
      network/endpoints/endpoint_map.yaml
  4. 7
      puppet/controller.yaml
  5. 2
      puppet/hieradata/controller.yaml

@ -34,9 +34,6 @@ parameter_defaults:
NovaAdmin: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
NovaInternal: {protocol: 'http', port: '8774', host: 'IP_ADDRESS'}
NovaPublic: {protocol: 'https', port: '13774', host: 'CLOUDNAME'}
NovaEC2Admin: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
NovaEC2Internal: {protocol: 'http', port: '8773', host: 'IP_ADDRESS'}
NovaEC2Public: {protocol: 'https', port: '13773', host: 'CLOUDNAME'}
NovaVNCProxyAdmin: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
NovaVNCProxyInternal: {protocol: 'http', port: '6080', host: 'IP_ADDRESS'}
NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'}

@ -134,21 +134,6 @@ Nova:
'': /v2.1/%(tenant_id)s
port: 8774
NovaEC2:
Internal:
vip_param: NovaApi
uri_suffixes:
'': /services/Cloud
Public:
vip_param: Public
uri_suffixes:
'': /services/Cloud
Admin:
vip_param: NovaApi
uri_suffixes:
'': /services/Admin
port: 8773
NovaVNCProxy:
Internal:
vip_param: NovaApi

@ -55,9 +55,6 @@ parameters:
NovaAdmin: {protocol: http, port: '8774', host: IP_ADDRESS}
NovaInternal: {protocol: http, port: '8774', host: IP_ADDRESS}
NovaPublic: {protocol: http, port: '8774', host: IP_ADDRESS}
NovaEC2Admin: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaEC2Internal: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaEC2Public: {protocol: http, port: '8773', host: IP_ADDRESS}
NovaVNCProxyAdmin: {protocol: http, port: '6080', host: IP_ADDRESS}
NovaVNCProxyInternal: {protocol: http, port: '6080', host: IP_ADDRESS}
NovaVNCProxyPublic: {protocol: http, port: '6080', host: IP_ADDRESS}
@ -1462,123 +1459,6 @@ outputs:
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaPublic, port]
NovaEC2Admin:
host:
str_replace:
template:
get_param: [EndpointMap, NovaEC2Admin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaEC2Admin, port]
protocol:
get_param: [EndpointMap, NovaEC2Admin, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Admin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Admin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Admin, port]
- /services/Admin
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Admin, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Admin, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Admin, port]
NovaEC2Internal:
host:
str_replace:
template:
get_param: [EndpointMap, NovaEC2Internal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
port:
get_param: [EndpointMap, NovaEC2Internal, port]
protocol:
get_param: [EndpointMap, NovaEC2Internal, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Internal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Internal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Internal, port]
- /services/Cloud
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Internal, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Internal, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: NovaApiVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Internal, port]
NovaEC2Public:
host:
str_replace:
template:
get_param: [EndpointMap, NovaEC2Public, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
port:
get_param: [EndpointMap, NovaEC2Public, port]
protocol:
get_param: [EndpointMap, NovaEC2Public, protocol]
uri:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Public, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Public, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Public, port]
- /services/Cloud
uri_no_suffix:
list_join:
- ''
- - get_param: [EndpointMap, NovaEC2Public, protocol]
- ://
- str_replace:
template:
get_param: [EndpointMap, NovaEC2Public, host]
params:
CLOUDNAME: {get_param: CloudName}
IP_ADDRESS: {get_param: PublicVirtualIP}
- ':'
- get_param: [EndpointMap, NovaEC2Public, port]
NovaVNCProxyAdmin:
host:
str_replace:

@ -1116,9 +1116,6 @@ resources:
nova_public_url: {get_param: [EndpointMap, NovaPublic, uri]}
nova_internal_url: {get_param: [EndpointMap, NovaInternal, uri]}
nova_admin_url: {get_param: [EndpointMap, NovaAdmin, uri]}
nova_ec2_public_url: {get_param: [EndpointMap, NovaEC2Public, uri]}
nova_ec2_internal_url: {get_param: [EndpointMap, NovaEC2Internal, uri]}
nova_ec2_admin_url: {get_param: [EndpointMap, NovaEC2Admin, uri]}
fencing_config: {get_param: FencingConfig}
pcsd_password: {get_param: PcsdPassword}
rabbit_username: {get_param: RabbitUserName}
@ -1526,7 +1523,6 @@ resources:
nova::api::metadata_listen: {get_input: nova_metadata_network}
nova::api::admin_password: {get_input: nova_password}
nova::api::osapi_compute_workers: {get_input: nova_workers}
nova::api::ec2_workers: {get_input: nova_workers}
nova::api::metadata_workers: {get_input: nova_workers}
nova::compute::network_device_mtu: {get_input: neutron_tenant_mtu}
nova::database_connection: {get_input: nova_dsn}
@ -1544,9 +1540,6 @@ resources:
nova::keystone::auth::public_url: {get_input: nova_public_url}
nova::keystone::auth::internal_url: {get_input: nova_internal_url}
nova::keystone::auth::admin_url: {get_input: nova_admin_url}
nova::keystone::auth::ec2_public_url: {get_input: nova_ec2_public_url}
nova::keystone::auth::ec2_internal_url: {get_input: nova_ec2_internal_url}
nova::keystone::auth::ec2_admin_url: {get_input: nova_ec2_admin_url}
nova::keystone::auth::password: {get_input: nova_password }
nova::keystone::auth::region: {get_input: keystone_region}

@ -118,7 +118,6 @@ nova::scheduler::filter::ram_allocation_ratio: '1.0'
nova::cron::archive_deleted_rows::hour: '*/12'
nova::cron::archive_deleted_rows::destination: '/dev/null'
nova::notification_driver: messaging
nova::keystone::auth::configure_ec2_endpoint: false
# ceilometer
ceilometer::agent::auth::auth_endpoint_type: 'internalURL'
@ -166,7 +165,6 @@ tripleo::loadbalancer::neutron: true
tripleo::loadbalancer::cinder: true
tripleo::loadbalancer::glance_api: true
tripleo::loadbalancer::glance_registry: true
tripleo::loadbalancer::nova_ec2: true
tripleo::loadbalancer::nova_osapi: true
tripleo::loadbalancer::nova_metadata: true
tripleo::loadbalancer::nova_novncproxy: true

Loading…
Cancel
Save