openstack/tacker
Code Issues Proposed changes

Merge "Update config in tacker installer"

Browse Source
This commit is contained in:
Zuul
2022-07-19 01:21:21 +00:00
committed by Gerrit Code Review
parent c9842ff16d fc73097874
commit a018a5fcbb
7 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/contributor/vagrant_devstack.rst
View File

@@ -70,7 +70,7 @@ Setup Configuration File
.. code-block:: console .. code-block:: console
$ ssh -F ssh_config controller $ ssh -F /path/to/tacker/vagrant/devstack/ssh_config controller
Setup ``machines.yml`` which is a config file defines parameters of each Setup ``machines.yml`` which is a config file defines parameters of each
VM you deploy. VM you deploy.
@@ -155,7 +155,7 @@ describing how you configure the file.
.. code-block:: console .. code-block:: console
$ ansible-playbook -i hosts site.yml $ ansible-playbook -i hosts site.yaml
After finished all tasks, you can login to the launched VMs. So, login to After finished all tasks, you can login to the launched VMs. So, login to
controller node and run ``stack.sh`` for installing OpenStack. controller node and run ``stack.sh`` for installing OpenStack.
@@ -167,7 +167,7 @@ if you customize it furthermore by yourself.
.. code-block:: console .. code-block:: console
$ ssh stack@192.168.33.11 $ ssh stack@192.168.56.11
$ cd devstack $ cd devstack
$ YOUR_FAVORITE_EDITOR local.conf $ YOUR_FAVORITE_EDITOR local.conf
$ ./stack.sh $ ./stack.sh

24
vagrant/devstack/README.md
View File

@@ -1,4 +1,4 @@
# vagrant-devstack # Devstack Installer for Tacker
## What is this ## What is this
@@ -65,19 +65,23 @@ There are some parameters in `group_vars/all.yml` such as password on devstack
or optional configurations. You don't need to update it usually. or optional configurations. You don't need to update it usually.
```sh ```sh
$ ansible-playbook -i hosts site.yml $ ansible-playbook -i hosts site.yaml
``` ```
After finished ansible's tasks, you can login to launched VMs. So, login to After finished ansible's tasks, you can login to launched VMs with hostname you
controller node and run `stack.sh` for installing OpenStack. You will find that defined in `machines.yml`.
`local.conf` is prepared for your environment by using its example. So, let's login to controller node and OpenStack. You will find that two
See instruction how to configure `local.conf` described in examples of `local.conf` are prepared in `$HOME/devstack` for your environment.
[DevStack Quick Start](https://docs.openstack.org/devstack/latest/)
if you customize it by yourself. * local.conf.example
* local.conf.kubernetes
```sh ```sh
$ ssh stack@192.168.33.11 $ ssh stack@192.168.56.11
$ cd devstack $ cd devstack
$ YOUR_FAVORITE_EDITOR local.conf $ cp local.conf.kubernetes local.conf
$ ./stack.sh $ ./stack.sh
``` ```
See instruction how to configure `local.conf` described in
[DevStack Quick Start](https://docs.openstack.org/devstack/latest/).

4
vagrant/devstack/group_vars/all.yml
View File

@@ -10,8 +10,8 @@ service_password: devstack
service_token: devstack service_token: devstack
# compute nodes # compute nodes
service_host: 192.168.33.11 service_host: 192.168.56.11
floating_range: 192.168.33.128/25 floating_range: 192.168.56.128/25
fixed_range: 10.4.128.0/20 fixed_range: 10.4.128.0/20
# 2. Configure optional tools on controller node # 2. Configure optional tools on controller node

8
vagrant/devstack/hosts
View File

@@ -1,9 +1,9 @@
[ubuntu-focal.controller] [ubuntu-focal.controller]
192.168.33.11 192.168.56.11
[ubuntu-focal.compute] [ubuntu-focal.compute]
#192.168.33.12 #192.168.56.12
#192.168.33.13 #192.168.56.13
[centos-stream8.controller] [centos-stream8.controller]
#192.168.33.11 #192.168.56.14

2
vagrant/devstack/lib/machine.rb
View File

@@ -9,7 +9,7 @@ class Machines < Array
def initialize( def initialize(
hostname="controller", provider="virtualbox", box="ubuntu/focal64", hostname="controller", provider="virtualbox", box="ubuntu/focal64",
nof_cpus=2, mem_size=4, disk_size=10, nof_cpus=2, mem_size=4, disk_size=10,
private_ips=["192.168.33.11"], public_ips=nil, ssh_forward_x11=false, private_ips=["192.168.56.11"], public_ips=nil, ssh_forward_x11=false,
fwd_port_list=nil) fwd_port_list=nil)
@hostname = hostname @hostname = hostname
@provider = provider @provider = provider

18
vagrant/devstack/samples/machines-2nodes.yml
View File

@@ -7,17 +7,15 @@ machines:
- hostname: controller - hostname: controller
provider: virtualbox provider: virtualbox
box: ubuntu/focal64 box: ubuntu/focal64
nof_cpus: 2 nof_cpus: 4
mem_size: 4 mem_size: 12
disk_size: 20 disk_size: 50
private_ips: private_ips:
- 192.168.33.11 - 192.168.56.11
public_ips: public_ips:
fwd_port_list: fwd_port_list:
- guest: 80 - guest: 80
host: 10080 host: 20080
- guest: 6081
host: 6081
- hostname: compute - hostname: compute
provider: virtualbox provider: virtualbox
@@ -26,10 +24,6 @@ machines:
mem_size: 8 mem_size: 8
disk_size: 50 disk_size: 50
private_ips: private_ips:
- 192.168.34.11 - 192.168.56.12
public_ips: public_ips:
fwd_port_list: fwd_port_list:
- guest: 80
host: 10081
- guest: 6081
host: 6081

8
vagrant/devstack/samples/machines.yml
View File

@@ -9,13 +9,11 @@ machines:
# Supported boxes are `ubuntu/focal64`, `centos/stream8`. # Supported boxes are `ubuntu/focal64`, `centos/stream8`.
box: ubuntu/focal64 box: ubuntu/focal64
nof_cpus: 4 nof_cpus: 4
mem_size: 8 mem_size: 12
disk_size: 50 disk_size: 50
private_ips: private_ips:
- 192.168.33.11 - 192.168.56.11
public_ips: public_ips:
fwd_port_list: fwd_port_list:
- guest: 80 - guest: 80
host: 10080 host: 20080
- guest: 6081
host: 6081