Commit 96fcb7fb authored by Jan Siersch's avatar Jan Siersch
Browse files

prepare centos 7 computenode installation

parent c2c8da3a
......@@ -7,9 +7,9 @@ NETMASK_DATA="255.255.255.0"
NETMASK_PBLC="255.255.255.0"
COMPUTENODE_COUNT=16
COMPUTENODE_IF_CTRL="eth0"
COMPUTENODE_IF_CTRL="eno1"
COMPUTENODE_IP_CTRL_PREFIX="10.1.1.1"
COMPUTENODE_IF_DATA="eth1"
COMPUTENODE_IF_DATA="eno2"
COMPUTENODE_IP_DATA_PREFIX="10.1.2.1"
CONTROLNODE_IF_CTRL="eth1"
......
......@@ -12,6 +12,8 @@ doInstallCinder=true
doInstallTelemetry=false
if [[ $doBasicNetwork == true ]]; then
# FIXME basic network is out of date for CentOS 7
echo "### networking ###"
# disable any automated network management tools
service NetworkManager stop
......@@ -169,10 +171,8 @@ if [[ $doBasicConfiguration == true ]]; then
# Install the yum-plugin-priorities plug-in. This package allows the assignment of relative priorities to the configured software repositories. This functionality is used by the RDO release packages:
yum install -y yum-plugin-priorities
# To enable the RDO repository, download and install the rdo-release-icehouse package:
yum install -y http://repos.fedorapeople.org/repos/openstack/openstack-icehouse/rdo-release-icehouse-3.noarch.rpm
# The EPEL package includes GPG keys for package signing and repository information. This should only be installed on Red Hat Enterprise Linux and CentOS, not Fedora.
yum install -y http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm
yum install -y http://rdo.fedorapeople.org/openstack-juno/rdo-release-juno.rpm
yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm
# The openstack-utils package contains utility programs that make installation and configuration easier. These programs are used throughout this guide. Install openstack-utils.
yum install -y openstack-utils
# The openstack-selinux package includes the policy files that are required to configure SELinux during OpenStack installation on RHEL and CentOS. This step is not required during OpenStack installation on Fedora. Install openstack-selinux:
......@@ -293,6 +293,8 @@ if [[ $doInstallNeutron == true ]]; then
ln -sf /etc/neutron/plugin.ini.odl /etc/neutron/plugin.ini
chown -R neutron:root /etc/neutron
service neutron-openvswitch-agent stop
chkconfig neutron-openvswitch-agent off
else
# To install the Networking components
yum install -y openstack-neutron-openvswitch
......@@ -303,9 +305,15 @@ if [[ $doInstallNeutron == true ]]; then
ovs-vsctl add-br br-int
ovs-vsctl add-br br-data
ovs-vsctl add-port br-data $COMPUTENODE_IF_DATA
ovs-vsctl set-manager tcp:${SDNCONTROL_IP_CTRL}:6640
# ovs-vsctl set-manager tcp:${SDNCONTROL_IP_CTRL}:6640
ln -sf /etc/neutron/plugin.ini.odl /etc/neutron/plugin.ini.ovs
chown -R neutron:root /etc/neutron
# Start the Open vSwitch (OVS) agent and configure it to start when the system boots:
service neutron-openvswitch-agent start
chkconfig neutron-openvswitch-agent on
fi
# Due to a packaging bug, the Open vSwitch agent initialization script explicitly looks for the Open vSwitch plug-in
......@@ -316,10 +324,6 @@ if [[ $doInstallNeutron == true ]]; then
# Restart the Compute service:
service openstack-nova-compute restart
# Start the Open vSwitch (OVS) agent and configure it to start when the system boots:
service neutron-openvswitch-agent stop
chkconfig neutron-openvswitch-agent off
fi
if [[ $doInstallCinder== true ]]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment