diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-16 20:36:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-16 20:36:36 +0000 |
| commit | aeb9482f4b1ec9d78dc3ac44ee3c0b180cd27574 (patch) | |
| tree | 8aefd35a7d526240628d4a8ef6eb07f8ebb95532 /puppet | |
| parent | 30c8663b9f3360e5c83413cf2b7487e99b805950 (diff) | |
| parent | e148af84833ec3672ddaa1e4b1c5bf87fcdf0c6c (diff) | |
Merge "Remove Nova EC2 deployment"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 7 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 |
2 files changed, 0 insertions, 9 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 7334d4a1..d38a24e7 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -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} diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 416233ce..7a446b50 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -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 |