Merge "Remove unnecessary lines from sample local.conf"
This commit is contained in:
commit
39431a6ccf
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user