Remove glance and nova custom constraints
These endpoints won't exist on the undercloud in the U cycle, and this sort of check overlaps with tripleo-validations anyway. This change also removes the disable_constraints roles data attribute as there is no longer anything to disable. Possibly this means deployed-server/deployed-server-roles-data.yaml is no longer required because it only exists to set disable_constraints:true (although it lags roles_data.yaml by quite a lot now) It looks like tripleo-validations has checks for flavor and image already, but not keypair. It is unlikely users stray from the 'default' keypair so it is probably fine to not have a validation of this for the Train release. Change-Id: Id6146bfdc124e6e3e64ee7caea3ddeb2552bfa71 Blueprint: nova-less-deploy
This commit is contained in:
parent
9985d5a13e
commit
fe266d120d
|
@ -14,16 +14,12 @@
|
||||||
# defaults to '%stackname%-{{role.name.lower()}}-%index%'
|
# defaults to '%stackname%-{{role.name.lower()}}-%index%'
|
||||||
# sets the default for {{role.name}}HostnameFormat parameter in overcloud.yaml
|
# sets the default for {{role.name}}HostnameFormat parameter in overcloud.yaml
|
||||||
#
|
#
|
||||||
# disable_constraints: (boolean) optional, whether to disable Nova and Glance
|
|
||||||
# constraints for each role specified in the templates.
|
|
||||||
#
|
|
||||||
# ServicesDefault: (list) optional default list of services to be deployed
|
# ServicesDefault: (list) optional default list of services to be deployed
|
||||||
# on the role, defaults to an empty list. Sets the default for the
|
# on the role, defaults to an empty list. Sets the default for the
|
||||||
# {{role.name}}Services parameter in overcloud.yaml
|
# {{role.name}}Services parameter in overcloud.yaml
|
||||||
|
|
||||||
- name: ControllerDeployedServer
|
- name: ControllerDeployedServer
|
||||||
CountDefault: 1
|
CountDefault: 1
|
||||||
disable_constraints: True
|
|
||||||
tags:
|
tags:
|
||||||
- primary
|
- primary
|
||||||
- controller
|
- controller
|
||||||
|
@ -162,7 +158,6 @@
|
||||||
- name: ComputeDeployedServer
|
- name: ComputeDeployedServer
|
||||||
CountDefault: 1
|
CountDefault: 1
|
||||||
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
||||||
disable_constraints: True
|
|
||||||
networks:
|
networks:
|
||||||
- InternalApi
|
- InternalApi
|
||||||
- Tenant
|
- Tenant
|
||||||
|
@ -209,7 +204,6 @@
|
||||||
- OS::TripleO::Services::OVNController
|
- OS::TripleO::Services::OVNController
|
||||||
|
|
||||||
- name: BlockStorageDeployedServer
|
- name: BlockStorageDeployedServer
|
||||||
disable_constraints: True
|
|
||||||
networks:
|
networks:
|
||||||
- InternalApi
|
- InternalApi
|
||||||
- Storage
|
- Storage
|
||||||
|
@ -240,7 +234,6 @@
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
|
||||||
- name: ObjectStorageDeployedServer
|
- name: ObjectStorageDeployedServer
|
||||||
disable_constraints: True
|
|
||||||
networks:
|
networks:
|
||||||
- InternalApi
|
- InternalApi
|
||||||
- Storage
|
- Storage
|
||||||
|
@ -269,7 +262,6 @@
|
||||||
- OS::TripleO::Services::Tuned
|
- OS::TripleO::Services::Tuned
|
||||||
|
|
||||||
- name: CephStorageDeployedServer
|
- name: CephStorageDeployedServer
|
||||||
disable_constraints: True
|
|
||||||
networks:
|
networks:
|
||||||
- Storage
|
- Storage
|
||||||
- StorageMgmt
|
- StorageMgmt
|
||||||
|
|
|
@ -16,10 +16,6 @@ parameters:
|
||||||
description: Flavor for the {{role.name}} node.
|
description: Flavor for the {{role.name}} node.
|
||||||
default: {{default_flavor_name}}
|
default: {{default_flavor_name}}
|
||||||
type: string
|
type: string
|
||||||
{%- if role.disable_constraints is not defined %}
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: nova.flavor
|
|
||||||
{%- endif %}
|
|
||||||
{%- set default_image_name = role.ImageDefault|default('overcloud-full') %}
|
{%- set default_image_name = role.ImageDefault|default('overcloud-full') %}
|
||||||
{%- if role.deprecated_param_image is defined %}
|
{%- if role.deprecated_param_image is defined %}
|
||||||
{{role.deprecated_param_image}}:
|
{{role.deprecated_param_image}}:
|
||||||
|
@ -31,10 +27,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: {{default_image_name}}
|
default: {{default_image_name}}
|
||||||
description: The disk image file to use for the role.
|
description: The disk image file to use for the role.
|
||||||
{%- if role.disable_constraints is not defined %}
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: glance.image
|
|
||||||
{%- endif %}
|
|
||||||
ImageUpdatePolicy:
|
ImageUpdatePolicy:
|
||||||
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.
|
||||||
|
@ -43,10 +35,6 @@ parameters:
|
||||||
description: Name of an existing Nova key pair to enable SSH access to the instances
|
description: Name of an existing Nova key pair to enable SSH access to the instances
|
||||||
type: string
|
type: string
|
||||||
default: default
|
default: default
|
||||||
{%- if role.disable_constraints is not defined %}
|
|
||||||
constraints:
|
|
||||||
- custom_constraint: nova.keypair
|
|
||||||
{%- endif %}
|
|
||||||
NeutronPhysicalBridge:
|
NeutronPhysicalBridge:
|
||||||
default: 'br-ex'
|
default: 'br-ex'
|
||||||
description: An OVS bridge to create for accessing external networks.
|
description: An OVS bridge to create for accessing external networks.
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
Storage:
|
Storage:
|
||||||
subnet: storage_subnet
|
subnet: storage_subnet
|
||||||
HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
|
HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
|
||||||
disable_constraints: True
|
|
||||||
RoleParametersDefault:
|
RoleParametersDefault:
|
||||||
TunedProfileName: "virtual-host"
|
TunedProfileName: "virtual-host"
|
||||||
update_serial: 25
|
update_serial: 25
|
||||||
|
|
|
@ -44,9 +44,6 @@ Role Options
|
||||||
value, this enables roles to specify specific values appropriate to their
|
value, this enables roles to specify specific values appropriate to their
|
||||||
configuration, defaults to an empty map.
|
configuration, defaults to an empty map.
|
||||||
|
|
||||||
* disable_constraints: (boolean) optional, whether to disable Nova and Glance
|
|
||||||
constraints for each role specified in the templates.
|
|
||||||
|
|
||||||
* upgrade_batch_size: (number): batch size for upgrades where tasks are
|
* upgrade_batch_size: (number): batch size for upgrades where tasks are
|
||||||
specified by services to run in batches vs all nodes at once.
|
specified by services to run in batches vs all nodes at once.
|
||||||
This defaults to 1, but larger batches may be specified here.
|
This defaults to 1, but larger batches may be specified here.
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
subnet: storage_mgmt_subnet
|
subnet: storage_mgmt_subnet
|
||||||
Tenant:
|
Tenant:
|
||||||
subnet: tenant_subnet
|
subnet: tenant_subnet
|
||||||
disable_constraints: True
|
|
||||||
ServicesDefault:
|
ServicesDefault:
|
||||||
- OS::TripleO::Services::Aide
|
- OS::TripleO::Services::Aide
|
||||||
- OS::TripleO::Services::AodhApi
|
- OS::TripleO::Services::AodhApi
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
A role to deploy the undercloud via heat using the 'openstack undercloud
|
A role to deploy the undercloud via heat using the 'openstack undercloud
|
||||||
deploy' command.
|
deploy' command.
|
||||||
CountDefault: 1
|
CountDefault: 1
|
||||||
disable_constraints: True
|
|
||||||
tags:
|
tags:
|
||||||
- primary
|
- primary
|
||||||
- controller
|
- controller
|
||||||
|
|
|
@ -7,7 +7,6 @@
|
||||||
and ironic-conductor via heat using the 'openstack undercloud
|
and ironic-conductor via heat using the 'openstack undercloud
|
||||||
minion deploy' command.
|
minion deploy' command.
|
||||||
CountDefault: 1
|
CountDefault: 1
|
||||||
disable_constraints: True
|
|
||||||
tags:
|
tags:
|
||||||
- primary
|
- primary
|
||||||
ServicesDefault:
|
ServicesDefault:
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
A role to deploy the undercloud via heat using the 'openstack undercloud
|
A role to deploy the undercloud via heat using the 'openstack undercloud
|
||||||
deploy' command.
|
deploy' command.
|
||||||
CountDefault: 1
|
CountDefault: 1
|
||||||
disable_constraints: True
|
|
||||||
tags:
|
tags:
|
||||||
- primary
|
- primary
|
||||||
- controller
|
- controller
|
||||||
|
|
|
@ -219,12 +219,6 @@ def process_templates(template_path, role_data_path, output_dir,
|
||||||
# that specify {{role}} vs {{role.name}}
|
# that specify {{role}} vs {{role.name}}
|
||||||
j2_data = {'role': role,
|
j2_data = {'role': role,
|
||||||
'networks': network_data}
|
'networks': network_data}
|
||||||
# (dprince) For the undercloud installer we
|
|
||||||
# don'twant to have heat check nova/glance
|
|
||||||
# API's
|
|
||||||
if r_map[role].get('disable_constraints',
|
|
||||||
False):
|
|
||||||
j2_data['disable_constraints'] = True
|
|
||||||
_j2_render_to_file(
|
_j2_render_to_file(
|
||||||
template_data, j2_data,
|
template_data, j2_data,
|
||||||
out_f_path, overwrite, dry_run)
|
out_f_path, overwrite, dry_run)
|
||||||
|
|
Loading…
Reference in New Issue