openstack
/
tripleo-quickstart-extras
Code Issues Proposed changes

Add network prefix configuration 

When configuring the network, we need to properly pass in a network
prefix to the local-ip or it doesn't work. Additionally this should be
configurable.

Depends-On: https://review.openstack.org/#/c/581202/
Change-Id: I796a192b46c3372bebb41096c1051f01445b7e57
Related-Blueprint: all-in-one
This commit is contained in:
Alex Schultz 2018-07-09 10:22:08 -06:00 committed by yatin
parent fcf9c1315c
commit 46597925da
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
roles/standalone/README.md
View File

@ -14,6 +14,7 @@ Role Variables
- standalone_config: <'standalone_config.yaml.j2'> -- jinja template of the deployment configuration
- standalone_network: <'192.168.24'> -- First three octets of the network used
- standalone_network_prefix: <'24'> -- The subnet size for the standalone deployment network
- standalone_ip: <'192.168.24.1'> -- The IP address of the standalone deployment
- standalone_interface: <'br-ex'> -- The interface for the standalone deployment

1
roles/standalone/defaults/main.yml
View File

@ -1,6 +1,7 @@
---
standalone_config: standalone_config.yaml.j2
standalone_network: 192.168.24
standalone_network_prefix: 24
standalone_ip: 192.168.24.1
standalone_interface: br-ex

2
roles/standalone/templates/standalone.sh.j2
View File

@ -1,6 +1,6 @@
sudo openstack tripleo deploy \
--templates \
--local-ip={{ standalone_ip }} \
--local-ip={{ standalone_ip }}/{{ standalone_network_prefix }} \
-e {{ overcloud_templates_path }}/environments/standalone.yaml \
-r {{ overcloud_templates_path }}/roles/{{ standalone_role }} \
-e "{{ working_dir }}/standalone_parameters.yaml" \

6
roles/standalone/templates/standalone_config.yaml.j2
View File

@ -19,15 +19,15 @@ parameter_defaults:
DockerInsecureRegistryAddress:
- {{ standalone_ip }}:8787
MasqueradeNetworks:
{{ standalone_network }}.0/24:
- {{ standalone_network }}.0/24
{{ standalone_network }}.0/{{ standalone_network_prefix }}:
- {{ standalone_network }}.0/{{ standalone_network_prefix }}
NeutronPublicInterface: {{ standalone_interface }}
StandaloneCtlplaneLocalSubnet: ctlplane-subnet
StandaloneCtlplaneSubnets:
ctlplane-subnet:
DhcpRangeEnd: {{ standalone_network }}.40
DhcpRangeStart: {{ standalone_network }}.20
NetworkCidr: {{ standalone_network }}.0/24
NetworkCidr: {{ standalone_network }}.0/{{ standalone_network_prefix }}
NetworkGateway: {{ standalone_ip }}
StandaloneEnableRoutedNetworks: false
StandaloneHomeDir: {{ working_dir }}