diff --git a/doc/source/install-guide/configure-haproxy.rst b/doc/source/install-guide/configure-haproxy.rst index 03d42551d4..44da200924 100644 --- a/doc/source/install-guide/configure-haproxy.rst +++ b/doc/source/install-guide/configure-haproxy.rst @@ -21,12 +21,12 @@ hosts which should run HAProxy: .. code-block:: yaml haproxy_hosts: - 123456-infra01: - ip: 172.29.236.51 - 123457-infra02: - ip: 172.29.236.52 - 123458-infra03: - ip: 172.29.236.53 + infra1: + ip: 172.29.236.101 + infra2: + ip: 172.29.236.102 + infra3: + ip: 172.29.236.103 There is an example configuration file already provided in ``/etc/openstack_deploy/conf.d/haproxy.yml.example``. Rename the file to diff --git a/doc/source/install-guide/overview-workflow.rst b/doc/source/install-guide/overview-workflow.rst index 67fbf3c122..4091e6c02e 100644 --- a/doc/source/install-guide/overview-workflow.rst +++ b/doc/source/install-guide/overview-workflow.rst @@ -3,8 +3,9 @@ Installation workflow --------------------- -This diagram shows the general workflow associated with OSA -installation. +This diagram shows the general workflow associated with an +OpenStack-Ansible (OSA) installation. + **Figure 1.7. Installation workflow** @@ -17,6 +18,82 @@ installation. #. :doc:`Run infrastructure playbooks ` #. :doc:`Run OpenStack playbooks ` +======= + +Network ranges +~~~~~~~~~~~~~~ + +For consistency, the following IP addresses and hostnames will be +referred to in this installation workflow. + ++-----------------------+-----------------+ +| Network | IP Range | ++=======================+=================+ +| Management Network | 172.29.236.0/22 | ++-----------------------+-----------------+ +| Tunnel (VXLAN) Network| 172.29.240.0/22 | ++-----------------------+-----------------+ +| Storage Network | 172.29.244.0/22 | ++-----------------------+-----------------+ + + +IP assignments +~~~~~~~~~~~~~~ + ++------------------+----------------+-------------------+----------------+ +| Host name | Management IP | Tunnel (VxLAN) IP | Storage IP | ++==================+================+===================+================+ +| infra1 | 172.29.236.101 | 172.29.240.101 | 172.29.244.101 | ++------------------+----------------+-------------------+----------------+ +| infra2 | 172.29.236.102 | 172.29.240.102 | 172.29.244.102 | ++------------------+----------------+-------------------+----------------+ +| infra3 | 172.29.236.103 | 172.29.240.103 | 172.29.244.103 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| net1 | 172.29.236.111 | 172.29.240.111 | | ++------------------+----------------+-------------------+----------------+ +| net2 | 172.29.236.112 | 172.29.240.112 | | ++------------------+----------------+-------------------+----------------+ +| net3 | 172.29.236.113 | 172.29.240.113 | | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| compute1 | 172.29.236.121 | 172.29.240.121 | 172.29.244.121 | ++------------------+----------------+-------------------+----------------+ +| compute2 | 172.29.236.122 | 172.29.240.122 | 172.29.244.122 | ++------------------+----------------+-------------------+----------------+ +| compute3 | 172.29.236.123 | 172.29.240.123 | 172.29.244.123 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| lvm-storage1 | 172.29.236.131 | | 172.29.244.131 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| nfs-storage1 | 172.29.236.141 | | 172.29.244.141 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| ceph-mon1 | 172.29.236.151 | | 172.29.244.151 | ++------------------+----------------+-------------------+----------------+ +| ceph-mon2 | 172.29.236.152 | | 172.29.244.152 | ++------------------+----------------+-------------------+----------------+ +| ceph-mon3 | 172.29.236.153 | | 172.29.244.153 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| swift1 | 172.29.236.161 | | 172.29.244.161 | ++------------------+----------------+-------------------+----------------+ +| swift2 | 172.29.236.162 | | 172.29.244.162 | ++------------------+----------------+-------------------+----------------+ +| swift3 | 172.29.236.163 | | 172.29.244.163 | ++------------------+----------------+-------------------+----------------+ +| | | | | ++------------------+----------------+-------------------+----------------+ +| log1 | 172.29.236.171 | | | ++------------------+----------------+-------------------+----------------+ + -------------- .. include:: navigation.txt diff --git a/etc/openstack_deploy/openstack_user_config.yml.example b/etc/openstack_deploy/openstack_user_config.yml.example index 6607cf8435..cfbf51a0d0 100644 --- a/etc/openstack_deploy/openstack_user_config.yml.example +++ b/etc/openstack_deploy/openstack_user_config.yml.example @@ -90,8 +90,9 @@ # # used_ips: # - 172.29.236.1 -# - "172.29.236.11,172.29.236.12" -# - "172.29.239.231,172.29.239.254" +# - "172.29.236.100,172.29.236.200" +# - "172.29.240.100,172.29.240.200" +# - "172.29.244.100,172.29.244.200" # # -------- # @@ -339,11 +340,11 @@ # # os-infra_hosts: # infra1: -# ip: 172.29.236.100 -# infra2: # ip: 172.29.236.101 -# infra3: +# infra2: # ip: 172.29.236.102 +# infra3: +# ip: 172.29.236.103 # # -------- # @@ -417,7 +418,7 @@ # # compute_hosts: # compute1: -# ip: 172.29.236.111 +# ip: 172.29.236.121 # # -------- # @@ -560,8 +561,8 @@ # Define an OpenStack storage host: # # storage_hosts: -# storage1: -# ip: 172.29.236.121 +# lvm-storage1: +# ip: 172.29.236.131 # # Example: # @@ -639,4 +640,4 @@ # # log_hosts: # log1: -# ip: 172.29.236.131 +# ip: 172.29.236.171