diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2015-03-11 18:44:28 +0100 |
|---|---|---|
| committer |   Dan Prince <dprince@redhat.com> | 2015-03-11 16:54:55 -0400 |
| commit | 10c2cfab45018aeb52f4f4b9499f5dc98b075d78 (patch) | |
| tree | 703dc9e7214ca2a5913373e47861a5ca6caae1fd /puppet/hieradata | |
| parent | 3bb5a23da2dafd658912e2e47e427ca515757400 (diff) | |
Puppet: Configure neutron_api_class on controller
We're already configuring Neutron in Overcloud, but the controller
is still configured to use the default Nova neutron_api_class for
default configuration for networking, which means it used Nova Network
and not Neutron. This causes some of the Nova API is_neutron
checks to behave incorrectly.
This patch updates the controller to use nova::network::neutron (like
we already do on the overcloud_compute.pp role). As part of the change
several of the compute specific hiera settings for the
nova::network::neutron class have been moved to common.yaml.
Change-Id: Id2d5a5a0aa1ca087de714880ef1ea98484b06849
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 6 | ||||
| -rw-r--r-- | puppet/hieradata/compute.yaml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index a75bbe39..14ba97e2 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -6,3 +6,9 @@ ceilometer::agent::auth::auth_region: 'regionOne' # FIXME: Might be better to use 'service' tenant here but this requires # changes in the tripleo-incubator keystone role setup ceilometer::agent::auth::auth_tenant_name: 'admin' + +nova::network::neutron::neutron_admin_tenant_name: 'service' +nova::network::neutron::neutron_admin_username: 'neutron' +nova::network::neutron::vif_plugging_is_fatal: false +nova::network::neutron::vif_plugging_timeout: 30 + diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index ffa716a4..8d5c88fd 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -10,11 +10,6 @@ nova::compute::vnc_enabled: true nova::compute::libvirt::vncserver_listen: '0.0.0.0' nova::compute::libvirt::migration_support: true -nova::network::neutron::neutron_admin_tenant_name: 'service' -nova::network::neutron::neutron_admin_username: 'neutron' -nova::network::neutron::vif_plugging_is_fatal: false -nova::network::neutron::vif_plugging_timeout: 30 - neutron::plugins::ml2::tunnel_id_ranges: ['1:1000'] ceilometer::agent::auth::auth_tenant_name: 'service' |