Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cirros*
config_file_backup
release

Empty file modified configure.sh
100644 → 100755
Empty file.
33 changes: 21 additions & 12 deletions install.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@ function install-common-packages() {
apt-get install chrony -y
service chrony restart

echo "About to configure APT for Ocata"
sleep 3
apt-get install software-properties-common -y
ubuntu_version=`lsb_release -sr`
if [ "$ubuntu_version" == "17.04" ] || [ "$ubuntu_version" == "16.04" ]
then
add-apt-repository cloud-archive:ocata
else
echo "Ocata release supported only on Zesty (17.04) and Xenial (16.04)"
exit 1;
fi
#echo "About to configure APT for Ocata"
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kiranmys999 - sorry for the delay in reviewing this. Quick questions: so with these changes - master branch will be Queens only. Correct? Do you have any logs that show if installation went through fine?

#sleep 3
#apt-get install software-properties-common -y
#ubuntu_version=`lsb_release -sr`
#if [ "$ubuntu_version" == "17.04" ] || [ "$ubuntu_version" == "16.04" ]
#then
# add-apt-repository cloud-archive:ocata
#else
# echo "Ocata release supported only on Zesty (17.04) and Xenial (16.04)"
# exit 1;
#fi

echo "Doing full system update"
sleep 3
Expand All @@ -63,6 +63,14 @@ function install-common-packages() {
function install-controller-packages() {
echo "Installing MariaDB and MongoDB..."
apt-get install mariadb-server python-pymysql -y
ubuntu_version=`lsb_release -sr`
if [ "$ubuntu_version" == "18.04" ]
then
# Change apparmor security settings for mysql to start without errors on Ubuntu 18.04
echo "/usr/sbin/mysqld { }" | sudo tee /etc/apparmor.d/usr.sbin.mysqld
apparmor_parser -v -R /etc/apparmor.d/usr.sbin.mysqld
service mariadb restart
fi

echo "Installing RabbitMQ..."
sleep 3
Expand All @@ -79,7 +87,8 @@ function install-controller-packages() {

echo "Installing Nova for Controller"
sleep 2
apt-get install nova-api nova-cert nova-conductor nova-consoleauth nova-novncproxy \
# Removed nova-cert package, it's deprecated & not available in Ubuntu 18.04 repository
apt-get install nova-api nova-conductor nova-consoleauth nova-novncproxy \
nova-scheduler nova-placement-api python-novaclient -y

install-neutron-packages-controller
Expand Down
2 changes: 1 addition & 1 deletion lib/admin_openrc.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ export OS_USER_DOMAIN_NAME=default
export OS_PROJECT_NAME=admin
export OS_USERNAME=admin
export OS_PASSWORD=password
export OS_AUTH_URL=http://$final_controller_host_name:35357/v3
export OS_AUTH_URL=http://$final_controller_host_name:5000/v3
export OS_IDENTITY_API_VERSION=3
export OS_IMAGE_API_VERSION=2
12 changes: 7 additions & 5 deletions lib/config-parameters.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
controller_host_name="controller"

### Start - interface related settings
readonly mgmt_interface="enp0s3"
readonly data_interface="enp0s8"
#readonly mgmt_interface="enp0s3"
#readonly data_interface="enp0s8"
readonly mgmt_interface="ens3"
readonly data_interface="ens3"
### End - interface related settings

### Start - Neutron related settings
Expand Down Expand Up @@ -69,7 +71,7 @@ function configure-keystone-authentication() {
echo "Called configure-keystone-authentication with paramters: $@"
sleep 3
crudini --set $1 keystone_authtoken auth_uri http://$2:5000
crudini --set $1 keystone_authtoken auth_url http://$2:35357
crudini --set $1 keystone_authtoken auth_url http://$2:5000
crudini --set $1 keystone_authtoken memcached_servers $2:11211
crudini --set $1 keystone_authtoken auth_type password
crudini --set $1 keystone_authtoken project_domain_name default
Expand Down Expand Up @@ -112,14 +114,14 @@ function create-api-endpoints() {
function get-ip-address() {
ip_address_val=''
ubuntu_version=`lsb_release -sr`
if [ "$ubuntu_version" == "17.04" ]
if [ "$ubuntu_version" == "18.04" ] || [ "$ubuntu_version" == "17.04" ]
then
ip_address_val=`ifconfig $1 | grep 'inet ' | cut -d' ' -f10 | awk '{ print $1}'`
elif [ "$ubuntu_version" == "16.04" ]
then
ip_address_val=`ifconfig $1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
else
echo "This release is supported only on Zesty (17.04) or Xenial (16.04)"
echo "This release is supported only on Bionic (18.04), Zesty (17.04) or Xenial (16.04)"
exit 1;
fi
echo $ip_address_val
Expand Down
Empty file modified lib/configure-ceilometer.sh
100644 → 100755
Empty file.
Empty file modified lib/configure-forwarding.sh
100644 → 100755
Empty file.
Empty file modified lib/configure-glance.sh
100644 → 100755
Empty file.
Empty file modified lib/configure-heat.sh
100644 → 100755
Empty file.
3 changes: 2 additions & 1 deletion lib/configure-horizon.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ sed -e "/^'LOCATION.*$/s/^.*$/'LOCATION': \'"$1:1121"\'/" -i /etc/openstack-dash
grep "OPENSTACK_HOST" /etc/openstack-dashboard/local_settings.py
grep "LOCATION" /etc/openstack-dashboard/local_settings.py
echo_and_sleep "OCATA - fixing secret_key permission" 1
chown www-data /var/lib/openstack-dashboard/secret_key
#chown www-data /var/lib/openstack-dashboard/secret_key
chown horizon:horizon /var/lib/openstack-dashboard/secret_key
echo_and_sleep "Restarting apache2" 1
service apache2 reload
echo_and_sleep "Restarted apache2" 1
6 changes: 3 additions & 3 deletions lib/configure-keystone.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ keystone-manage fernet_setup --keystone-user keystone --keystone-group keystone
keystone-manage credential_setup --keystone-user keystone --keystone-group keystone

keystone-manage bootstrap --bootstrap-password $5 \
--bootstrap-admin-url http://$4:35357/v3/ \
--bootstrap-internal-url http://$4:35357/v3/ \
--bootstrap-admin-url http://$4:5000/v3/ \
--bootstrap-internal-url http://$4:5000/v3/ \
--bootstrap-public-url http://$4:5000/v3/ \
--bootstrap-region-id RegionOne
echo_and_sleep "Executed Keystone Bootstrap" 2
Expand All @@ -45,7 +45,7 @@ export OS_PASSWORD=$5
export OS_PROJECT_NAME=admin
export OS_USER_DOMAIN_NAME=Default
export OS_PROJECT_DOMAIN_NAME=Default
export OS_AUTH_URL=http://$4:35357/v3
export OS_AUTH_URL=http://$4:5000/v3
export OS_IDENTITY_API_VERSION=3
echo_and_sleep "Set environment variables" 1

Expand Down
4 changes: 2 additions & 2 deletions lib/configure-neutron.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if [ "$1" == "networknode" -o "$1" == "controller" ]
crudini --set /etc/neutron/neutron.conf DEFAULT notify_nova_on_port_data_changes True
crudini --set /etc/neutron/neutron.conf DEFAULT nova_url http://$2:8774/v2

crudini --set /etc/neutron/neutron.conf nova auth_url http://$2:35357/
crudini --set /etc/neutron/neutron.conf nova auth_url http://$2:5000/
crudini --set /etc/neutron/neutron.conf nova auth_type password
crudini --set /etc/neutron/neutron.conf nova project_domain_name default
crudini --set /etc/neutron/neutron.conf nova user_domain_name default
Expand Down Expand Up @@ -129,7 +129,7 @@ sleep 3
if [ "$1" == "compute" -o "$1" == "controller" ]
then
crudini --set /etc/nova/nova.conf neutron url http://$2:9696
crudini --set /etc/nova/nova.conf neutron auth_url http://$2:35357
crudini --set /etc/nova/nova.conf neutron auth_url http://$2:5000
crudini --set /etc/nova/nova.conf neutron auth_type password
crudini --set /etc/nova/nova.conf neutron project_domain_name default
crudini --set /etc/nova/nova.conf neutron user_domain_name default
Expand Down
2 changes: 1 addition & 1 deletion lib/configure-nova.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ crudini --set /etc/nova/nova.conf placement project_domain_name Default
crudini --set /etc/nova/nova.conf placement project_name service
crudini --set /etc/nova/nova.conf placement auth_type password
crudini --set /etc/nova/nova.conf placement user_domain_name Default
crudini --set /etc/nova/nova.conf placement auth_url http://$2:35357/v3
crudini --set /etc/nova/nova.conf placement auth_url http://$2:5000/v3
crudini --set /etc/nova/nova.conf placement username placement
crudini --set /etc/nova/nova.conf placement password placement

Expand Down
Empty file modified lib/configure-ovs-bridge.sh
100644 → 100755
Empty file.
Empty file modified lib/configure-packages.sh
100644 → 100755
Empty file.
Empty file modified lib/configure-qemu.sh
100644 → 100755
Empty file.
Empty file modified lib/install-config-odl-ovs.sh
100644 → 100755
Empty file.
Empty file modified lib/install-config-ovs-vxlan.sh
100644 → 100755
Empty file.
Empty file modified lib/local_settings.py
100644 → 100755
Empty file.
Empty file modified lib/mysql-secure-installation.sh
100644 → 100755
Empty file.
Empty file modified lib/setup-cirros-image.sh
100644 → 100755
Empty file.
Empty file modified post-config-actions.sh
100644 → 100755
Empty file.
Empty file modified remove.sh
100644 → 100755
Empty file.
Empty file modified util/backup-restore-config-files.sh
100644 → 100755
Empty file.
Empty file modified util/debug-openstack-service.sh
100644 → 100755
Empty file.
Empty file modified util/detect-nodetype.sh
100644 → 100755
Empty file.
Empty file modified util/drop-databases.sh
100644 → 100755
Empty file.
Empty file modified util/install-config-linux-bridge.sh
100644 → 100755
Empty file.
Empty file modified util/manage-services.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions util/update-etc-hosts.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ function change-ip-in-etc-hosts() {
function get-ip-address() {
ip_address_val=''
ubuntu_version=`lsb_release -sr`
if [ "$ubuntu_version" == "17.04" ]
if [ "$ubuntu_version" == "18.04" ] || [ "$ubuntu_version" == "17.04" ]
then
ip_address_val=`ifconfig $1 | grep 'inet ' | cut -d' ' -f10 | awk '{ print $1}'`
elif [ "$ubuntu_version" == "16.04" ]
then
ip_address_val=`ifconfig $1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
else
echo "This release is supported only on Zesty (17.04) or Xenial (16.04)"
echo "This release is supported only on Bionic (18.04), Zesty (17.04) or Xenial (16.04)"
exit 1;
fi
echo $ip_address_val
Expand Down
Empty file modified util/update-etc-network-interfaces.sh
100644 → 100755
Empty file.
Empty file modified util/update-ip.sh
100644 → 100755
Empty file.