diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-12-07 20:39:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-12-07 20:39:12 +0000 |
| commit | 10b6bb97133eb36ef0185fd903b3f112cd70a5db (patch) | |
| tree | 28b9cb1954b04e0976ddcae56ffda08a76a5b021 /puppet/controller.yaml | |
| parent | 4e293c2ada6696f17fa78b6c0aebb815fee5a32d (diff) | |
| parent | 444d3ba9028e8e4620db4cb90aa4805cbe7b4686 (diff) | |
Merge "Making nova parameters configurable for nuage-metadata-agent"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 417e9d4d..97b5456b 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -240,6 +240,10 @@ parameters: default: 'REBUILD_PRESERVE_EPHEMERAL' description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt. type: string + InstanceNameTemplate: + default: 'instance-%08x' + description: Template string to be used to generate instance names + type: string KeyName: default: default description: Name of an existing EC2 KeyPair to enable SSH access to the instances @@ -985,6 +989,7 @@ resources: - '@' - {get_param: MysqlVirtualIP} - '/nova' + instance_name_template: {get_param: InstanceNameTemplate} fencing_config: {get_param: FencingConfig} pcsd_password: {get_param: PcsdPassword} rabbit_username: {get_param: RabbitUserName} @@ -1315,6 +1320,7 @@ resources: nova::database_connection: {get_input: nova_dsn} 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::instance_name_template: {get_input: instance_name_template} nova::network::neutron::neutron_admin_password: {get_input: neutron_password} nova::network::neutron::neutron_url: {get_input: neutron_internal_url} nova::network::neutron::neutron_admin_auth_url: {get_input: neutron_admin_auth_url} |