summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-10 18:16:36 +0000
committerGerrit Code Review <review@openstack.org>2015-09-10 18:16:36 +0000
commit07e13dfe2edfd85cb01394e0c12c1a9ba06ab2d7 (patch)
tree19bd8c351ee9c3f6bf776a6b5c6351f2a1981d9c /puppet
parent486213b6a797994798f502e9a75d2e3b45b77b56 (diff)
parent3e5df29f46c7ced2cbd396b3c746652769bbfcb9 (diff)
Merge "Set the nova scheduler ram_allocation_ration to 1.0"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/hieradata/controller.yaml1
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
3 files changed, 3 insertions, 0 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 1ae076d2..08ea3ebc 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -75,6 +75,7 @@ neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf
# nova
nova::notify_on_state_change: 'vm_and_task_state'
nova::api::osapi_v3: true
+nova::scheduler::filter::ram_allocation_ratio: '1.0'
nova::config::nova_config:
DEFAULT/default_floating_pool:
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index c2b12a6e..899086d9 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -220,6 +220,7 @@ if hiera('step') >= 3 {
include ::nova::network::neutron
include ::nova::vncproxy
include ::nova::scheduler
+ include ::nova::scheduler::filter
include ::neutron
include ::neutron::server
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 013ea360..01618380 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -563,6 +563,7 @@ if hiera('step') >= 3 {
manage_service => false,
enabled => false,
}
+ include ::nova::scheduler::filter
class { '::nova::scheduler' :
manage_service => false,
enabled => false,