Merge "Change default passwords in boot-stack to 'unset'."

This commit is contained in:
Jenkins 2013-04-22 22:17:44 +00:00 committed by Gerrit Code Review
commit f842d0add9
2 changed files with 13 additions and 16 deletions

View File

@ -1,16 +1,13 @@
{ {
"OpenStack::Heat::Stack": { "OpenStack::Heat::Stack": {
"Name": "foo",
"Region": "az1",
"RefreshResource": "foo"
}, },
"admin-token": "foobar", "admin-token": "unset",
"admin-password": "kilgore", "admin-password": "unset",
"service-password": "foobaz", "service-password": "unset",
"db-password": "stackdb", "db-password": "unset",
"keystone": { "keystone": {
"host": "127.0.0.1", "host": "127.0.0.1",
"db": "mysql://keystone:stackdb@localhost/keystone" "db": "mysql://keystone:unset@localhost/keystone"
}, },
"interfaces": { "interfaces": {
"control": "eth0" "control": "eth0"
@ -21,27 +18,27 @@
}, },
"glance": { "glance": {
"host": "127.0.0.1", "host": "127.0.0.1",
"db": "mysql://glance:stackdb@localhost/glance" "db": "mysql://glance:unset@localhost/glance"
}, },
"nova": { "nova": {
"host": "127.0.0.1", "host": "127.0.0.1",
"db": "mysql://nova:stackdb@localhost/nova", "db": "mysql://nova:unset@localhost/nova",
"bm_db": "mysql://nova:stackdb@localhost/nova_bm", "bm_db": "mysql://nova:unset@localhost/nova_bm",
"bm_arch": "i386", "bm_arch": "i386",
"virtual_power_user": "stack", "virtual_power_user": "stack",
"virtual_power_key": "/opt/stack/boot-stack/virtual-power-key", "virtual_power_key": "/opt/stack/boot-stack/virtual-power-key",
"virtual_power_ssh_host": "192.168.122.1" "virtual_power_ssh_host": "192.168.122.1"
}, },
"cinder": { "cinder": {
"db": "mysql://cinder:stackdb@localhost/cinder", "db": "mysql://cinder:unset@localhost/cinder",
"volume_size_mb": "5000" "volume_size_mb": "5000"
}, },
"quantum": { "quantum": {
"host": "127.0.0.1", "host": "127.0.0.1",
"ovs_db": "mysql://quantum:stackdb@localhost/ovs_quantum?charset=utf8" "ovs_db": "mysql://quantum:unset@localhost/ovs_quantum?charset=utf8"
}, },
"swift": { "swift": {
"store_user": "foo", "store_user": "unset",
"store_key": "bar" "store_key": "unset"
} }
} }

View File

@ -1,6 +1,6 @@
# TODO: generate random credentials. # TODO: generate random credentials.
export NOVA_VERSION=1.1 export NOVA_VERSION=1.1
export OS_PASSWORD=kilgore export OS_PASSWORD=unset
export OS_AUTH_URL=http://localhost:5000/v2.0 export OS_AUTH_URL=http://localhost:5000/v2.0
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin