openstack
/
tripleo-incubator
Code Issues Proposed changes

Merge "Generate overcloud keystone keys/certs"

This commit is contained in:
Jenkins 2014-07-09 08:11:32 +00:00 committed by Gerrit Code Review
parent 1cf73fd09a 1fea3c06a3
commit 9651086079
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/devtest_overcloud.sh
View File

@ -300,6 +300,10 @@ ENV_JSON=$(jq '.parameters = {
jq . > "${HEAT_ENV}" <<< $ENV_JSON
chmod 0600 "${HEAT_ENV}"
## #. Add Keystone certs/key into the environment file.::
generate-keystone-pki --heatenv $HEAT_ENV
## #. Deploy an overcloud::
make -C $TRIPLEO_ROOT/tripleo-heat-templates overcloud.yaml \

4
scripts/devtest_seed.sh
View File

@ -80,6 +80,9 @@ else
jq -s '.[1] as $config |(.[0].ironic |= (.virtual_power_ssh_key=$config["ssh-key"]))|.[0].nova.compute_driver="ironic.nova.virt.ironic.driver.IronicDriver"|.[0].nova.compute_manager="ironic.nova.compute.manager.ClusteredComputeManager"|.[0].nova.baremetal={}| .[0]' config.json $TE_DATAFILE > tmp_local.json
fi
# Add Keystone certs/key into the environment file
generate-keystone-pki --heatenv tmp_local.json -s
# Apply custom BM network settings to the seeds local.json config
BM_NETWORK_CIDR=$(OS_CONFIG_FILES=$TE_DATAFILE os-apply-config --key baremetal-network.cidr --type raw --key-default '192.0.2.0/24')
# FIXME: Once we support jq 1.3 we can use --arg here instead of writing
@ -100,7 +103,6 @@ jq -s '
rm tmp_local.json
rm cidr.json
### --end
# If running in a CI environment then the user and ip address should be read
# from the json describing the environment

4
scripts/devtest_undercloud.sh
View File

@ -239,6 +239,10 @@ fi
jq . > "${HEAT_ENV}" <<< $ENV_JSON
chmod 0600 "${HEAT_ENV}"
## #. Add Keystone certs/key into the environment file.::
generate-keystone-pki --heatenv $HEAT_ENV
## #. Deploy an undercloud.
## ::

2
scripts/setup-clienttools
View File

@ -24,7 +24,7 @@ pip install -U 'pbr>=0.5.21,<1.0'
pip install -U python-cinderclient python-novaclient python-glanceclient python-heatclient python-keystoneclient python-neutronclient python-swiftclient python-ironicclient python-openstackclient os-apply-config os-cloud-config
for tool in os-apply-config cinder nova glance heat keystone neutron swift ironic openstack init-keystone; do
for tool in os-apply-config cinder nova glance heat keystone neutron swift ironic openstack init-keystone generate-keystone-pki; do
ln -sf $VENV_HOME/bin/$tool $BASE/scripts/$tool ;
done
echo "Installed openstack client tool symlinks in $BASE/scripts"