diff options
| -rw-r--r-- | docs/release/userguide/userguide.rst | 3 | ||||
| -rwxr-xr-x | mcp/config/states/maas | 2 | ||||
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml | 2 | ||||
| -rw-r--r-- | mcp/scripts/docker-compose/docker-compose.yaml.j2 | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/docs/release/userguide/userguide.rst b/docs/release/userguide/userguide.rst index 3905dbf14..5ec63db70 100644 --- a/docs/release/userguide/userguide.rst +++ b/docs/release/userguide/userguide.rst @@ -171,8 +171,7 @@ Network ``management`` | ``jumpserver`` | N/A | ``172.16.10.1`` | | | | (manual assignment) | +------------------+-----------------------+---------------------------------+ -| ``cfg01`` | 1st | ``172.16.10.2`` | -| | | (IP range ignored for now) | +| ``cfg01`` | 1st | ``172.16.10.11`` | +------------------+-----------------------+---------------------------------+ | ``mas01`` | 2nd | ``172.16.10.12`` | +------------------+-----------------------+---------------------------------+ diff --git a/mcp/config/states/maas b/mcp/config/states/maas index f321b7160..2764067da 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -78,7 +78,7 @@ if [ "${ERASE_ENV}" -gt 1 ]; then fi # MaaS rack/region controller, node commissioning -salt -C 'mas01*' state.apply linux,salt,openssh,ntp +wait_for 10.0 "salt -C 'mas01*' state.apply linux,salt,openssh,ntp" salt -C 'mas01*' state.apply maas.pxe_nat salt -C 'mas01*' state.apply maas.cluster diff --git a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml index a310fa3e8..3b57ea332 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml +++ b/mcp/salt-formulas/salt-formula-opendaylight/metadata/service/server/cluster.yml @@ -14,8 +14,8 @@ classes: parameters: _param: opendaylight_version: fluorine + cluster_vip_address: ${_param:opendaylight_service_host} keepalived_vip_virtual_router_id: 199 - keepalived_vip_address: ${_param:opendaylight_service_host} keepalived_vip_password: ${_param:opnfv_main_password} keepalived_vip_interface: ${_param:single_nic} haproxy_odl_api_check_params: check inter 20s fastinter 2s diff --git a/mcp/scripts/docker-compose/docker-compose.yaml.j2 b/mcp/scripts/docker-compose/docker-compose.yaml.j2 index a3119f92b..8cd9d5deb 100644 --- a/mcp/scripts/docker-compose/docker-compose.yaml.j2 +++ b/mcp/scripts/docker-compose/docker-compose.yaml.j2 @@ -62,4 +62,4 @@ networks: ipam: config: - subnet: {{ nm.net_mgmt }} - ip_range: {{ [nm.net_mgmt | ipnet_hostaddr(2), nm.net_mgmt.split("/")[-1]] | join("/") }} + ip_range: {{ [nm.net_mgmt | ipnet_hostaddr(nm.start_ip[nm.net_mgmt] + nm.net_mgmt_hosts.index('opnfv_infra_config_address') +1), nm.net_mgmt.split("/")[-1]] | join("/") }} |