From a889ffce6bc0de6ea195dcb29008e19983e21b0f Mon Sep 17 00:00:00 2001 From: Hiroya Nakaya Date: Tue, 18 Jun 2019 18:45:22 +0900 Subject: [PATCH] Failed all-in-one mode devstack local.conf Fix settings to install kuryr in local.conf. Refer to tacker/devstack/local.conf.kuberntes for this setting. Change-Id: Iea0c40d180cc40e706eb90e2395d93cc719b3abd --- devstack/local.conf.example | 3 +++ devstack/local.conf.kubernetes | 3 +++ doc/source/install/devstack.rst | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/devstack/local.conf.example b/devstack/local.conf.example index 76859f15c..62ddaf2b3 100644 --- a/devstack/local.conf.example +++ b/devstack/local.conf.example @@ -46,6 +46,9 @@ enable_plugin mistral https://opendev.org/openstack/mistral master enable_plugin ceilometer https://opendev.org/openstack/ceilometer master enable_plugin aodh https://opendev.org/openstack/aodh master +# Blazar +enable_plugin blazar https://github.com/openstack/blazar.git master + # Tacker enable_plugin tacker https://opendev.org/openstack/tacker master diff --git a/devstack/local.conf.kubernetes b/devstack/local.conf.kubernetes index c051e1939..6c488979c 100644 --- a/devstack/local.conf.kubernetes +++ b/devstack/local.conf.kubernetes @@ -46,6 +46,9 @@ enable_plugin mistral https://opendev.org/openstack/mistral master enable_plugin ceilometer https://opendev.org/openstack/ceilometer master enable_plugin aodh https://opendev.org/openstack/aodh master +# Blazar +enable_plugin blazar https://github.com/openstack/blazar.git master + # Tacker enable_plugin tacker https://opendev.org/openstack/tacker master diff --git a/doc/source/install/devstack.rst b/doc/source/install/devstack.rst index f2eba185a..af74cc13c 100644 --- a/doc/source/install/devstack.rst +++ b/doc/source/install/devstack.rst @@ -110,17 +110,21 @@ The **local.conf** file of all-in-one mode from [#f2]_ is shown as below: disable_service tempest - # Enable Kubernetes and kuryr-kubernetes + # Enable kuryr-kubernetes, docker, octavia KUBERNETES_VIM=True - NEUTRON_CREATE_INITIAL_NETWORKS=False enable_plugin kuryr-kubernetes https://opendev.org/openstack/kuryr-kubernetes master - enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas master + enable_plugin octavia https://opendev.org/openstack/octavia master enable_plugin devstack-plugin-container https://opendev.org/openstack/devstack-plugin-container master + #KURYR_K8S_CLUSTER_IP_RANGE="10.0.0.0/24" [[post-config|/etc/neutron/dhcp_agent.ini]] [DEFAULT] enable_isolated_metadata = True + [[post-config|$OCTAVIA_CONF]] + [controller_worker] + amp_active_retries=9999 + .. @@ -176,6 +180,6 @@ to start setting up: .. [#f0] https://docs.openstack.org/devstack/latest/ .. [#f1] https://github.com/openstack/tacker/tree/master/devstack -.. [#f2] https://github.com/openstack/tacker/blob/master/devstack/local.conf.example +.. [#f2] https://github.com/openstack/tacker/blob/master/devstack/local.conf.kubernetes .. [#f3] https://github.com/openstack/tacker/blob/master/devstack/local.conf.standalone