Browse Source

Add a CONF option for chefserver image id

The chefserver image (snapshot) has pre-installed chef software
packages to speed up chef server deployment

Change-Id: I01bd30947ba6191869411b175e6cfb36b02b322f
Changbin Liu 5 years ago
parent
commit
8311e70e9d
2 changed files with 8 additions and 2 deletions
  1. 1
    0
      bin/orchestrator
  2. 7
    2
      inception/orchestrator.py

+ 1
- 0
bin/orchestrator View File

@@ -34,6 +34,7 @@ def main():
34 34
                                 CONF.pool,
35 35
                                 CONF.user,
36 36
                                 CONF.image,
37
+                                CONF.chefserver_image,
37 38
                                 CONF.flavor,
38 39
                                 CONF.gateway_flavor,
39 40
                                 CONF.key_name,

+ 7
- 2
inception/orchestrator.py View File

@@ -69,7 +69,10 @@ orchestrator_opts = [
69 69
                help='login id with sudo for all nodes'),
70 70
     cfg.StrOpt('image',
71 71
                default='f3d62d5b-a76b-4997-a579-ff946a606132',
72
-               help='id of image used to construct nodes (=u1204-130531-gv)'),
72
+               help='id of image used to construct nodes (=u1204-130621-gv)'),
73
+    cfg.StrOpt('chefserver_image',
74
+               default='8848d4cd-1bdf-4627-ae31-ce9bf61440a4',
75
+               help='id of image to construct chefserver (=u1204-130716-gvc)'),
73 76
     cfg.IntOpt('flavor',
74 77
                default=3,
75 78
                help='id of machine flavor used for nodes (3=medium)'),
@@ -136,6 +139,7 @@ class Orchestrator(object):
136 139
                  pool,
137 140
                  user,
138 141
                  image,
142
+                 chefserver_image,
139 143
                  flavor,
140 144
                  gateway_flavor,
141 145
                  key_name,
@@ -166,6 +170,7 @@ class Orchestrator(object):
166 170
         self.pool = pool
167 171
         self.user = user
168 172
         self.image = image
173
+        self.chefserver_image = chefserver_image
169 174
         self.flavor = flavor
170 175
         self.gateway_flavor = gateway_flavor
171 176
         self.key_name = key_name
@@ -275,7 +280,7 @@ class Orchestrator(object):
275 280
         # launch chefserver
276 281
         chefserver = self.client.servers.create(
277 282
             name=self.prefix + CONCAT_CHAR + 'chefserver',
278
-            image=self.image,
283
+            image=self.chefserver_image,
279 284
             flavor=self.flavor,
280 285
             key_name=self.key_name,
281 286
             security_groups=self.security_groups,

Loading…
Cancel
Save