diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-08 18:14:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-08 18:14:48 +0000 |
| commit | 161e1602e7b393c35cd04d7c86c2b84c0e6bfda7 (patch) | |
| tree | 6b023de94095ac4804d7c31c64297c9d8b53f337 /puppet | |
| parent | 31c91bed886f76e107a78021977e4c9bd338c76a (diff) | |
| parent | 1fc883bd06a705858065fb590f36126964858ddf (diff) | |
Merge "Set host in nova.conf for compute nodes"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_compute.pp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp index 7925f50a..dcf63740 100644 --- a/puppet/manifests/overcloud_compute.pp +++ b/puppet/manifests/overcloud_compute.pp @@ -56,6 +56,7 @@ include ::nova::compute nova_config { 'DEFAULT/my_ip': value => $ipaddress; 'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver'; + 'DEFAULT/host': value => $fqdn; } $rbd_ephemeral_storage = hiera('nova::compute::rbd::ephemeral_storage', false) @@ -146,6 +147,9 @@ else { } } +neutron_config { + 'DEFAULT/host': value => $fqdn; +} include ::ceilometer include ::ceilometer::config |