diff options
| author | ZhijunWei <wzj334965317@outlook.com> | 2018-06-15 03:16:35 +0000 |
|---|---|---|
| committer | zhulingjie <easyzlj@gmail.com> | 2018-06-10 11:32:50 -0400 |
| commit | 5f19844c294ca39c2352c3be1656a3e8c5719720 (patch) | |
| tree | 800ebfc6178455356e3831b2e8d72b8daffec3c3 /contrib | |
| parent | b76f40166ac0d30439552bd8079b8029cd0601c9 (diff) | |
| download | kolla-ansible-5f19844c294ca39c2352c3be1656a3e8c5719720.tar.gz kolla-ansible-5f19844c294ca39c2352c3be1656a3e8c5719720.zip | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/Vagrantfile | 9 | ||||
| -rw-r--r-- | contrib/dev/vagrant/Vagrantfile.custom.example | 5 | ||||
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 1 |
3 files changed, 13 insertions, 2 deletions
diff --git a/contrib/dev/vagrant/Vagrantfile b/contrib/dev/vagrant/Vagrantfile index 1956ce0c7..26b6294da 100644 --- a/contrib/dev/vagrant/Vagrantfile +++ b/contrib/dev/vagrant/Vagrantfile @@ -85,6 +85,7 @@ NUMBER_OF_CONTROL_NODES ||= 3 NUMBER_OF_COMPUTE_NODES ||= 1 NUMBER_OF_STORAGE_NODES ||= 1 NUMBER_OF_NETWORK_NODES ||= 1 +NUMBER_OF_MONITOR_NODES ||= 1 NODE_SETTINGS ||= { aio: { @@ -110,6 +111,10 @@ NODE_SETTINGS ||= { network: { cpus: 1, memory: 1024 + }, + monitor: { + cpus: 1, + memory: 1024 } } @@ -232,7 +237,7 @@ Vagrant.configure(2) do |config| # The operator controls the deployment config.vm.define "operator", primary: true do |admin| admin.vm.hostname = "operator.local" - 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}" + 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}" admin.vm.synced_folder kolla_ansible_repo_path, kolla_ansible_path, create:"True", type: get_default(:sync_method) admin.vm.synced_folder kolla_repo_path, kolla_path, create:"True", type: get_default(:sync_method) 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| hostname = "#{node_type}0#{i}" config.vm.define hostname do |node| node.vm.hostname = "#{hostname}.local" - 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}" + 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}" node.vm.synced_folder File.join(vagrant_dir, 'storage', node_type), "/data/host", create:"True", type: get_default(:sync_method) node.vm.synced_folder File.join(vagrant_dir, 'storage', 'shared'), "/data/shared", create:"True", type: get_default(:sync_method) 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 65340aa0a..5c7cfbe47 100644 --- a/contrib/dev/vagrant/Vagrantfile.custom.example +++ b/contrib/dev/vagrant/Vagrantfile.custom.example @@ -68,6 +68,7 @@ # NUMBER_OF_COMPUTE_NODES = 1 # NUMBER_OF_STORAGE_NODES = 1 # NUMBER_OF_NETWORK_NODES = 1 +# NUMBER_OF_MONITOR_NODES = 1 # NODE_SETTINGS = { # aio: { @@ -93,5 +94,9 @@ # network: { # cpus: 1, # memory: 1024 +# }, +# monitor: { +# cpus: 1, +# memory: 1024 # } # } diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index 81477e61e..a4c47e78b 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -15,6 +15,7 @@ NUMBER_OF_COMPUTE_NODES=$6 NUMBER_OF_STORAGE_NODES=$7 NUMBER_OF_NETWORK_NODES=$8 NUMBER_OF_CONTROL_NODES=$9 +NUMBER_OF_MONITOR_NODES=$10 export http_proxy= export https_proxy= |