Merge "Cleanup RC files in .gitignore."

This commit is contained in:
Jenkins 2014-02-12 02:25:12 +00:00 committed by Gerrit Code Review
commit d65be90a53
2 changed files with 3 additions and 6 deletions

4
.gitignore vendored
View File

@ -19,10 +19,6 @@ scripts/nova
scripts/neutron scripts/neutron
scripts/os-apply-config scripts/os-apply-config
scripts/swift scripts/swift
stackrc
tripleo-passwords
tripleorc
.tox .tox
doc/build doc/build

View File

@ -30,8 +30,9 @@ fi #nodocs
UNDERCLOUD_ID=$(load-image $TRIPLEO_ROOT/undercloud.qcow2) UNDERCLOUD_ID=$(load-image $TRIPLEO_ROOT/undercloud.qcow2)
## #. Create secrets for the cloud. The secrets will be written to a file ## #. Create secrets for the cloud. The secrets will be written to a file
## (tripleo-passwords by default) that you need to source into your shell ## (tripleo-undercloud-passwords by default) that you need to source into
## environment. Note that you can also make or change these later and ## your shell environment.
## Note that you can also make or change these later and
## update the heat stack definition to inject them - as long as you also ## update the heat stack definition to inject them - as long as you also
## update the keystone recorded password. Note that there will be a window ## update the keystone recorded password. Note that there will be a window
## between updating keystone and instances where they will disagree and ## between updating keystone and instances where they will disagree and