diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-30 13:37:36 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-03-30 13:47:31 +0400 |
| commit | e083cf6350a227da161b07d2c68d9aa200611b32 (patch) | |
| tree | 8022c581b309a955a8f29a08d0131a8b892f0e49 | |
| parent | f3314c74504d8bc324211cd60241674f1998efd4 (diff) | |
Re-order opendaylight state
* return back opendaylight state after neutron setup
* sleep for awhile to let neutron api reconnect to the ODL
controller and agents to register on server
Change-Id: Ife0c7d3cc20574b0733e8e3064843c680379cc84
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 | 2 | ||||
| -rw-r--r-- | mcp/config/scenario/os-odl-nofeature-noha.yaml | 2 | ||||
| -rwxr-xr-x | mcp/config/states/opendaylight | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 index 0bd3a1307..76b893eae 100644 --- a/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 +++ b/mcp/config/scenario/os-odl-nofeature-ha.yaml.j2 @@ -23,8 +23,8 @@ cluster: {%- if conf.MCP_VCP %} - virtual_control_plane {%- endif %} - - opendaylight - openstack_ha + - opendaylight - networks virtual: nodes: diff --git a/mcp/config/scenario/os-odl-nofeature-noha.yaml b/mcp/config/scenario/os-odl-nofeature-noha.yaml index f52eaf5aa..260e1bacb 100644 --- a/mcp/config/scenario/os-odl-nofeature-noha.yaml +++ b/mcp/config/scenario/os-odl-nofeature-noha.yaml @@ -9,9 +9,9 @@ cluster: domain: mcp-pike-odl-noha.local states: - - opendaylight - openstack_noha - neutron_gateway + - opendaylight - networks virtual: nodes: diff --git a/mcp/config/states/opendaylight b/mcp/config/states/opendaylight index 5bbf0d7a8..d00a77352 100755 --- a/mcp/config/states/opendaylight +++ b/mcp/config/states/opendaylight @@ -22,3 +22,6 @@ salt -I 'opendaylight:server' service.mask opendaylight salt -I 'opendaylight:server' state.sls opendaylight wait_for 20 "salt --out yaml -C 'I@neutron:server and *01*' network.connect $(odl bind_ip) $(odl rest_port) | fgrep -q 'result: true'" + +# settle down neutron api and agents +sleep 180 |