From b62ad85470649e946b4aa423c5622189e850348d Mon Sep 17 00:00:00 2001 From: armando-migliaccio Date: Fri, 11 Oct 2013 14:39:28 -0700 Subject: [PATCH] Add migration support from agent to NSX dhcp/metadata services This is feature patch (3 of 3) that introduces support for transitioning existing NSX-based deployments from the agent based model of providing dhcp and metadata proxy services to the new agentless based mode. In 'combined' mode, existing networks will still be served by the existing infrastructure, whereas new networks will be served by the new infrastructure. Networks may be migrated to the model using a new CLI tool provided, called 'neutron-nsx-manage'. Currently the tool provides two admin-only commands: neutron-nsx-manage net-report This will check that the network can be migrated and returns the resources currently in use. And: neutron-nsx-manage net-migrate This will move the network over the new model and deallocate resources from the agent. Once a network has been migrated there is no turning back. Completes-blueprint nsx-integrated-services Change-Id: I37c9aa0e76124e1023899106406de7be6714c24d --- etc/policy.json | 4 +++- setup.cfg | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/policy.json b/etc/policy.json index cd65e6b9..a72d3a93 100644 --- a/etc/policy.json +++ b/etc/policy.json @@ -131,5 +131,7 @@ "delete_metering_label_rule": "rule:admin_only", "get_metering_label_rule": "rule:admin_only", - "get_service_provider": "rule:regular_user" + "get_service_provider": "rule:regular_user", + "get_lsn": "rule:admin_only", + "create_lsn": "rule:admin_only" } diff --git a/setup.cfg b/setup.cfg index 87d08e96..d3060331 100644 --- a/setup.cfg +++ b/setup.cfg @@ -92,6 +92,7 @@ console_scripts = neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main + neutron-nsx-manage = neutron.plugins.nicira.shell:main neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main