Network Isolation support for containerized compute

The template will all neutron-agents to be configured so that it can
run the network isolation templates on the containerized compute node.

Co-Authored-By: Dan Prince <dpince@redhat.com>
Change-Id: I7837ed7ed3e807ec5c1276904893695918bef293

diff --git a/docker/README-containers.md b/docker/README-containers.md
index 17990b5..ff062a9 100644 (file)
--- a/docker/README-containers.md
+++ b/docker/README-containers.md
@@ -22,7 +22,12 @@ https://github.com/openstack/tripleo-common/blob/master/scripts/tripleo.sh
 
 Create the Overcloud:
 ```
-$ openstack overcloud deploy --templates=tripleo-heat-templates -e tripleo-heat-templates/environments/docker-rdo.yaml --libvirt-type=qemu
+$ openstack overcloud deploy --templates=tripleo-heat-templates -e tripleo-heat-templates/environments/docker.yaml -e tripleo-heat-templates/environments/docker-network.yaml --libvirt-type=qemu
+```
+
+Using Network Isolation in the Overcloud:
+```
+$ openstack overcloud deploy --templates=tripleo-heat-templates -e tripleo-heat-templates/environments/docker.yaml -e tripleo-heat-templates/environments/docker-network-isolation.yaml --libvirt-type=qemu
 ```
 
 Source the overcloudrc and then you can use the overcloud.

diff --git a/environments/docker-network-isolation.yaml b/environments/docker-network-isolation.yaml
new file mode 100644 (file)
index 0000000..257d03d
--- /dev/null
+++ b/environments/docker-network-isolation.yaml
@@ -0,0 +1,4 @@
+parameter_defaults:
+  NeutronAgentConfig: "/etc/neutron/neutron.conf,/etc/neutron/plugins/openvswitch/openvswitch_agent.ini"
+  NeutronAgentPluginVolume: "/var/lib/etc-data/neutron/plugins/ml2/openvswitch_agent.ini:/var/lib/kolla/config_files/openvswitch_agent.ini:ro"
+  NeutronAgentOvsVolume: "/var/lib/etc-data/neutron/conf.d/neutron-openvswitch-agent:/etc/neutron/conf.d/neutron-openvswitch-agent:ro"

diff --git a/environments/docker-network.yaml b/environments/docker-network.yaml
new file mode 100644 (file)
index 0000000..f10ec38
--- /dev/null
+++ b/environments/docker-network.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml

diff --git a/environments/docker-rdo.yaml b/environments/docker.yaml
similarity index 93%
rename from environments/docker-rdo.yaml
rename to environments/docker.yaml
index 66824fe..6376b74 100644 (file)
--- a/environments/docker-rdo.yaml
+++ b/environments/docker.yaml
@@ -2,7 +2,6 @@ resource_registry:
   # Docker container with heat agents for containerized compute node.
   OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
   OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
-  OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
 
 parameters:
   NovaImage: atomic-image