diff options
| -rw-r--r-- | puppet/hieradata/compute.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/neutron-base.yaml | 1 | ||||
| -rw-r--r-- | puppet/services/nova-base.yaml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 62728332..fe203be7 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -1,6 +1,5 @@ # Hiera data here applies to all compute nodes -nova::host: "%{::fqdn}" nova::notify_on_state_change: 'vm_and_task_state' nova::notification_driver: messagingv2 nova::compute::instance_usage_audit: true @@ -19,6 +18,4 @@ nova::compute::reserved_host_memory: 2048 ceilometer::agent::auth::auth_tenant_name: 'service' ceilometer::agent::auth::auth_endpoint_type: 'internalURL' -neutron::host: "%{::fqdn}" - compute_classes: [] diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 8bd8d989..73f707cc 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -60,3 +60,4 @@ outputs: params: PLUGINS: {get_param: NeutronServicePlugins} neutron::debug: {get_param: Debug} + neutron::host: '"%{::fqdn}"' diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 7de14f68..c67a1d8a 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -29,7 +29,7 @@ parameters: outputs: role_data: - description: Role data for the Neutron base service. + description: Role data for the Nova base service. value: config_settings: nova::rabbit_password: {get_param: RabbitPassword} @@ -37,3 +37,4 @@ outputs: nova::rabbit_use_ssl: {get_param: RabbitClientUseSSL} nova::rabbit_port: {get_param: RabbitClientPort} nova::debug: {get_param: Debug} + nova::host: '"%{::fqdn}"' |