Browse Source

Add NUMBER_OF_MONITOR_NODES for bootstrap

The parameter "NUMBER_OF_MONITOR_NODES" is needed when run
bootstrap.sh[0], but it's missing, this ps to add it.

[0]: https://github.com/openstack/kolla-ansible/blob/master/contrib/dev/vagrant/bootstrap.sh#L206

Change-Id: If83620bbdeaf8c4805e021242ca44da069e43922
tags/7.0.0.0b3
ZhijunWei 11 months ago
parent
commit
5f19844c29

+ 7
- 2
contrib/dev/vagrant/Vagrantfile View File

@@ -85,6 +85,7 @@ NUMBER_OF_CONTROL_NODES ||= 3
85 85
 NUMBER_OF_COMPUTE_NODES ||= 1
86 86
 NUMBER_OF_STORAGE_NODES ||= 1
87 87
 NUMBER_OF_NETWORK_NODES ||= 1
88
+NUMBER_OF_MONITOR_NODES ||= 1
88 89
 
89 90
 NODE_SETTINGS ||= {
90 91
   aio: {
@@ -110,6 +111,10 @@ NODE_SETTINGS ||= {
110 111
   network: {
111 112
     cpus: 1,
112 113
     memory: 1024
114
+  },
115
+  monitor: {
116
+    cpus: 1,
117
+    memory: 1024
113 118
   }
114 119
 }
115 120
 
@@ -232,7 +237,7 @@ Vagrant.configure(2) do |config|
232 237
   # The operator controls the deployment
233 238
   config.vm.define "operator", primary: true do |admin|
234 239
     admin.vm.hostname = "operator.local"
235
-    admin.vm.provision :shell, path: PROVISION_SCRIPT, args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{kolla_path} #{kolla_ansible_path} #{kolla_cli_path} #{NUMBER_OF_COMPUTE_NODES} #{NUMBER_OF_STORAGE_NODES} #{NUMBER_OF_NETWORK_NODES} #{NUMBER_OF_CONTROL_NODES}"
240
+    admin.vm.provision :shell, path: PROVISION_SCRIPT, args: "operator #{MULTINODE ? 'multinode' : 'aio'} #{kolla_path} #{kolla_ansible_path} #{kolla_cli_path} #{NUMBER_OF_COMPUTE_NODES} #{NUMBER_OF_STORAGE_NODES} #{NUMBER_OF_NETWORK_NODES} #{NUMBER_OF_CONTROL_NODES} #{NUMBER_OF_MONITOR_NODES}"
236 241
     admin.vm.synced_folder kolla_ansible_repo_path, kolla_ansible_path, create:"True", type: get_default(:sync_method)
237 242
     admin.vm.synced_folder kolla_repo_path, kolla_path, create:"True", type: get_default(:sync_method)
238 243
     admin.vm.synced_folder kolla_cli_repo_path, kolla_cli_path, create:"True", type: get_default(:sync_method)
@@ -256,7 +261,7 @@ Vagrant.configure(2) do |config|
256 261
         hostname = "#{node_type}0#{i}"
257 262
         config.vm.define hostname do |node|
258 263
           node.vm.hostname = "#{hostname}.local"
259
-          node.vm.provision :shell, path: PROVISION_SCRIPT, args: "#{hostname} multinode #{kolla_path} #{kolla_ansible_path} #{kolla_cli_path} #{NUMBER_OF_COMPUTE_NODES} #{NUMBER_OF_STORAGE_NODES} #{NUMBER_OF_NETWORK_NODES} #{NUMBER_OF_CONTROL_NODES}"
264
+          node.vm.provision :shell, path: PROVISION_SCRIPT, args: "#{hostname} multinode #{kolla_path} #{kolla_ansible_path} #{kolla_cli_path} #{NUMBER_OF_COMPUTE_NODES} #{NUMBER_OF_STORAGE_NODES} #{NUMBER_OF_NETWORK_NODES} #{NUMBER_OF_CONTROL_NODES} #{NUMBER_OF_MONITOR_NODES}"
260 265
           node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method)
261 266
           node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method)
262 267
           node.vm.synced_folder ".", vagrant_shared_folder, disabled: true

+ 5
- 0
contrib/dev/vagrant/Vagrantfile.custom.example View File

@@ -68,6 +68,7 @@
68 68
 # NUMBER_OF_COMPUTE_NODES = 1
69 69
 # NUMBER_OF_STORAGE_NODES = 1
70 70
 # NUMBER_OF_NETWORK_NODES = 1
71
+# NUMBER_OF_MONITOR_NODES = 1
71 72
 
72 73
 # NODE_SETTINGS = {
73 74
 #   aio: {
@@ -93,5 +94,9 @@
93 94
 #   network: {
94 95
 #     cpus: 1,
95 96
 #     memory: 1024
97
+#   },
98
+#   monitor: {
99
+#     cpus: 1,
100
+#     memory: 1024
96 101
 #   }
97 102
 # }

+ 1
- 0
contrib/dev/vagrant/bootstrap.sh View File

@@ -15,6 +15,7 @@ NUMBER_OF_COMPUTE_NODES=$6
15 15
 NUMBER_OF_STORAGE_NODES=$7
16 16
 NUMBER_OF_NETWORK_NODES=$8
17 17
 NUMBER_OF_CONTROL_NODES=$9
18
+NUMBER_OF_MONITOR_NODES=$10
18 19
 
19 20
 export http_proxy=
20 21
 export https_proxy=

Loading…
Cancel
Save