openstack/ironic
Code Issues Proposed changes

Merge "Remove unnecessary lines from sample local.conf"

Browse Source
This commit is contained in:
Zuul 2018-02-08 01:03:58 +00:00 committed by Gerrit Code Review
commit 39431a6ccf
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/contributor/dev-quickstart.rst
View File

@ -449,15 +449,8 @@ by default::
# Enable Ironic plugin # Enable Ironic plugin
enable_plugin ironic git://git.openstack.org/openstack/ironic enable_plugin ironic git://git.openstack.org/openstack/ironic
# Enable Neutron which is required by Ironic and disable nova-network. # Disable nova novnc service, ironic does not support it anyway.
disable_service n-net
disable_service n-novnc 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 Swift for agent_* drivers
enable_service s-proxy enable_service s-proxy
@ -468,9 +461,6 @@ by default::
# Disable Horizon # Disable Horizon
disable_service horizon disable_service horizon
# Disable Heat
disable_service heat h-api h-api-cfn h-api-cw h-eng
# Disable Cinder # Disable Cinder
disable_service cinder c-sch c-api c-vol disable_service cinder c-sch c-api c-vol

12
doc/source/contributor/ironic-multitenant-networking.rst
View File

@ -65,15 +65,8 @@ configured in Neutron.
enable_service ir-api enable_service ir-api
enable_service ir-cond enable_service ir-cond
# Enable Neutron which is required by Ironic and disable nova-network. # Disable nova novnc service, ironic does not support it anyway.
disable_service n-net
disable_service n-novnc 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 Swift for agent_* drivers
enable_service s-proxy enable_service s-proxy
@ -84,9 +77,6 @@ configured in Neutron.
# Disable Horizon # Disable Horizon
disable_service horizon disable_service horizon
# Disable Heat
disable_service heat h-api h-api-cfn h-api-cw h-eng
# Disable Cinder # Disable Cinder
disable_service cinder c-sch c-api c-vol disable_service cinder c-sch c-api c-vol