summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/source/contributor/dev-quickstart.rst12
-rw-r--r--doc/source/contributor/ironic-multitenant-networking.rst12
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