Rename flavour to element.
Flavour is overloaded in openstack due to it being used by nova. Element seems to have the same feeling of combinability without using a term already in active use in the openstack community. Change-Id: Ia4c028d4062a8f69c66665821c94dd4bcdf06031
This commit is contained in:
14
elements/local-config/install.d/61-http-proxy
Executable file
14
elements/local-config/install.d/61-http-proxy
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/bin/bash
|
||||
# Save the HTTP if one is available.
|
||||
# XXX: Obviously not suitable for downloadable images.
|
||||
|
||||
set -e
|
||||
set -o xtrace
|
||||
|
||||
if [ -n "$http_proxy" ]; then
|
||||
if [ -d ~stack ]; then
|
||||
echo export no_proxy=192.0.2.1 >> ~stack/.profile
|
||||
echo export http_proxy=$http_proxy >> ~stack/.profile
|
||||
fi
|
||||
echo Acquire::http::Proxy \"$http_proxy\"; > /etc/apt/apt.conf.d/61-use-http-proxy
|
||||
fi
|
||||
12
elements/local-config/install.d/62-ssh-key
Executable file
12
elements/local-config/install.d/62-ssh-key
Executable file
@@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
# Save user SSH public key if available.
|
||||
# XXX: Obviously not suitable for downloadable images.
|
||||
|
||||
set -e
|
||||
|
||||
if [ -e "/tmp/in_target.d/ssh-authorized-keys" ]; then
|
||||
if [ -d ~stack ]; then
|
||||
sudo -u stack mkdir ~stack/.ssh
|
||||
sudo -Hiu stack dd of=~stack/.ssh/authorized_keys oflag=append conv=notrunc if=/tmp/in_target.d/ssh-authorized-keys
|
||||
fi
|
||||
fi
|
||||
Reference in New Issue
Block a user