openstack
/
instack-undercloud
Code Issues Proposed changes

Remove instack-apply-config 

This doesn't appear to be called anymore, and we don't actually
want to be maintaining consistency with it in
instack-install-undercloud.

Change-Id: I4ee2b23428d4732d991a19612ad965b2a421bbb4
This commit is contained in:
Ben Nemec 2015-04-02 15:15:50 -05:00
parent da7f38fa74
commit 3da99772a0
3 changed files with 1 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
scripts/instack-apply-config
View File

@ -1,71 +0,0 @@
#!/bin/bash
set -eu
set -o pipefail
export INSTACK_ROOT=${INSTACK_ROOT:-""}
if [ -z "$INSTACK_ROOT" ]; then
cp /usr/share/instack-undercloud/instack.answers.sample ~/instack.answers
fi
vi ~/instack.answers
echo "Sourcing answers file from instack.answers..."
source ~/instack.answers
# Munge up LOCAL_IP. Keep in sync with instack-install-undercloud
export PUBLIC_INTERFACE_IP="$LOCAL_IP"
export LOCAL_IP="${LOCAL_IP%/*}"
export DEPLOYMENT_MODE
export IMAGE_PATH
export DNSMASQ_START
export DNSMASQ_END
export LOCAL_INTERFACE
export MASQUERADE_NETWORK
export POWER_DRIVER
export VIRTUAL_POWER_USER
export VIRTUAL_POWER_HOST
export DHCP_START
export DHCP_END
export NETWORK_CIDR
export NETWORK_GATEWAY
export DISCOVERY_INTERFACE
export DISCOVERY_IPRANGE
export DISCOVERY_PXEIP
export UNDERCLOUD_DB_PASSWORD=${UNDERCLOUD_DB_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_ADMIN_TOKEN=${UNDERCLOUD_ADMIN_TOKEN:-$(tripleo os-make-password)}
export UNDERCLOUD_ADMIN_PASSWORD=${UNDERCLOUD_ADMIN_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_GLANCE_PASSWORD=${UNDERCLOUD_GLANCE_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_HEAT_PASSWORD=${UNDERCLOUD_HEAT_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_NEUTRON_PASSWORD=${UNDERCLOUD_NEUTRON_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_NOVA_PASSWORD=${UNDERCLOUD_NOVA_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_IRONIC_PASSWORD=${UNDERCLOUD_IRONIC_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_TUSKAR_PASSWORD=${UNDERCLOUD_TUSKAR_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_SWIFT_PASSWORD=${UNDERCLOUD_SWIFT_PASSWORD:-$(tripleo os-make-password)}
if [ -z "$INSTACK_ROOT" ]; then
sudo -E /usr/share/instack-undercloud/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata
else
sudo -E $INSTACK_ROOT/instack-undercloud/elements/undercloud-stack-config/install.d/02-undercloud-stack-heat-metadata
fi
echo "****************************************************************"
echo "* Now ready to apply the configuration and start the Undercloud."
echo "****************************************************************"
echo "Type 'yes' to proceed:"
read PROCEED
if [ "$PROCEED" = "yes" ]; then
rm -f /home/stack/.config/autostart/instack.desktop
sudo os-collect-config --one-time --force
fi
sudo cp /root/stackrc ~
sudo cp /root/tripleo-undercloud-passwords ~
echo "****************************************************************"
echo " Undercloud configuration complete. "
echo "****************************************************************"

2
scripts/instack-install-undercloud
View File

@ -58,7 +58,7 @@ $INSTACKUNDERCLOUDELEMENTS:\
echo "Sourcing answers file from instack.answers..."
source ~/instack.answers
# Munge up LOCAL_IP. Keep in sync with instack-apply-config
# Munge up LOCAL_IP.
export PUBLIC_INTERFACE_IP="$LOCAL_IP"
export LOCAL_IP="${LOCAL_IP%/*}"

1
setup.cfg
View File

@ -22,7 +22,6 @@ classifier =
[files]
scripts =
scripts/instack-apply-config
scripts/instack-build-images
scripts/instack-create-overcloudrc
scripts/instack-deploy-overcloud