Merge "Add some debug to async_wait failures"
diff --git a/files/debs/general b/files/debs/general
index d64417f..7e481b4 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -5,6 +5,7 @@
curl
default-jre-headless # NOPRIME
g++
+gawk
gcc
gettext # used for compiling message catalogs
git
diff --git a/files/debs/nova b/files/debs/nova
index a7aebbf..e194414 100644
--- a/files/debs/nova
+++ b/files/debs/nova
@@ -3,7 +3,6 @@
dnsmasq-base
dnsmasq-utils # for dhcp_release
ebtables
-gawk
genisoimage # required for config_drive
iptables
iputils-arping
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 0de0876..f636110 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -3,6 +3,7 @@
bc
ca-certificates-mozilla
curl
+gawk
gcc
gcc-c++
git-core
diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova
index 9923760..1cc2f62 100644
--- a/files/rpms-suse/nova
+++ b/files/rpms-suse/nova
@@ -4,7 +4,6 @@
dnsmasq
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
ebtables
-gawk
iptables
iputils
kpartx
diff --git a/files/rpms/general b/files/rpms/general
index cfcd7ff..33da0a5 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -1,6 +1,7 @@
bc
curl
dbus
+gawk
gcc
gcc-c++
gettext # used for compiling message catalogs
diff --git a/files/rpms/nova b/files/rpms/nova
index 2218330..8ea8ccc 100644
--- a/files/rpms/nova
+++ b/files/rpms/nova
@@ -3,7 +3,6 @@
dnsmasq # for q-dhcp
dnsmasq-utils # for dhcp_release
ebtables
-gawk
genisoimage # required for config_drive
iptables
iputils
diff --git a/lib/cinder_backups/ceph b/lib/cinder_backups/ceph
index 26136be..e4003c0 100644
--- a/lib/cinder_backups/ceph
+++ b/lib/cinder_backups/ceph
@@ -27,12 +27,8 @@
function configure_cinder_backup_ceph {
sudo ceph -c ${CEPH_CONF_FILE} osd pool create ${CINDER_BAK_CEPH_POOL} ${CINDER_BAK_CEPH_POOL_PG} ${CINDER_BAK_CEPH_POOL_PGP}
- if [ "$REMOTE_CEPH" = "False" ]; then
- # Configure Cinder backup service options, ceph pool, ceph user and ceph key
- sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${CINDER_BAK_CEPH_POOL} size ${CEPH_REPLICAS}
- if [[ $CEPH_REPLICAS -ne 1 ]]; then
- sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${CINDER_BAK_CEPH_POOL} crush_ruleset ${RULE_ID}
- fi
+ if [[ "$REMOTE_CEPH" = "False" && "$CEPH_REPLICAS" -ne 1 ]]; then
+ sudo ceph -c ${CEPH_CONF_FILE} osd pool set ${CINDER_BAK_CEPH_POOL} crush_ruleset ${RULE_ID}
fi
sudo ceph -c ${CEPH_CONF_FILE} auth get-or-create client.${CINDER_BAK_CEPH_USER} mon "allow r" osd "allow class-read object_prefix rbd_children, allow rwx pool=${CINDER_BAK_CEPH_POOL}, allow rwx pool=${CINDER_CEPH_POOL}" | sudo tee ${CEPH_CONF_DIR}/ceph.client.${CINDER_BAK_CEPH_USER}.keyring
sudo chown $(whoami):$(whoami) ${CEPH_CONF_DIR}/ceph.client.${CINDER_BAK_CEPH_USER}.keyring