synced /next

config.yaml

@@ -239,3 +239,11 @@ options:
       .
       Increasing this value will increase instance density on compute nodes
       at the expense of instance performance.
+  ram-allocation-ratio:
+    type: float
+    default: 1.5
+    description: |
+      The physical ram -> virtual ram ratio to use in the Nova scheduler.
+      .
+      Increasing this value will increase instance density on compute nodes
+      at the potential expense of instance performance.

hooks/nova_cc_context.py

@@ -269,6 +269,7 @@ class NovaConfigContext(WorkerConfigContext):
     def __call__(self):
         ctxt = super(NovaConfigContext, self).__call__()
         ctxt['cpu_allocation_ratio'] = config('cpu-allocation-ratio')
+        ctxt['ram_allocation_ratio'] = config('ram-allocation-ratio')
         return ctxt
 
 

hooks/nova_cc_hooks.py

@@ -566,7 +566,7 @@ def cluster_changed():
                          relation_settings={'private-address': addr})
 
     CONFIGS.write_all()
-    if is_relation_made('cluster'):
+    if relation_ids('cluster'):
         peer_echo(includes='dbsync_state')
         dbsync_state = peer_retrieve('dbsync_state')
         if dbsync_state == 'complete':

hooks/nova_cc_utils.py

@@ -555,7 +555,7 @@ def migrate_database():
     log('Migrating the nova database.', level=INFO)
     cmd = ['nova-manage', 'db', 'sync']
     subprocess.check_output(cmd)
-    if is_relation_made('cluster'):
+    if relation_ids('cluster'):
         log('Informing peers that dbsync is complete', level=INFO)
         peer_store('dbsync_state', 'complete')
     log('Enabling services', level=INFO)

templates/icehouse/nova.conf

@@ -33,6 +33,7 @@ ec2_workers = {{ workers }}
 
 scheduler_default_filters = RetryFilter,AvailabilityZoneFilter,CoreFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
+ram_allocation_ratio = {{ ram_allocation_ratio }}
 
 use_syslog={{ use_syslog }}
 

unit_tests/test_nova_cc_utils.py

@@ -594,7 +594,7 @@ class NovaCCUtilsTests(CharmTestCase):
     @patch('subprocess.check_output')
     def test_migrate_database(self, check_output):
         "Migrate database with nova-manage"
-        self.is_relation_made.return_value = False
+        self.relation_ids.return_value = []
         utils.migrate_database()
         check_output.assert_called_with(['nova-manage', 'db', 'sync'])
         self.enable_services.assert_called()
@@ -603,7 +603,7 @@ class NovaCCUtilsTests(CharmTestCase):
     @patch('subprocess.check_output')
     def test_migrate_database_cluster(self, check_output):
         "Migrate database with nova-manage in a clustered env"
-        self.is_relation_made.return_value = True
+        self.relation_ids.return_value = ['cluster:1']
         utils.migrate_database()
         check_output.assert_called_with(['nova-manage', 'db', 'sync'])
         self.peer_store.assert_called_with('dbsync_state', 'complete')