Merge "Remove glance and nova custom constraints"

deployed-server/deployed-server-roles-data.yaml

@@ -14,16 +14,12 @@
 # defaults to '%stackname%-{{role.name.lower()}}-%index%'
 # 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
 # on the role, defaults to an empty list. Sets the default for the
 # {{role.name}}Services parameter in overcloud.yaml
 
 - name: ControllerDeployedServer
   CountDefault: 1
-  disable_constraints: True
   tags:
     - primary
     - controller
@@ -162,7 +158,6 @@
 - name: ComputeDeployedServer
   CountDefault: 1
   HostnameFormatDefault: '%stackname%-novacompute-%index%'
-  disable_constraints: True
   networks:
     - InternalApi
     - Tenant
@@ -209,7 +204,6 @@
     - OS::TripleO::Services::OVNController
 
 - name: BlockStorageDeployedServer
-  disable_constraints: True
   networks:
     - InternalApi
     - Storage
@@ -240,7 +234,6 @@
     - OS::TripleO::Services::Tuned
 
 - name: ObjectStorageDeployedServer
-  disable_constraints: True
   networks:
     - InternalApi
     - Storage
@@ -269,7 +262,6 @@
     - OS::TripleO::Services::Tuned
 
 - name: CephStorageDeployedServer
-  disable_constraints: True
   networks:
     - Storage
     - StorageMgmt

puppet/role.role.j2.yaml

@@ -16,10 +16,6 @@ parameters:
     description: Flavor for the {{role.name}} node.
     default: {{default_flavor_name}}
     type: string
-{%- if role.disable_constraints is not defined %}
-    constraints:
-      - custom_constraint: nova.flavor
-{%- endif %}
 {%- set default_image_name = role.ImageDefault|default('overcloud-full') %}
 {%- if role.deprecated_param_image is defined %}
   {{role.deprecated_param_image}}:
@@ -31,10 +27,6 @@ parameters:
     type: string
     default: {{default_image_name}}
     description: The disk image file to use for the role.
-{%- if role.disable_constraints is not defined %}
-    constraints:
-      - custom_constraint: glance.image
-{%- endif %}
   ImageUpdatePolicy:
     default: 'REBUILD_PRESERVE_EPHEMERAL'
     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
     type: string
     default: default
-{%- if role.disable_constraints is not defined %}
-    constraints:
-      - custom_constraint: nova.keypair
-{%- endif %}
   NeutronPhysicalBridge:
     default: 'br-ex'
     description: An OVS bridge to create for accessing external networks.

roles/ComputeAlt.yaml

@@ -13,7 +13,6 @@
     Storage:
       subnet: storage_subnet
   HostnameFormatDefault: '%stackname%-novacomputealt-%index%'
-  disable_constraints: True
   RoleParametersDefault:
     TunedProfileName: "virtual-host"
   update_serial: 25

roles/README.rst

@@ -44,9 +44,6 @@ Role Options
   value, this enables roles to specify specific values appropriate to their
   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
   specified by services to run in batches vs all nodes at once.
   This defaults to 1, but larger batches may be specified here.

roles/Standalone.yaml

@@ -23,7 +23,6 @@
       subnet: storage_mgmt_subnet
     Tenant:
       subnet: tenant_subnet
-  disable_constraints: True
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AodhApi

roles/Undercloud.yaml

@@ -6,7 +6,6 @@
     A role to deploy the undercloud via heat using the 'openstack undercloud
     deploy' command.
   CountDefault: 1
-  disable_constraints: True
   tags:
     - primary
     - controller

roles/UndercloudMinion.yaml

@@ -7,7 +7,6 @@
     and ironic-conductor via heat using the 'openstack undercloud
     minion deploy' command.
   CountDefault: 1
-  disable_constraints: True
   tags:
     - primary
   ServicesDefault:

roles_data_undercloud.yaml

@@ -9,7 +9,6 @@
     A role to deploy the undercloud via heat using the 'openstack undercloud
     deploy' command.
   CountDefault: 1
-  disable_constraints: True
   tags:
     - primary
     - controller

tools/process-templates.py

@@ -219,12 +219,6 @@ def process_templates(template_path, role_data_path, output_dir,
                                     # that specify {{role}} vs {{role.name}}
                                     j2_data = {'role': role,
                                                '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(
                                         template_data, j2_data,
                                         out_f_path, overwrite, dry_run)