diff --git a/Vagrantfile b/Vagrantfile index 0bbd7b2..7baecb4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -105,6 +105,6 @@ Vagrant.configure(2) do |config| end add_block_device(node, 1, CONFIG['resources']['storage']) add_block_device(node, 2, CONFIG['resources']['storage']) - node.vm.provision 'shell', path: 'files/initialize.sh', privileged: false + node.vm.provision 'shell', path: 'scripts/initialize.sh', privileged: false end end diff --git a/doc/source/initialization.rst b/doc/source/initialization.rst index e50a4a0..fea8c09 100644 --- a/doc/source/initialization.rst +++ b/doc/source/initialization.rst @@ -5,28 +5,15 @@ Initialization $ vagrant up -Afterwards run the following command on the controller node as the -unprivileged user ``vagrant`` (``vagrant ssh controller``) -to deploy OpenStack with Packstack. - -:: - - $ packstack --answer-file packstack.answers - -Run ``packstack`` with ``--debug`` to enable debug logging. - -:: - - $ packstack --debug --answer-file packstack.answers - - The installation log file is available at: ``/var/tmp/packstack/YYMMDD-HHMMSS-abcdef/openstack-setup.log`` - The generated manifests are available at: ``/var/tmp/packstack/YYMMDD-HHMMSS-abcdef/manifests`` -Finally (optional) you can run the ``setup.sh`` script after the successful -deployment to add cloud images etc. pp. +After the successful deployment you can run the ``setup.sh`` script +on the controller node as the unprivileged user ``vagrant`` +(``vagrant ssh controller``) to add cloud images etc. pp. :: - $ ./scripts/setup.sh + $ /home/vagrant/scripts/setup.sh diff --git a/files/bootstrap.sh b/files/bootstrap.sh deleted file mode 100644 index b43a522..0000000 --- a/files/bootstrap.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -# https://openstack.redhat.com/Quickstart - -packstack --answer-file=packstack.answers diff --git a/files/initialize.sh b/scripts/initialize.sh similarity index 93% rename from files/initialize.sh rename to scripts/initialize.sh index 471ff5d..10ea2b6 100644 --- a/files/initialize.sh +++ b/scripts/initialize.sh @@ -16,3 +16,5 @@ for node in $(sed -n '/<<< Packstack >>>/{:a;n;/>>> Packstack <<