diff options
author | Zuul <zuul@review.openstack.org> | 2018-02-08 01:03:58 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-02-08 01:03:58 +0000 |
commit | 39431a6ccfeab69f7d4ec05e65113ccee7bb0774 (patch) | |
tree | 05796880e573cfdb490b8bc77ca74dd632769eb3 | |
parent | b73b8bc8fb3e042228beadf03dd598dbd1dabbd7 (diff) | |
parent | 3363fce3be5d644da61e67843fc74b05e92d927e (diff) | |
download | ironic-39431a6ccfeab69f7d4ec05e65113ccee7bb0774.tar.gz |
Merge "Remove unnecessary lines from sample local.conf"
-rw-r--r-- | doc/source/contributor/dev-quickstart.rst | 12 | ||||
-rw-r--r-- | doc/source/contributor/ironic-multitenant-networking.rst | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/doc/source/contributor/dev-quickstart.rst b/doc/source/contributor/dev-quickstart.rst index 4b0f0e3d0..f97eee5b7 100644 --- a/doc/source/contributor/dev-quickstart.rst +++ b/doc/source/contributor/dev-quickstart.rst @@ -449,15 +449,8 @@ by default:: # Enable Ironic plugin enable_plugin ironic git://git.openstack.org/openstack/ironic - # Enable Neutron which is required by Ironic and disable nova-network. - disable_service n-net + # Disable nova novnc service, ironic does not support it anyway. disable_service n-novnc - enable_service q-svc - enable_service q-agt - enable_service q-dhcp - enable_service q-l3 - enable_service q-meta - enable_service neutron # Enable Swift for agent_* drivers enable_service s-proxy @@ -468,9 +461,6 @@ by default:: # Disable Horizon disable_service horizon - # Disable Heat - disable_service heat h-api h-api-cfn h-api-cw h-eng - # Disable Cinder disable_service cinder c-sch c-api c-vol diff --git a/doc/source/contributor/ironic-multitenant-networking.rst b/doc/source/contributor/ironic-multitenant-networking.rst index 15e72d277..60e40f456 100644 --- a/doc/source/contributor/ironic-multitenant-networking.rst +++ b/doc/source/contributor/ironic-multitenant-networking.rst @@ -65,15 +65,8 @@ configured in Neutron. enable_service ir-api enable_service ir-cond - # Enable Neutron which is required by Ironic and disable nova-network. - disable_service n-net + # Disable nova novnc service, ironic does not support it anyway. disable_service n-novnc - enable_service q-svc - enable_service q-agt - enable_service q-dhcp - enable_service q-l3 - enable_service q-meta - enable_service neutron # Enable Swift for agent_* drivers enable_service s-proxy @@ -84,9 +77,6 @@ configured in Neutron. # Disable Horizon disable_service horizon - # Disable Heat - disable_service heat h-api h-api-cfn h-api-cw h-eng - # Disable Cinder disable_service cinder c-sch c-api c-vol |