Merge branch 'master' of baumann.e-technik.uni-ulm.de:ehx27/openstack-cloud

config/compute-node/etc/cinder/cinder.conf

-[DEFAULT]
-rootwrap_config = /etc/cinder/rootwrap.conf
-api_paste_confg = /etc/cinder/api-paste.ini
-iscsi_helper = tgtadm
-volume_name_template = volume-%s
-volume_group = cinder-volumes
-verbose = True
-auth_strategy = keystone
-state_path = /var/lib/cinder
-lock_path = /var/lock/cinder
-volumes_dir = /var/lib/cinder/volumes
-
-rpc_backend = cinder.openstack.common.rpc.impl_kombu
-rabbit_host = controller
-rabbit_port = 5672
-rabbit_userid = guest
-rabbit_password = ${RABBIT_PASS}
-
-glance_host = controller
-
-[database]
-connection = mysql://cinder:${CINDER_DBPASS}@controller/cinder
- 

config/compute-node/etc/kernel/postinst.d/statoverride

-#!/bin/sh
-version="$1"
-# passing the kernel version is required
-[ -z "${version}" ] && exit 0
-dpkg-statoverride --update --add root root 0644 /boot/vmlinuz-${version} 

config/compute-node/etc/neutron/neutron.conf

-[DEFAULT]
-# debug = False
-# verbose = False
-
-# Where to store Neutron state files.  This directory must be writable by the
-# user executing the agent.
-state_path = /var/lib/neutron
-
-# Where to store lock files
-lock_path = /var/lib/neutron/lock
-
-# Neutron plugin provider module
-core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
-
-rpc_backend = neutron.openstack.common.rpc.impl_kombu
-rabbit_host = controller
-rabbit_port = 5672
-rabbit_password = ${RABBIT_PASS}
-rabbit_userid = guest
-
-auth_host = controller
-admin_tenant_name = service
-admin_user = neutron
-admin_password = ${NEUTRON_PASS}
-auth_url = http://controller:35357/v2.0
-auth_strategy = keystone
-
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
-
-[quotas]
-
-[agent]
-root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
-
-[keystone_authtoken]
-auth_host = controller
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = service
-admin_user = neutron
-admin_password = ${NEUTRON_PASS}
-
-[database]
-connection = mysql://neutron:${NEUTRON_DBPASS}@controller/neutron
-
-[service_providers]
-service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default

config/compute-node/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini

-[ovs]
-tenant_network_type = gre
-tunnel_id_ranges = 1:1000
-enable_tunneling = True
-integration_bridge = br-int
-tunnel_bridge = br-tun
-local_ip = ${LOCALIP_DATA}
-
-[agent]
-
-[securitygroup]
-firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
-
-#-----------------------------------------------------------------------------
-# Sample Configurations.
-#-----------------------------------------------------------------------------
-#
-# 1. With VLANs on eth1.
-# [database]
-# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
-# [OVS]
-# network_vlan_ranges = default:2000:3999
-# tunnel_id_ranges =
-# integration_bridge = br-int
-# bridge_mappings = default:br-eth1
-# [AGENT]
-# Add the following setting, if you want to log to a file
-#
-# 2. With tunneling.
-# [database]
-# connection = mysql://root:nova@127.0.0.1:3306/ovs_neutron
-# [OVS]
-# network_vlan_ranges =
-# tunnel_id_ranges = 1:1000
-# integration_bridge = br-int
-# tunnel_bridge = br-tun
-# local_ip = 10.0.0.3

config/compute-node/etc/nova/api-paste.ini

-############
-# Metadata #
-############
-[composite:metadata]
-use = egg:Paste#urlmap
-/: meta
-
-[pipeline:meta]
-pipeline = ec2faultwrap logrequest metaapp
-
-[app:metaapp]
-paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory
-
-#######
-# EC2 #
-#######
-
-[composite:ec2]
-use = egg:Paste#urlmap
-/services/Cloud: ec2cloud
-
-[composite:ec2cloud]
-use = call:nova.api.auth:pipeline_factory
-noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor
-keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor
-
-[filter:ec2faultwrap]
-paste.filter_factory = nova.api.ec2:FaultWrapper.factory
-
-[filter:logrequest]
-paste.filter_factory = nova.api.ec2:RequestLogging.factory
-
-[filter:ec2lockout]
-paste.filter_factory = nova.api.ec2:Lockout.factory
-
-[filter:ec2keystoneauth]
-paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory
-
-[filter:ec2noauth]
-paste.filter_factory = nova.api.ec2:NoAuth.factory
-
-[filter:cloudrequest]
-controller = nova.api.ec2.cloud.CloudController
-paste.filter_factory = nova.api.ec2:Requestify.factory
-
-[filter:authorizer]
-paste.filter_factory = nova.api.ec2:Authorizer.factory
-
-[filter:validator]
-paste.filter_factory = nova.api.ec2:Validator.factory
-
-[app:ec2executor]
-paste.app_factory = nova.api.ec2:Executor.factory
-
-#############
-# Openstack #
-#############
-
-[composite:osapi_compute]
-use = call:nova.api.openstack.urlmap:urlmap_factory
-/: oscomputeversions
-/v1.1: openstack_compute_api_v2
-/v2: openstack_compute_api_v2
-/v3: openstack_compute_api_v3
-
-[composite:openstack_compute_api_v2]
-use = call:nova.api.auth:pipeline_factory
-noauth = faultwrap sizelimit noauth ratelimit osapi_compute_app_v2
-keystone = faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2
-keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2
-
-[composite:openstack_compute_api_v3]
-use = call:nova.api.auth:pipeline_factory
-noauth = faultwrap sizelimit noauth_v3 ratelimit_v3 osapi_compute_app_v3
-keystone = faultwrap sizelimit authtoken keystonecontext ratelimit_v3 osapi_compute_app_v3
-keystone_nolimit = faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3
-
-[filter:faultwrap]
-paste.filter_factory = nova.api.openstack:FaultWrapper.factory
-
-[filter:noauth]
-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory
-
-[filter:noauth_v3]
-paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory
-
-[filter:ratelimit]
-paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory
-
-[filter:ratelimit_v3]
-paste.filter_factory = nova.api.openstack.compute.plugins.v3.limits:RateLimitingMiddleware.factory
-
-[filter:sizelimit]
-paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory
-
-[app:osapi_compute_app_v2]
-paste.app_factory = nova.api.openstack.compute:APIRouter.factory
-
-[app:osapi_compute_app_v3]
-paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory
-
-[pipeline:oscomputeversions]
-pipeline = faultwrap oscomputeversionapp
-
-[app:oscomputeversionapp]
-paste.app_factory = nova.api.openstack.compute.versions:Versions.factory
-
-##########
-# Shared #
-##########
-
-[filter:keystonecontext]
-paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory
-
-[filter:authtoken]
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-auth_host = controller
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = service
-admin_user = nova
-admin_password = ${NOVA_PASS}
-auth_version = v2.0 

config/compute-node/etc/nova/nova.conf

-[DEFAULT]
-dhcpbridge_flagfile=/etc/nova/nova.conf
-dhcpbridge=/usr/bin/nova-dhcpbridge
-logdir=/var/log/nova
-state_path=/var/lib/nova
-lock_path=/var/lock/nova
-force_dhcp_release=True
-iscsi_helper=tgtadm
-libvirt_use_virtio_for_bridges=True
-connection_type=libvirt
-root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
-verbose=True
-ec2_private_dns_show_ip=True
-api_paste_config=/etc/nova/api-paste.ini
-volumes_path=/var/lib/nova/volumes
-enabled_apis=ec2,osapi_compute,metadata
-auth_strategy=keystone
-
-rpc_backend = nova.rpc.impl_kombu
-rabbit_host = controller
-rabbit_password = ${ADMIN_PASS}
-
-my_ip=${LOCALIP_CTRL}
-vnc_enabled=True
-vncserver_listen=0.0.0.0
-vncserver_proxyclient_address=${LOCALIP_CTRL}
-novncproxy_base_url=http://${CONTROLLERIP_PUBLIC}:6080/vnc_auto.html
-
-glance_host=controller
-
-#### NOVA NETWORKING
-#network_manager=nova.network.manager.FlatDHCPManager
-#firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver
-#network_size=254
-#allow_same_net_traffic=False
-#multi_host=True
-#send_arp_for_ha=True
-#share_dhcp_address=True
-#force_dhcp_release=True
-#flat_network_bridge=br100
-#flat_interface=eth0
-#public_interface=eth0
-
-# neutron networking
-network_api_class=nova.network.neutronv2.api.API
-neutron_url=http://controller:9696
-neutron_auth_strategy=keystone
-neutron_admin_tenant_name=service
-neutron_admin_username=neutron
-neutron_admin_password=${NEUTRON_PASS}
-neutron_admin_auth_url=http://controller:35357/v2.0
-linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
-firewall_driver=nova.virt.firewall.NoopFirewallDriver
-security_group_api=neutron
-
-
-[database]
-# The SQLAlchemy connection string used to connect to the database
-connection = mysql://nova:${NOVA_DBPASS}@controller/nova

config/compute-node/etc/sysctl.conf

-#
-# /etc/sysctl.conf - Configuration file for setting system variables
-# See /etc/sysctl.d/ for additional system variables
-# See sysctl.conf (5) for information.
-#
-
-net.ipv4.conf.all.rp_filter=0
-net.ipv4.conf.default.rp_filter=0
- 

installation/compnode/config/etc/cinder/cinder-api-paste.ini → config/computenode/etc/cinder/api-paste.ini

@@ -56,3 +56,4 @@ auth_protocol = http
 admin_tenant_name=service
 admin_user=cinder
 admin_password=${CINDER_PASS}
+

config/computenode/etc/cinder/cinder.conf

+[DEFAULT]
+# logging
+verbose = True
+debug = True
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
+
+# local paths
+state_path = /var/lib/cinder
+lock_path = /var/lib/cinder/lock
+volumes_dir = /var/lib/cinder/volumes
+rootwrap_config = /etc/cinder/rootwrap.conf
+api_paste_confg = /etc/cinder/api-paste.ini
+
+# auth & message queue
+auth_strategy = keystone
+notification_driver = cinder.openstack.common.notifier.rpc_notifier
+rpc_backend = qpid
+qpid_hostname = ${CONTROLNODE_IP_CTRL}
+qpid_username = guest
+qpid_password = ${QPID_PASS}
+control_exchange = cinder
+
+# glance
+glance_host = controlnode
+
+# volumes
+volume_group = vg_cinder
+volume_name_template = volume-%s
+iscsi_helper = lioadm
+
+# misc
+my_ip = ${COMPUTENODE_IP_CTRL}
+
+[database]
+connection = mysql://cinder:${CINDER_DBPASS}@${CONTROLNODE_IP_CTRL}/cinder
+
+[keystone_authtoken]
+auth_uri = http://controlnode:5000/v2.0
+identity_uri = http://controlnode:35357
+admin_tenant_name = service
+admin_user = cinder
+admin_password = ${CINDER_PASS}
+

config/network-node/etc/neutron/neutron.conf → config/computenode/etc/neutron/neutron.conf

 [DEFAULT]
-# debug = False
-# verbose = False
+# logging
+verbose = True
+debug = True
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
 
-# Where to store Neutron state files.  This directory must be writable by the
-# user executing the agent.
+# local paths
 state_path = /var/lib/neutron
-
-# Where to store lock files
 lock_path = /var/lib/neutron/lock
+api_paste_confg = /etc/neutron/api-paste.ini
 
-# Neutron plugin provider module
-core_plugin = neutron.plugins.openvswitch.ovs_neutron_plugin.OVSNeutronPluginV2
-
-rabbit_host = controller
-rabbit_password = ${RABBIT_PASS}
-rabbit_userid = guest
-
+# auth & message queue
 auth_strategy = keystone
-
 notification_driver = neutron.openstack.common.notifier.rpc_notifier
+rpc_backend = qpid
+qpid_hostname = ${CONTROLNODE_IP_CTRL}
+qpid_username = guest
+qpid_password = ${QPID_PASS}
 
-[quotas]
+# plugins & drivers
+core_plugin = ml2
+service_plugins = router
+allow_overlapping_ips = True
+agent_down_time = 75
 
 [agent]
 root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+report_interval = 5
+
+[database]
+connection = mysql://neutron:${NEUTRON_DBPASS}@${CONTROLNODE_IP_CTRL}/neutron
 
 [keystone_authtoken]
-auth_host = controller
-auth_port = 35357
-auth_protocol = http
+auth_uri = http://controlnode:5000/v2.0
+identity_uri = http://controlnode:35357
 admin_tenant_name = service
 admin_user = neutron
 admin_password = ${NEUTRON_PASS}
 
-[database]
-connection = mysql://neutron:${NEUTRON_DBPASS}@controller/neutron
+[quotas]
 
 [service_providers]
-service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+service_provider = LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
+

config/computenode/etc/neutron/plugin.ini

+[ml2]
+type_drivers = flat,vxlan
+tenant_network_types = vxlan
+mechanism_drivers = openvswitch
+
+[ml2_type_flat]
+
+[ml2_type_gre]
+tunnel_id_ranges = 1:1000
+
+[ml2_type_vlan]
+
+[ml2_type_vxlan]
+vni_ranges = 100:10000
+vxlan_group =
+
+[ml2_odl]
+url = http://${SDNCONTROL_IP_CTRL}:8080/controller/nb/v2/neutron
+username = admin
+password = admin
+session_timeout = 30
+timeout = 10
+
+[agent]
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+tunnel_types = vxlan
+
+[ovs]
+enable_tunneling = true
+tunnel_type = vxlan
+tenant_network_type = vxlan
+local_ip = ${COMPUTENODE_IP_DATA}
+
+[odl]
+controllers = ${SDNCONTROL_IP_CTRL}:6633:admin:admin
+integration_bridge = br-int
+tenant_network_type = vlan
+
+[securitygroup]
+enable_security_group = True
+enable_ipset = True
+firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

config/computenode/etc/neutron/plugins/ml2/ml2_conf.ini

+# DO NOT EDIT
+# this file is a placeholder and will be replaced with a softlink to plugin.ini

config/computenode/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini

+# DO NOT EDIT
+# this file is a placeholder and will be replaced with a softlink to plugin.ini

config/computenode/etc/neutron/plugins/ryu/ryu.ini

+# DO NOT EDIT
+# this file is a placeholder and will be replaced with a softlink to plugin.ini

installation/compnode/config/etc/nova/nova-api-paste.ini → config/computenode/etc/nova/api-paste.ini

@@ -120,4 +120,5 @@ auth_protocol = http
 admin_tenant_name = service
 admin_user = nova
 admin_password = ${NOVA_PASS}
-auth_version = v2.0 
+auth_version = v2.0
+

config/computenode/etc/nova/nova.conf

+[DEFAULT]
+# logging
+verbose = True
+debug = True
+use_syslog = True
+syslog_log_facility = LOG_LOCAL0
+instance_usage_audit = True
+instance_usage_audit_period = hour
+notify_on_state_change = vm_and_task_state
+
+# local paths
+logdir = /var/log/nova
+state_path = /var/lib/nova
+lock_path = /var/lib/nova/lock
+volumes_path = /var/lib/nova/volumes
+api_paste_config = /etc/nova/api-paste.ini
+root_helper = sudo nova-rootwrap /etc/nova/rootwrap.conf
+
+# auth & message queue
+auth_strategy = keystone
+notification_driver = ceilometer.compute.nova_notifier
+notification_driver = nova.openstack.common.notifier.rpc_notifier
+rpc_backend = qpid
+qpid_hostname = ${CONTROLNODE_IP_CTRL}
+qpid_username = guest
+qpid_password = ${QPID_PASS}
+
+# DHCP
+dhcpbridge_flagfile = /etc/nova/nova.conf
+dhcpbridge = /usr/bin/nova-dhcpbridge
+force_dhcp_release = True
+
+# VNC web console
+my_ip = ${COMPUTENODE_IP_CTRL}
+vnc_enabled = true
+vncserver_listen = 0.0.0.0
+vncserver_proxyclient_address = ${COMPUTENODE_IP_CTRL}
+novncproxy_base_url = http://${CONTROLNODE_DNS_NAME}:6080/vnc_auto.html
+
+# virtualization
+connection_type = libvirt
+compute_driver = libvirt.LibvirtDriver
+libvirt_use_virtio_for_bridges = True
+libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
+#libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtHybridOVSBridgeDriver
+vif_plugging_is_fatal = False
+vif_plugging_timeout = 0
+
+# neutron networking
+security_group_api = neutron
+network_api_class = nova.network.neutronv2.api.API
+linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+
+# misc
+iscsi_helper = lioadm
+ec2_private_dns_show_ip = True
+enabled_apis = ec2,osapi_compute,metadata
+
+[database]
+connection = mysql://nova:${NOVA_DBPASS}@${CONTROLNODE_IP_CTRL}/nova
+
+[glance]
+host = controlnode
+
+[keystone_authtoken]
+auth_uri = http://controlnode:5000/v2.0
+identity_uri = http://controlnode:35357
+admin_tenant_name = service
+admin_user = nova
+admin_password = ${NOVA_PASS}
+
+[libvirt]
+virt_type = kvm
+
+[neutron]
+auth_strategy = keystone
+url = http://controlnode:9696
+admin_auth_url = http://controlnode:35357/v2.0
+admin_tenant_name = service
+admin_username = neutron
+admin_password = ${NEUTRON_PASS}
+
+# metadata
+service_metadata_proxy = true
+metadata_proxy_shared_secret = ${METADATA_SECRET}
+

config/computenode/var/lib/nova/.ssh/.gitignore

+authorized_keys
+id_rsa
+id_rsa.pub
+

config/computenode/var/lib/nova/.ssh/config

+Host *
+	StrictHostKeyChecking no
+	UserKnownHostsFile=/dev/null
+