Merge "xenapi: separate disk for cinder volumes"
diff --git a/files/keystone_data.sh b/files/keystone_data.sh
index a1875e1..ccac880 100755
--- a/files/keystone_data.sh
+++ b/files/keystone_data.sh
@@ -7,7 +7,7 @@
# service glance admin
# service swift service # if enabled
# service heat service # if enabled
-# service ceilometer service # if enabled
+# service ceilometer admin # if enabled
# Tempest Only:
# alt_demo alt_demo Member
#
@@ -157,7 +157,7 @@
--email=ceilometer@example.com)
keystone user-role-add --tenant_id $SERVICE_TENANT \
--user_id $CEILOMETER_USER \
- --role_id $SERVICE_ROLE
+ --role_id $ADMIN_ROLE
# Ceilometer needs ResellerAdmin role to access swift account stats.
keystone user-role-add --tenant_id $SERVICE_TENANT \
--user_id $CEILOMETER_USER \
diff --git a/functions b/functions
index 8aba10d..c611e00 100644
--- a/functions
+++ b/functions
@@ -471,6 +471,13 @@
fi
}
+# Utility function for checking machine architecture
+# is_arch arch-type
+function is_arch {
+ ARCH_TYPE=$1
+
+ [ "($uname -m)" = "$ARCH_TYPE" ]
+}
# git clone only if directory doesn't exist already. Since ``DEST`` might not
# be owned by the installation user, we create the directory and change the
diff --git a/lib/heat b/lib/heat
index 4d2f84e..13bf130 100644
--- a/lib/heat
+++ b/lib/heat
@@ -158,7 +158,7 @@
# (re)create heat database
recreate_database heat utf8
- $HEAT_DIR/bin/heat-db-setup $os_PACKAGE -r $DATABASE_PASSWORD
+ $HEAT_DIR/bin/heat-manage db_sync
create_heat_cache_dir
}
diff --git a/stack.sh b/stack.sh
index 4089531..f8d546f 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1108,6 +1108,10 @@
iniset $NOVA_CONF DEFAULT compute_driver "libvirt.LibvirtDriver"
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.libvirt.firewall.IptablesFirewallDriver"}
iniset $NOVA_CONF DEFAULT firewall_driver "$LIBVIRT_FIREWALL_DRIVER"
+ # Power architecture currently does not support graphical consoles.
+ if is_arch "ppc64"; then
+ iniset $NOVA_CONF DEFAULT vnc_enabled "false"
+ fi
fi
init_nova_cells
diff --git a/stackrc b/stackrc
index ef39710..23b5bb8 100644
--- a/stackrc
+++ b/stackrc
@@ -233,8 +233,8 @@
esac
-# 5Gb default volume backing file size
-VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-5130M}
+# 10Gb default volume backing file size
+VOLUME_BACKING_FILE_SIZE=${VOLUME_BACKING_FILE_SIZE:-10250M}
# Name of the LVM volume group to use/create for iscsi volumes
VOLUME_GROUP=${VOLUME_GROUP:-stack-volumes}