zuul
/
nodepool
Code Issues Proposed changes

move 01-nodepool-setup to a later phase 

installs.d installs packages at 01-package-installs, this causes sudo
(installed from package-installs.yaml) to be installed AFTER
01-nodepool-setup is run.  Move it later as the files it sets up are not
needed until after reboot.

Change-Id: I238e517c983793589faa2c1e2dc0b13c70529d4a
This commit is contained in:
Matthew Thode 2018-10-12 19:11:06 -05:00
parent 98e608acad
commit fbc3735632
No known key found for this signature in database
GPG Key ID: 64A37BEAAE19A4E8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devstack/plugin.sh
View File

@ -74,7 +74,7 @@ EOF
function nodepool_write_elements {
sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d
sudo mkdir -p $(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/root.d
cat > /tmp/01-nodepool-setup <<EOF
cat > /tmp/40-nodepool-setup <<EOF
sudo mkdir -p /etc/nodepool
# Make it world writeable so nodepool can write here later.
sudo chmod 777 /etc/nodepool
@ -85,10 +85,10 @@ if [ -d "\$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
echo "Acquire::AllowInsecureRepositories \"true\";" | sudo tee -a \$TARGET_ROOT/etc/apt/apt.conf.d/95allow-unauthenticated
fi
EOF
sudo mv /tmp/01-nodepool-setup \
$(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
sudo mv /tmp/40-nodepool-setup \
$(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/40-nodepool-setup
sudo chmod a+x \
$(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/01-nodepool-setup
$(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/install.d/40-nodepool-setup
sudo mv /tmp/50-apt-allow-unauthenticated \
$(dirname $NODEPOOL_CONFIG)/elements/nodepool-setup/root.d/50-apt-allow-unauthenticated
sudo chmod a+x \