From ebab2cc91958d4ab2e5400598e545e3cf0b1a581 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 11 Jan 2016 14:36:12 -0500 Subject: [PATCH] Update nova::network::neutron parameters and drop ec2 param neutron_admin_password is deprecated, we need to use neutron_password Also neutron_admin_auth_url, let's use default value. Also drop ec2 params Change-Id: I5def769b9394282c5c85fb3fa92dfa52d8d80ae8 --- manifests/nova.pp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/manifests/nova.pp b/manifests/nova.pp index e1fba9bf8..2f0b878fa 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -37,7 +37,6 @@ class openstack_integration::nova { osapi_v3 => true, neutron_metadata_proxy_shared_secret => 'a_big_secret', osapi_compute_workers => 2, - ec2_workers => 2, metadata_workers => 2, default_floating_pool => 'public', } @@ -59,8 +58,7 @@ class openstack_integration::nova { class { '::nova::scheduler': } class { '::nova::vncproxy': } class { '::nova::network::neutron': - neutron_admin_password => 'a_big_secret', - neutron_admin_auth_url => 'http://127.0.0.1:35357/v2.0', + neutron_password => 'a_big_secret', } }