diff --git a/snap-overlay/data/mysql.tar.xz b/snap-overlay/data/mysql.tar.xz new file mode 100644 index 0000000..9552131 Binary files /dev/null and b/snap-overlay/data/mysql.tar.xz differ diff --git a/snap/hooks/configure b/snap/hooks/configure index a2e9af0..541ed62 100755 --- a/snap/hooks/configure +++ b/snap/hooks/configure @@ -1,12 +1,5 @@ #!/bin/bash -e -# Install conf.d configuration from snap for db etc -echo "Installing configuration for OpenStack Services" -for project in neutron nova keystone glance; do - mkdir -p ${SNAP_COMMON}/etc/${project}/${project}.conf.d - cp -r ${SNAP}/etc/${project}/${project}.conf.d/* ${SNAP_COMMON}/etc/${project}/${project}.conf.d -done - # Create all of the databases echo "Creating OpenStack Databases" @@ -43,3 +36,18 @@ ovs-vsctl --retry --may-exist add-br br-ex # Configure br-ex ip address add 10.20.20.1/24 dev br-ex || : ip link set br-ex up || : + +while ! nc -z localhost 9292; do sleep 0.1; done; + +sleep 5 + +openstack image show cirros || { + [ -f $HOME/images/cirros-0.3.5-x86_64-disk.img ] || { + mkdir -p $HOME/images + wget \ + http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img \ + -O ${HOME}/images/cirros-0.3.5-x86_64-disk.img + } + openstack image create --file ${HOME}/images/cirros-0.3.5-x86_64-disk.img \ + --public --container-format=bare --disk-format=qcow2 cirros +} diff --git a/snap/hooks/install b/snap/hooks/install index 4eca4cc..e693b4e 100755 --- a/snap/hooks/install +++ b/snap/hooks/install @@ -3,3 +3,19 @@ set -e install -D $SNAP/var/snap/microstack/common/libvirt/libvirtd.conf $SNAP_COMMON/libvirt/libvirtd.conf sed -i 's/unix_sock_group = "libvirtd"/unix_sock_group = "sudo"/' $SNAP_COMMON/libvirt/libvirtd.conf + +# MySQL snapshot for speedy install +# snapshot is a mysql data dir with +# rocky keystone,nova,glance,neutron dbs. +mkdir -p ${SNAP_COMMON}/lib +tar -xJf ${SNAP}/data/mysql.tar.xz -C ${SNAP_COMMON}/lib + +# Install conf.d configuration from snap for db etc +echo "Installing configuration for OpenStack Services" +for project in neutron nova keystone glance; do + mkdir -p ${SNAP_COMMON}/etc/${project}/${project}.conf.d + cp -r ${SNAP}/etc/${project}/${project}.conf.d/* ${SNAP_COMMON}/etc/${project}/${project}.conf.d +done + +# Configure Keystone Fernet Keys +snap-openstack keystone-manage fernet_setup --keystone-user root --keystone-group root