Merge "Making nova parameters configurable for nuage-metadata-agent"
This commit is contained in:
commit
10b6bb9713
|
@ -437,6 +437,10 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: ''
|
default: ''
|
||||||
hidden: true
|
hidden: true
|
||||||
|
InstanceNameTemplate:
|
||||||
|
default: 'instance-%08x'
|
||||||
|
description: Template string to be used to generate instance names
|
||||||
|
type: string
|
||||||
KeystoneCACertificate:
|
KeystoneCACertificate:
|
||||||
default: ''
|
default: ''
|
||||||
description: Keystone self-signed certificate authority certificate.
|
description: Keystone self-signed certificate authority certificate.
|
||||||
|
@ -850,6 +854,7 @@ resources:
|
||||||
HorizonSecret: {get_resource: HorizonSecret}
|
HorizonSecret: {get_resource: HorizonSecret}
|
||||||
Image: {get_param: controllerImage}
|
Image: {get_param: controllerImage}
|
||||||
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
|
ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
|
||||||
|
InstanceNameTemplate: {get_param: InstanceNameTemplate}
|
||||||
KeyName: {get_param: KeyName}
|
KeyName: {get_param: KeyName}
|
||||||
KeystoneCACertificate: {get_param: KeystoneCACertificate}
|
KeystoneCACertificate: {get_param: KeystoneCACertificate}
|
||||||
KeystoneSigningCertificate: {get_param: KeystoneSigningCertificate}
|
KeystoneSigningCertificate: {get_param: KeystoneSigningCertificate}
|
||||||
|
|
|
@ -473,6 +473,7 @@ resources:
|
||||||
neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers}
|
neutron::plugins::ml2::type_drivers: {get_input: neutron_type_drivers}
|
||||||
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
neutron_mechanism_drivers: {get_input: neutron_mechanism_drivers}
|
||||||
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
neutron_public_interface_raw_device: {get_input: neutron_public_interface_raw_device}
|
||||||
|
keystone_public_api_virtual_ip: {get_input: keystone_vip}
|
||||||
admin_password: {get_input: admin_password}
|
admin_password: {get_input: admin_password}
|
||||||
ntp::servers: {get_input: ntp_servers}
|
ntp::servers: {get_input: ntp_servers}
|
||||||
tripleo::packages::enable_install: {get_input: enable_package_install}
|
tripleo::packages::enable_install: {get_input: enable_package_install}
|
||||||
|
@ -564,6 +565,7 @@ resources:
|
||||||
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
|
neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice}
|
||||||
neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
|
neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
|
||||||
neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]}
|
neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri]}
|
||||||
|
keystone_vip: {get_param: KeystonePublicApiVirtualIP}
|
||||||
admin_password: {get_param: AdminPassword}
|
admin_password: {get_param: AdminPassword}
|
||||||
rabbit_username: {get_param: RabbitUserName}
|
rabbit_username: {get_param: RabbitUserName}
|
||||||
rabbit_password: {get_param: RabbitPassword}
|
rabbit_password: {get_param: RabbitPassword}
|
||||||
|
|
|
@ -240,6 +240,10 @@ parameters:
|
||||||
default: 'REBUILD_PRESERVE_EPHEMERAL'
|
default: 'REBUILD_PRESERVE_EPHEMERAL'
|
||||||
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
|
description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
|
||||||
type: string
|
type: string
|
||||||
|
InstanceNameTemplate:
|
||||||
|
default: 'instance-%08x'
|
||||||
|
description: Template string to be used to generate instance names
|
||||||
|
type: string
|
||||||
KeyName:
|
KeyName:
|
||||||
default: default
|
default: default
|
||||||
description: Name of an existing EC2 KeyPair to enable SSH access to the instances
|
description: Name of an existing EC2 KeyPair to enable SSH access to the instances
|
||||||
|
@ -985,6 +989,7 @@ resources:
|
||||||
- '@'
|
- '@'
|
||||||
- {get_param: MysqlVirtualIP}
|
- {get_param: MysqlVirtualIP}
|
||||||
- '/nova'
|
- '/nova'
|
||||||
|
instance_name_template: {get_param: InstanceNameTemplate}
|
||||||
fencing_config: {get_param: FencingConfig}
|
fencing_config: {get_param: FencingConfig}
|
||||||
pcsd_password: {get_param: PcsdPassword}
|
pcsd_password: {get_param: PcsdPassword}
|
||||||
rabbit_username: {get_param: RabbitUserName}
|
rabbit_username: {get_param: RabbitUserName}
|
||||||
|
@ -1315,6 +1320,7 @@ resources:
|
||||||
nova::database_connection: {get_input: nova_dsn}
|
nova::database_connection: {get_input: nova_dsn}
|
||||||
nova::glance_api_servers: {get_input: glance_api_servers}
|
nova::glance_api_servers: {get_input: glance_api_servers}
|
||||||
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
nova::api::neutron_metadata_proxy_shared_secret: {get_input: neutron_metadata_proxy_shared_secret}
|
||||||
|
nova::api::instance_name_template: {get_input: instance_name_template}
|
||||||
nova::network::neutron::neutron_admin_password: {get_input: neutron_password}
|
nova::network::neutron::neutron_admin_password: {get_input: neutron_password}
|
||||||
nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
|
nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
|
||||||
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
|
nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url}
|
||||||
|
|
|
@ -7,6 +7,7 @@ ceilometer::agent::auth::auth_region: 'regionOne'
|
||||||
# changes in the tripleo-incubator keystone role setup
|
# changes in the tripleo-incubator keystone role setup
|
||||||
ceilometer::agent::auth::auth_tenant_name: 'admin'
|
ceilometer::agent::auth::auth_tenant_name: 'admin'
|
||||||
|
|
||||||
|
nova::api::admin_tenant_name: 'service'
|
||||||
nova::network::neutron::neutron_admin_tenant_name: 'service'
|
nova::network::neutron::neutron_admin_tenant_name: 'service'
|
||||||
nova::network::neutron::neutron_admin_username: 'neutron'
|
nova::network::neutron::neutron_admin_username: 'neutron'
|
||||||
nova::network::neutron::dhcp_domain: ''
|
nova::network::neutron::dhcp_domain: ''
|
||||||
|
|
|
@ -30,7 +30,6 @@ redis::sentinel::redis_host: "%{hiera('bootstrap_nodeid_ip')}"
|
||||||
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
|
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
|
||||||
|
|
||||||
# service tenant
|
# service tenant
|
||||||
nova::api::admin_tenant_name: 'service'
|
|
||||||
glance::api::keystone_tenant: 'service'
|
glance::api::keystone_tenant: 'service'
|
||||||
glance::registry::keystone_tenant: 'service'
|
glance::registry::keystone_tenant: 'service'
|
||||||
neutron::server::auth_tenant: 'service'
|
neutron::server::auth_tenant: 'service'
|
||||||
|
|
Loading…
Reference in New Issue