diff --git a/compose/nova-compute-network.yml b/compose/nova-compute-network.yml index 7d67ffee28..79aeffed35 100644 --- a/compose/nova-compute-network.yml +++ b/compose/nova-compute-network.yml @@ -2,6 +2,7 @@ libvirt: image: kollaglue/centos-rdo-nova-libvirt name: libvirt net: host + pid: host privileged: true restart: always env_file: @@ -33,7 +34,6 @@ novacompute: image: kollaglue/centos-rdo-nova-compute name: nova-compute net: host - pid: host privileged: true restart: always env_file: diff --git a/docs/developer-env.md b/docs/developer-env.md index 3d31aa5301..e85cb45ee1 100644 --- a/docs/developer-env.md +++ b/docs/developer-env.md @@ -1,5 +1,17 @@ # Developer env +In order to run Kolla, it is mandatory to run a version of +`docker-compose` that includes pid: host support. One of the +authors of kolla has a pull request outstanding that the +docker-compose maintainers have said they would merge shortly. + +It must be retrieved via git and installed: + + git pull http://github.com/sdake/fig + cd fig + sudo pip install . + sudo pip install -U docker-py + The basic starting environment will be created using `docker-compose`. This environment will start up the openstack services listed in the compose directory.