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/hieradata/controller.yaml | |
parent | 30c8663b9f3360e5c83413cf2b7487e99b805950 (diff) | |
parent | e148af84833ec3672ddaa1e4b1c5bf87fcdf0c6c (diff) |
Merge "Remove Nova EC2 deployment"
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r-- | puppet/hieradata/controller.yaml | 2 |
1 files changed, 0 insertions, 2 deletions
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 |