openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Network Isolation support for containerized compute"

Browse Source
This commit is contained in:
Jenkins 2016-01-05 13:10:26 +00:00 committed by Gerrit Code Review
commit a491e05f9d
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/README-containers.md
View File

@ -22,7 +22,12 @@ https://github.com/openstack/tripleo-common/blob/master/scripts/tripleo.sh
Create the Overcloud: 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. Source the overcloudrc and then you can use the overcloud.

4
environments/docker-network-isolation.yaml Normal file
View File

@ -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"

2
environments/docker-network.yaml Normal file
View File

@ -0,0 +1,2 @@
resource_registry:
OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml

1
environments/docker-rdo.yaml → environments/docker.yaml
View File

@ -2,7 +2,6 @@ resource_registry:
# Docker container with heat agents for containerized compute node. # Docker container with heat agents for containerized compute node.
OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml OS::TripleO::ComputePostDeployment: ../docker/compute-post.yaml
OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml OS::TripleO::NodeUserData: ../docker/firstboot/install_docker_agents.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../net-config-bridge.yaml
parameters: parameters:
NovaImage: atomic-image NovaImage: atomic-image