openstack/kolla-ansible
Code Issues Proposed changes

Use kuryr for zun network

Browse Source 
Zun made mandatory to use kuryr for networking.
This change update zun config to use kuryr.
Also updates documentation.

Change-Id: I9a55e390709b7e21d3efbd4be17a36db85cd8521
This commit is contained in:
Eduardo Gonzalez 2017-06-13 14:39:26 +02:00
parent 381c18975c
commit da49b49b5c
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 image_driver_list = glance
db_type = sql db_type = sql
[network]
driver = kuryr
[api] [api]
host_ip = {{ api_interface_address }} host_ip = {{ api_interface_address }}
port = {{ zun_api_port }} port = {{ zun_api_port }}
@ -65,8 +68,20 @@ password = {{ zun_keystone_password }}
region_name = {{ openstack_region_name }} region_name = {{ openstack_region_name }}
endpoint_type = internalURL endpoint_type = internalURL
api_version = 2 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] [profiler]
enabled = true enabled = true
trace_sqlalchemy = true trace_sqlalchemy = true

11
doc/zun-guide.rst
View File

@ -8,12 +8,15 @@ workload on OpenStack." [1].
Preparation and Deployment 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 To allow Zun Compute connect to the Docker Daemon, add the following in the
``docker.service`` file on each zun-compute node. ``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:: .. 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``. 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 In order to enable it, you need to edit the file globals.yml and set the
following variable: following variables:
:: ::
enable_zun: "yes" enable_zun: "yes"
enable_kuryr: "yes"
enable_etcd: "yes"
Deploy the OpenStack cloud and zun. 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. Verify container is created.