summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhijunWei <wzj334965317@outlook.com>2018-06-15 03:16:35 +0000
committerzhulingjie <easyzlj@gmail.com>2018-06-10 11:32:50 -0400
commit5f19844c294ca39c2352c3be1656a3e8c5719720 (patch)
tree800ebfc6178455356e3831b2e8d72b8daffec3c3
parentb76f40166ac0d30439552bd8079b8029cd0601c9 (diff)
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
Notes
Notes (review): Code-Review+1: Liping Mao <limao@cisco.com> Code-Review+1: wangqi <wang.qi@99cloud.net> Code-Review+1: zhulingjie <easyzlj@gmail.com> Code-Review+2: caoyuan <cao.yuan@99cloud.net> Code-Review+1: weizj <wzj334965317@outlook.com> Code-Review+1: ziyu <chen.qiaomin@99cloud.net> Code-Review+2: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Workflow+1: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 18 Jul 2018 17:24:02 +0000 Reviewed-on: https://review.openstack.org/575593 Project: openstack/kolla-ansible Branch: refs/heads/master
-rw-r--r--contrib/dev/vagrant/Vagrantfile9
-rw-r--r--contrib/dev/vagrant/Vagrantfile.custom.example5
-rw-r--r--contrib/dev/vagrant/bootstrap.sh1
3 files changed, 13 insertions, 2 deletions
diff --git a/contrib/dev/vagrant/Vagrantfile b/contrib/dev/vagrant/Vagrantfile
index 1956ce0..26b6294 100644
--- a/contrib/dev/vagrant/Vagrantfile
+++ b/contrib/dev/vagrant/Vagrantfile
@@ -85,6 +85,7 @@ NUMBER_OF_CONTROL_NODES ||= 3
85NUMBER_OF_COMPUTE_NODES ||= 1 85NUMBER_OF_COMPUTE_NODES ||= 1
86NUMBER_OF_STORAGE_NODES ||= 1 86NUMBER_OF_STORAGE_NODES ||= 1
87NUMBER_OF_NETWORK_NODES ||= 1 87NUMBER_OF_NETWORK_NODES ||= 1
88NUMBER_OF_MONITOR_NODES ||= 1
88 89
89NODE_SETTINGS ||= { 90NODE_SETTINGS ||= {
90 aio: { 91 aio: {
@@ -110,6 +111,10 @@ NODE_SETTINGS ||= {
110 network: { 111 network: {
111 cpus: 1, 112 cpus: 1,
112 memory: 1024 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 # The operator controls the deployment 237 # The operator controls the deployment
233 config.vm.define "operator", primary: true do |admin| 238 config.vm.define "operator", primary: true do |admin|
234 admin.vm.hostname = "operator.local" 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 admin.vm.synced_folder kolla_ansible_repo_path, kolla_ansible_path, create:"True", type: get_default(:sync_method) 241 admin.vm.synced_folder kolla_ansible_repo_path, kolla_ansible_path, create:"True", type: get_default(:sync_method)
237 admin.vm.synced_folder kolla_repo_path, kolla_path, create:"True", type: get_default(:sync_method) 242 admin.vm.synced_folder kolla_repo_path, kolla_path, create:"True", type: get_default(:sync_method)
238 admin.vm.synced_folder kolla_cli_repo_path, kolla_cli_path, create:"True", type: get_default(:sync_method) 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 hostname = "#{node_type}0#{i}" 261 hostname = "#{node_type}0#{i}"
257 config.vm.define hostname do |node| 262 config.vm.define hostname do |node|
258 node.vm.hostname = "#{hostname}.local" 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 node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method) 265 node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method)
261 node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) 266 node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method)
262 node.vm.synced_folder ".", vagrant_shared_folder, disabled: true 267 node.vm.synced_folder ".", vagrant_shared_folder, disabled: true
diff --git a/contrib/dev/vagrant/Vagrantfile.custom.example b/contrib/dev/vagrant/Vagrantfile.custom.example
index 65340aa..5c7cfbe 100644
--- a/contrib/dev/vagrant/Vagrantfile.custom.example
+++ b/contrib/dev/vagrant/Vagrantfile.custom.example
@@ -68,6 +68,7 @@
68# NUMBER_OF_COMPUTE_NODES = 1 68# NUMBER_OF_COMPUTE_NODES = 1
69# NUMBER_OF_STORAGE_NODES = 1 69# NUMBER_OF_STORAGE_NODES = 1
70# NUMBER_OF_NETWORK_NODES = 1 70# NUMBER_OF_NETWORK_NODES = 1
71# NUMBER_OF_MONITOR_NODES = 1
71 72
72# NODE_SETTINGS = { 73# NODE_SETTINGS = {
73# aio: { 74# aio: {
@@ -93,5 +94,9 @@
93# network: { 94# network: {
94# cpus: 1, 95# cpus: 1,
95# memory: 1024 96# memory: 1024
97# },
98# monitor: {
99# cpus: 1,
100# memory: 1024
96# } 101# }
97# } 102# }
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh
index 81477e6..a4c47e7 100644
--- a/contrib/dev/vagrant/bootstrap.sh
+++ b/contrib/dev/vagrant/bootstrap.sh
@@ -15,6 +15,7 @@ NUMBER_OF_COMPUTE_NODES=$6
15NUMBER_OF_STORAGE_NODES=$7 15NUMBER_OF_STORAGE_NODES=$7
16NUMBER_OF_NETWORK_NODES=$8 16NUMBER_OF_NETWORK_NODES=$8
17NUMBER_OF_CONTROL_NODES=$9 17NUMBER_OF_CONTROL_NODES=$9
18NUMBER_OF_MONITOR_NODES=$10
18 19
19export http_proxy= 20export http_proxy=
20export https_proxy= 21export https_proxy=