openstack/tripleo-image-elements
Code Issues Proposed changes

Merge "Use the more common os_ names for novaclient"

Browse Source
This commit is contained in:
Jenkins 2014-06-05 19:10:24 +00:00 committed by Gerrit Code Review
commit 1c80bfb1fd
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/nagios3/README.md
View File

@ -13,10 +13,10 @@ can be provided via heat. For example:
nagios3:
adm_web_passwd: nagiosadmin
nova_host_ip: 192.0.2.1
nova_os_password: unset
nova_os_username: admin
nova_os_tenant_name: admin
os_auth_url: 192.0.2.1
os_password: unset
os_username: admin
os_tenant_name: admin
initial_network_split_key: ctlplane
Sample heat template with defaults configured for a boot-stack vm located at:

10
elements/nagios3/os-apply-config/etc/nagios3/nova_access_info Normal file
View File

@ -0,0 +1,10 @@
export NOVA_VERSION=1.1
export OS_PASSWORD={{nagios3.os_password}}
export OS_AUTH_URL={{nagios3.os_auth_url}}
export OS_USERNAME={{nagios3.os_username}}
export OS_TENANT_NAME={{nagios3.os_tenant_name}}
export COMPUTE_API_VERSION=1.1
export OS_NO_CACHE=True
# add initial split network.
split_key={{nagios3.initial_network_split_key}}
nagiosadmin_pass={{nagios3.adm_web_passwd}}

10
elements/nagios3/os-config-applier/etc/nagios3/nova_access_info
View File

@ -1,10 +0,0 @@
export NOVA_VERSION=1.1
export OS_PASSWORD={{nagios3.nova_os_password}}
export OS_AUTH_URL=http://{{nagios3.nova_host_ip}}:5000/v2.0
export OS_USERNAME={{nagios3.nova_os_username}}
export OS_TENANT_NAME={{nagios3.nova_os_tenant_name}}
export COMPUTE_API_VERSION=1.1
export OS_NO_CACHE=True
# add initial split network.
split_key={{nagios3.initial_network_split_key}}
nagiosadmin_pass={{nagios3.adm_web_passwd}}