From bc2bea5ee2d5973c6e7c5025d805cd97d9fa4afe Mon Sep 17 00:00:00 2001 From: lukepatrick Date: Mon, 23 Oct 2017 12:45:42 -0600 Subject: [PATCH] Update AIO docs for nova examples and Docker image Update Kubernetes AIO install guide fixing nova install examples. Also add language around pulling the AIO container versus building. Change-Id: Ib9d1c21f1a75e00b5f0ddaafd73e1741193b8717 --- doc/source/install/developer/all-in-one.rst | 19 ++++++++++++++++--- doc/source/install/ext-dns-fqdn.rst | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/doc/source/install/developer/all-in-one.rst b/doc/source/install/developer/all-in-one.rst index c42ddb8d1d..b8062ea389 100644 --- a/doc/source/install/developer/all-in-one.rst +++ b/doc/source/install/developer/all-in-one.rst @@ -132,11 +132,24 @@ Run ``make`` from the root of the openstack-helm repository: Kubeadm-AIO Container ===================== +Pull +---- + +It is recommended to pull the kubeadm-aio container as it is stable +at the time it was built + +:: + export KUBEADM_IMAGE=openstackhelm/kubeadm-aio:v1.7.5 + sudo docker pull ${KUBEADM_IMAGE} + + + Build ----- -Using the Dockerfile defined in tools/kubeadm-aio directory, build the -'openstackhelm/kubeadm-aio:v1.7.5' image. +Optionally, using the Dockerfile defined in tools/kubeadm-aio directory, build the +'openstackhelm/kubeadm-aio:v1.7.5' image. Warning - this may pull packages that +have not been tested. :: @@ -236,7 +249,7 @@ more sensible values for the All-in-One environment using the ``--values`` and --set storage=pvc helm install --name=nova ./nova --namespace=openstack \ --values=./tools/overrides/mvp/nova.yaml \ - --set conf.nova.libvirt.nova.conf.virt_type=qemu + --set conf.nova.libvirt.virt_type=qemu helm install --name=neutron ./neutron \ --namespace=openstack --values=./tools/overrides/mvp/neutron-ovs.yaml helm install --name=horizon ./horizon --namespace=openstack \ diff --git a/doc/source/install/ext-dns-fqdn.rst b/doc/source/install/ext-dns-fqdn.rst index ff9b3b1770..a1ab3e6b30 100644 --- a/doc/source/install/ext-dns-fqdn.rst +++ b/doc/source/install/ext-dns-fqdn.rst @@ -170,7 +170,7 @@ all the ``--set`` flags helm install --name=nova local/nova --namespace=openstack \ --values=./tools/overrides/mvp/nova.yaml \ - --set=conf.nova.libvirt.nova.conf.virt_type=qemu \ + --set conf.nova.libvirt.virt_type=qemu \ --set endpoints.compute.host_fqdn_override.public=nova.$FQDN \ --set endpoints.compute_metadata.host_fqdn_override.public=metadata.$FQDN \ --set endpoints.image.host_fqdn_override.public=glance.$FQDN \