Merge pull request #342 from Mirantis/separate-flavors-for-masters-an…

…d-slaves Use separate flavors for slave and master nodes
Mirantis · Jul 13, 2018 · 05c2aeb · 05c2aeb
2 parents 676429c + 0e9390a
commit 05c2aeb
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/kqueen/engines/openstack_kubespray.py b/kqueen/engines/openstack_kubespray.py
@@ -64,10 +64,18 @@ class OpenstackKubesprayEngine(BaseEngine):
                     "required": True,
                 },
             },
-            "flavor": {
+            "master_flavor": {
                 "type": "text",
                 "order": 30,
-                "label": "Flavor",
+                "label": "Master flavor",
+                "validators": {
+                    "required": True,
+                },
+            },
+            "slave_flavor": {
+                "type": "text",
+                "order": 30,
+                "label": "Slave flavor",
                 "validators": {
                     "required": True,
                 },
@@ -629,9 +637,12 @@ def validate_ip(address):
             self.meta["image"] = self.c.get_image(self.cluster.metadata["image_name"])
             if self.meta["image"] is None:
                 raise ValueError("Image '%s' is not found" % self.cluster.metadata["image_name"])
-            self.meta["flavor"] = self.c.get_flavor(self.cluster.metadata["flavor"])
-            if self.meta["flavor"] is None:
-                raise ValueError("Flavor '%s' is not found" % self.cluster.metadata["flavor"])
+            self.meta["master_flavor"] = self.c.get_flavor(self.cluster.metadata["master_flavor"])
+            if self.meta["master_flavor"] is None:
+                raise ValueError("Flavor for master '%s' is not found" % self.cluster.metadata["master_flavor"])
+            self.meta["slave_flavor"] = self.c.get_flavor(self.cluster.metadata["slave_flavor"])
+            if self.meta["slave_flavor"] is None:
+                raise ValueError("Flavor for slave '%s' is not found" % self.cluster.metadata["master_flavor"])
             # Check that required fields are provided (KeyError is raised if not)
             self.cluster.metadata["ssh_key_name"]
             self.cluster.metadata["ssh_username"]
@@ -667,7 +678,7 @@ def provision(self):
         for master in self._boot_servers(name=self.stack_name,
                                          servers_range=range(self.meta["master_count"]),
                                          image=self.meta['image'],
-                                         flavor=self.meta['flavor'],
+                                         flavor=self.meta['master_flavor'],
                                          network=network):
             fip = self.c.create_floating_ip("public", server=master)
             resources["masters"].append({
@@ -680,7 +691,7 @@ def provision(self):
         for slave in self._boot_servers(name=self.stack_name,
                                         servers_range=range(self.meta["slave_count"]),
                                         image=self.meta['image'],
-                                        flavor=self.meta['flavor'],
+                                        flavor=self.meta['slave_flavor'],
                                         network=network,
                                         add_random_suffix=True):
             resources["slaves"].append({
@@ -727,7 +738,7 @@ def grow(self, *, resources, new_slave_count):
             name=self.stack_name,
             servers_range=servers_range,
             image=self.cluster.metadata["image_name"],
-            flavor=self.cluster.metadata["flavor"],
+            flavor=self.cluster.metadata["slave_flavor"],
             network=self.c.get_network(resources["network_id"]),
             add_random_suffix=True,
         )