From 8b1d543501c0912c5f0066786d5164090bb558bc Mon Sep 17 00:00:00 2001 From: esberglu Date: Tue, 30 Jan 2018 14:30:01 -0600 Subject: [PATCH] Update the SEA local.conf This updates the SEA local.conf to a known working version for master. It renames the file to clarify the difference between the OVS and SEA conf files. Change-Id: Iffb250388b083a6391a5407597fa03e9f2c4acd6 --- devstack/README.rst | 13 +++- devstack/local.conf.aio | 46 -------------- ....aio.local.conf => local.conf.aio-ovs-ssp} | 0 devstack/local.conf.aio-sea-localdisk | 63 +++++++++++++++++++ 4 files changed, 74 insertions(+), 48 deletions(-) delete mode 100644 devstack/local.conf.aio rename devstack/{ovs.aio.local.conf => local.conf.aio-ovs-ssp} (100%) create mode 100644 devstack/local.conf.aio-sea-localdisk diff --git a/devstack/README.rst b/devstack/README.rst index 040f4df8..a83afc00 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -47,13 +47,22 @@ How to use the NovaLink DevStack plugins: Example config files for all-in-one, compute, and control nodes `can be found here. `_ - The nova-powervm project provides three different sample local.conf files as a + The nova-powervm project provides different sample local.conf files as a starting point for devstack. - * local.conf.aio + * local.conf.aio-sea-localdisk * Runs on the NovaLink VM of the PowerVM system * Provides a full 'all in one' devstack VM + * Uses Shared Ethernet Adapter networking (networking-powervm) + * Uses localdisk disk driver + + * local.conf.aio-ovs-ssp + + * Runs on the NovaLink VM of the PowerVM system + * Provides a full 'all in one' devstack VM + * Uses Open vSwitch networking (neutron) + * Uses Shared Storage Pool disk driver * local.conf.control diff --git a/devstack/local.conf.aio b/devstack/local.conf.aio deleted file mode 100644 index 804fd0fc..00000000 --- a/devstack/local.conf.aio +++ /dev/null @@ -1,46 +0,0 @@ -[[local|localrc]] -LOGFILE=/opt/stack/logs/stack.sh.log -SCREEN_LOGDIR=~/screen_log/ -LOGDAYS=1 - -ADMIN_PASSWORD=admin -MYSQL_PASSWORD=mysql -RABBIT_PASSWORD=rabbit -SERVICE_PASSWORD=admin -SERVICE_TOKEN=service - -MULTI_HOST=0 -HOST_NAME=$(hostname) - -FLOATING_RANGE=192.168.2.0/24 -FIXED_RANGE=10.11.12.0/24 -NETWORK_GATEWAY=10.11.12.1 -PUBLIC_NETWORK_GATEWAY=192.168.2.1 -FLAT_INTERFACE=eth0 -Q_PLUGIN=ml2 -Q_ML2_TENANT_NETWORK_TYPE=vlan -Q_ML2_PLUGIN_TYPE_DRIVERS=vlan -ENABLE_TENANT_VLANS=True -PHYSICAL_NETWORK=default -TENANT_VLAN_RANGE=1000:1999 - -# TODO: Set disk driver details for your environment -# DISK_DRIVER: localdisk or ssp. localdisk requires VOL_GRP_NAME. Set to the -# volume group that will host the volume groups. Must not be rootvg. -DISK_DRIVER=localdisk -VOL_GRP_NAME=devstackvg - -# Enable services (pvm-q-agt and pvm-ceilometer-acompute started by their plugins) -enable_service n-novnc neutron q-svc -disable_service n-net - -# Enable plugins -enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git -enable_plugin nova-powervm https://git.openstack.org/openstack/nova-powervm.git -enable_plugin networking-powervm https://git.openstack.org/openstack/networking-powervm.git -enable_plugin ceilometer-powervm https://git.openstack.org/openstack/ceilometer-powervm.git - -[[post-config|$NOVA_CONF]] -[DEFAULT] -debug=False -default_log_levels=nova_powervm=DEBUG,nova=DEBUG,pypowervm=INFO,iamqplib=WARN,sqlalchemy=WARN,boto=WARN,suds=INFO,keystone=INFO,eventlet.wsgi.server=WARN diff --git a/devstack/ovs.aio.local.conf b/devstack/local.conf.aio-ovs-ssp similarity index 100% rename from devstack/ovs.aio.local.conf rename to devstack/local.conf.aio-ovs-ssp diff --git a/devstack/local.conf.aio-sea-localdisk b/devstack/local.conf.aio-sea-localdisk new file mode 100644 index 00000000..ddc6945c --- /dev/null +++ b/devstack/local.conf.aio-sea-localdisk @@ -0,0 +1,63 @@ +[[local|localrc]] +LOGFILE=/opt/stack/logs/stack.sh.log +SCREEN_LOGDIR=~/screen_log/ +LOGDAYS=1 +LOG_COLOR=True +DATA_DIR=/var/stack +ADMIN_PASSWORD=admin +MYSQL_PASSWORD=mysql +RABBIT_PASSWORD=rabbit +SERVICE_PASSWORD=admin +SERVICE_TOKEN=service + +MULTI_HOST=0 +HOST_NAME=$(hostname) + +# Networking Configuration +Q_PLUGIN=ml2 +Q_ML2_TENANT_NETWORK_TYPE=vlan +Q_ML2_PLUGIN_TYPE_DRIVERS=vlan +Q_USE_PROVIDERNET_FOR_PUBLIC=False +ENABLE_TENANT_VLANS=True +PHYSICAL_NETWORK=default +TENANT_VLAN_RANGE=1000:2000 +Q_AGENT=pvm_sea +NEUTRON_AGENT=pvm_sea +Q_ML2_PLUGIN_MECHANISM_DRIVERS=pvm_sea +ML2_L3_PLUGIN= +Q_USE_PROVIDER_NETWORKING=False +NEUTRON_CREATE_INITIAL_NETWORKS=False +NEUTRON_CORE_PLUGIN=ml2 +Q_PLUGIN_CONF_FILE=etc/neutron/plugins/ml2/ml2_conf.ini + +# Forces nova to use config drive +FORCE_CONFIG_DRIVE=True + +# localdisk or ssp. localdisk requires VOL_GRP_NAME. Set to the +# volume group that will host the volume groups. Must not be rootvg. +DISK_DRIVER=localdisk +VOL_GRP_NAME=devstackvg + +# TODO: The default version for etcd3 is 3.1.7. Power is not supported for this version. +# Using a 3.2.0 RC until 3.2.0 is released at which point this can be removed. +ETCD_VERSION=v3.2.0-rc.1 +ETCD_SHA256="c2d846326586afe169e6ca81266815196d6c14bc023f9c7d0c9d622f3c14505c" + +# Enable plugins +enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer.git +enable_plugin ceilometer-powervm https://git.openstack.org/openstack/ceilometer-powervm.git +enable_plugin nova-powervm https://git.openstack.org/openstack/nova-powervm.git +enable_plugin networking-powervm https://git.openstack.org/openstack/networking-powervm.git +enable_plugin neutron git://git.openstack.org/openstack/neutron + +# Enable services +enable_service n-novnc neutron neutron-api pvm-q-sea-agt +disable_service cinder n-net neutron-metering neutron-l3 neutron-dhcp neutron-agent + +[[post-config|/$Q_PLUGIN_CONF_FILE]] +[ml2_type_vlan] +network_vlan_ranges=default:1:4094 + +[ml2] +tenant_network_types=vlan +extension_drivers=port_security