openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use kuryr for zun network"

Browse Source
This commit is contained in:
Jenkins 2017-06-27 05:37:49 +00:00 committed by Gerrit Code Review
commit 52cd348ae1
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ansible/roles/zun/templates/zun.conf.j2
View File

@ -7,6 +7,9 @@ container_driver = docker.driver.DockerDriver
image_driver_list = glance
db_type = sql
[network]
driver = kuryr
[api]
host_ip = {{ api_interface_address }}
port = {{ zun_api_port }}
@ -65,8 +68,20 @@ password = {{ zun_keystone_password }}
region_name = {{ openstack_region_name }}
endpoint_type = internalURL
api_version = 2
{% if enable_osprofiler | bool %}
[neutron_client]
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
auth_type = password
project_domain_id = default
user_domain_id = default
project_name = service
username = {{ zun_keystone_user }}
password = {{ zun_keystone_password }}
region_name = {{ openstack_region_name }}
endpoint_type = internalURL
{% if enable_osprofiler | bool %}
[profiler]
enabled = true
trace_sqlalchemy = true

11
doc/zun-guide.rst
View File

@ -8,12 +8,15 @@ workload on OpenStack." [1].
Preparation and Deployment
--------------------------
Zun requires kuryr and etcd services, for more information about how to
configure kuryr refer to `Kuryr Guide <https://docs.openstack.org/developer/kolla-ansible/kuryr-guide.html>`_.
To allow Zun Compute connect to the Docker Daemon, add the following in the
``docker.service`` file on each zun-compute node.
::
ExecStart= -H tcp://<DOCKER_SERVICE_IP>:2375 -H unix:///var/run/docker.sock
ExecStart= -H tcp://<DOCKER_SERVICE_IP>:2375 -H unix:///var/run/docker.sock --cluster-store=etcd://<DOCKER_SERVICE_IP>:2379 --cluster-advertise=<DOCKER_SERVICE_IP>:2375
.. note::
@ -22,11 +25,13 @@ To allow Zun Compute connect to the Docker Daemon, add the following in the
By default zun is disabled in the ``group_vars/all.yml``.
In order to enable it, you need to edit the file globals.yml and set the
following variable:
following variables:
::
enable_zun: "yes"
enable_kuryr: "yes"
enable_etcd: "yes"
Deploy the OpenStack cloud and zun.
@ -61,7 +66,7 @@ Create zun container.
::
$ zun create --name test --command "ping -c 4 8.8.8.8" cirros
$ zun create --name test cirros "ping -c 4 8.8.8.8"
Verify container is created.