diff options
| author | Pavlo Shchelokovskyy <pshchelokovskyy@mirantis.com> | 2016-08-03 19:06:35 +0300 |
|---|---|---|
| committer | Vasyl Saienko <vsaienko@mirantis.com> | 2016-09-12 11:50:56 +0300 |
| commit | 15de01a5f606984425494553af9131ef16b6f62f (patch) | |
| tree | 085efecb0ffe1c6e88558c9a739b7925f59796f8 /devstack/plugin.sh | |
| parent | 0e15d37fcffc1e8ee2488089f2ca414eaebd4ed2 (diff) | |
| download | ironic-15de01a5f606984425494553af9131ef16b6f62f.tar.gz | |
Configure clean network to provision network
Currently when setting up Ironic with multi-tenancy support,
the DevStack plugin by default still sets the cleaning network
to the default private network of the demo project,
which is not exactly correct.
Change the DevStack plugin so that the cleaning network
is the same as provisioning network if IRONIC_CLEAN_NET_NAME is not set:
- In case of multi-tenancy support enabled, use the created separate
provisioning network
- w/o multi-tenancy support use the default private network.
If the IRONIC_CLEAN_NET_NAME is provided, use that.
Change-Id: I9db8f5e3000f05d27a3fa8fc94cfdafe34a6f48a
Diffstat (limited to 'devstack/plugin.sh')
| -rw-r--r-- | devstack/plugin.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 30b5d9daa..5a7b5f660 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -41,9 +41,10 @@ if is_service_enabled ir-api ir-cond; then echo_summary "Creating bridge and VMs" create_bridge_and_vms fi - if [[ -n "${IRONIC_PROVISION_NETWORK_NAME}" ]]; then - echo_summary "Configuring Ironic provisioning network" - configure_ironic_provision_network + + if is_service_enabled neutron; then + echo_summary "Configuring Ironic networks" + configure_ironic_networks fi # Start the ironic API and ironic taskmgr components |