openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Update documentation about nested deployment 

Change-Id: I37528a6ce120acccf8bbaa5a2e644ff1c3dfa107
This commit is contained in:
Luis Tomas Bolivar 2017-07-27 17:25:45 +02:00
parent 79a00b27b8
commit 3cba3eb009
3 changed files with 15 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/local.conf.pod-in-vm.overcloud.sample
View File

@ -22,9 +22,15 @@ KEYSTONE_SERVICE_HOST=$SERVICE_HOST
MYSQL_HOST=$SERVICE_HOST
RABBIT_HOST=$SERVICE_HOST
KURYR_CONFIGURE_NEUTRON_DEFAULTS=False
KURYR_CONFIGURE_NEUTRON_DEFAULTS=True
KURYR_CONFIGURE_BAREMETAL_KUBELET_IFACE=False
# Include subnet pool id to use. You can use the one from the default undercloud devstack
KURYR_NEUTRON_DEFAULT_SUBNETPOOL_ID=UNDERCLOUD_SUBNETPOOL_V4_ID
# Include the router to use. You can use the one from the default undercloud devstack
KURYR_NEUTRON_DEFAULT_ROUTER=router1
enable_plugin devstack-plugin-container https://git.openstack.org/openstack/devstack-plugin-container
enable_service etcd3
enable_service kubernetes-api

17
doc/source/installation/nested-macvlan.rst
View File

@ -14,19 +14,11 @@ nested MACVLAN driver rather than VLAN and trunk ports.
- Since undercloud Neutron will be used by pods, Neutron services should be
disabled in localrc.
- Run devstack with ``devstack/local.conf.pod-in-vm.overcloud.sample``.
With this config devstack will not configure Neutron resources for the
local cloud. These variables have to be added manually
to ``/etc/kuryr/kuryr.conf``.
Fill in the needed information, such as the subnet pool id to use or the
router.
4. Once devstack is done and all services are up inside VM:
- Configure ``/etc/kuryr/kuryr.conf`` with the following content, replacing
the values with correct UUIDs of Neutron resources from the undercloud::
[neutron_defaults]
pod_security_groups = <UNDERCLOUD_DEFAULT_SG_UUID>
pod_subnet = <UNDERCLOUD_SUBNET_FOR_PODS_UUID>
project = <UNDERCLOUD_DEFAULT_PROJECT_UUID>
service_subnet = <UNDERCLOUD_SUBNET_FOR_SERVICES_UUID>
4. Once devstack is done and all services are up inside VM. Next steps are to
configure the missing information at ``/etc/kuryr/kuryr.conf``:
- Configure worker VMs subnet::
@ -48,4 +40,3 @@ nested MACVLAN driver rather than VLAN and trunk ports.
sudo systemctl restart devstack@kuryr-kubernetes.service
Now launch pods using kubectl, Undercloud Neutron will serve the networking.

21
doc/source/installation/nested-vlan.rst
View File

@ -20,19 +20,11 @@ running. 4GB memory and 2 vCPUs, is the minimum resource requirement for the VM:
- Since undercloud Neutron will be used by pods, Neutron services should be
disabled in localrc.
- Run devstack with ``devstack/local.conf.pod-in-vm.overcloud.sample``.
With this config devstack will not configure Neutron resources for the
local cloud. These variables have to be added manually
to ``/etc/kuryr/kuryr.conf``.
Fill in the needed information, such as the subnet pool id to use or the
router.
4. Once devstack is done and all services are up inside VM:
- Configure ``/etc/kuryr/kuryr.conf`` to set UUID of Neutron resources from undercloud Neutron::
[neutron_defaults]
ovs_bridge = br-int
pod_security_groups = <UNDERCLOUD_DEFAULT_SG_UUID>
pod_subnet = <UNDERCLOUD_SUBNET_FOR_PODS_UUID>
project = <UNDERCLOUD_DEFAULT_PROJECT_UUID>
service_subnet = <UNDERCLOUD_SUBNET_FOR_SERVICES_UUID>
4. Once devstack is done and all services are up inside VM. Next steps are to
configure the missing information at ``/etc/kuryr/kuryr.conf``:
- Configure worker VMs subnet::
@ -55,8 +47,3 @@ running. 4GB memory and 2 vCPUs, is the minimum resource requirement for the VM:
sudo systemctl restart devstack@kuryr-kubernetes.service
Now launch pods using kubectl, Undercloud Neutron will serve the networking.