diff --git a/roles/standalone/README.md b/roles/standalone/README.md index 5e2f9c795..d4e81c823 100644 --- a/roles/standalone/README.md +++ b/roles/standalone/README.md @@ -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 diff --git a/roles/standalone/defaults/main.yml b/roles/standalone/defaults/main.yml index 11e8fab6f..d7ff98778 100644 --- a/roles/standalone/defaults/main.yml +++ b/roles/standalone/defaults/main.yml @@ -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 diff --git a/roles/standalone/templates/standalone.sh.j2 b/roles/standalone/templates/standalone.sh.j2 index e73439b35..f0c4b3b3e 100644 --- a/roles/standalone/templates/standalone.sh.j2 +++ b/roles/standalone/templates/standalone.sh.j2 @@ -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" \ diff --git a/roles/standalone/templates/standalone_config.yaml.j2 b/roles/standalone/templates/standalone_config.yaml.j2 index 998eeeeb5..94d198db2 100644 --- a/roles/standalone/templates/standalone_config.yaml.j2 +++ b/roles/standalone/templates/standalone_config.yaml.j2 @@ -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 }}