Changes to be committed:
	modified:   pillar/config.sls
	modified:   pillar/config.sls~
	modified:   salt/keystone/init.sls
	modified:   salt/neutron-compute/file/neutron.conf
	new file:   salt/neutron-controller/file/local_settings.py
	modified:   salt/neutron-controller/file/neutron.conf
	modified:   salt/neutron-controller/init.sls
	modified:   salt/neutron-network/file/interfaces
	modified:   salt/neutron-network/file/metadata_agent.ini
	modified:   salt/neutron-network/file/neutron.conf
	modified:   salt/neutron-network/init.sls
	modified:   salt/nova/file/nova-compute.conf
	modified:   salt/top.sls