Merge "Add storage backends env files for containerized deployment" into stable/pike

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 0cdbef1..b625f71 100644 (file)
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -97,6 +97,8 @@ parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
+    # This makes the job twice as fast
+    ceilometer::agent::polling::polling_interval: 15
   Debug: true
   #NOTE(gfidente): not great but we need this to deploy on ext4
   #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/
@@ -128,6 +130,7 @@ parameter_defaults:
   GlanceBackend: rbd
   GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
+  GnocchiArchivePolicy: 'high'
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *

diff --git a/ci/environments/scenario001-multinode.yaml b/ci/environments/scenario001-multinode.yaml
index bab08a3..302b034 100644 (file)
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@@ -94,6 +94,8 @@ parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
+    # This makes the job twice as fast
+    ceilometer::agent::polling::polling_interval: 15
   Debug: true
   #NOTE(gfidente): not great but we need this to deploy on ext4
   #http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/
@@ -114,6 +116,7 @@ parameter_defaults:
   GlanceBackend: rbd
   GnocchiBackend: rbd
   CinderEnableIscsiBackend: false
+  GnocchiArchivePolicy: 'high'
   BannerText: |
     ******************************************************************
     * This system is for the use of authorized users only. Usage of  *

diff --git a/environments/ssl/enable-tls.yaml b/environments/ssl/enable-tls.yaml
index c8ed2bd..e5ef856 100644 (file)
--- a/environments/ssl/enable-tls.yaml
+++ b/environments/ssl/enable-tls.yaml
@@ -11,7 +11,6 @@
 #   must also be used.
 parameter_defaults:
   # The content of the SSL certificate (without Key) in PEM format.
-  # Mandatory. This parameter must be set by the user.
   # Type: string
   SSLCertificate: |
     The contents of your certificate go here

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 2e39867..2514f80 100644 (file)
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -188,15 +188,16 @@ parameters:
       doing an update which requires removal of specific resources.
       Example format ComputeRemovalPolicies: [{'resource_list': ['0']}]
 
-{% if role.name != 'Compute' %}
   {{role.name}}SchedulerHints:
+    type: json
     description: Optional scheduler hints to pass to nova
-{% else %}
-  NovaComputeSchedulerHints:
-    description: DEPRECATED - use ComputeSchedulerHints instead
-{% endif %}
+    default: {}
+{%- if role.deprecated_param_scheduler_hints is defined %}
+  {{role.deprecated_param_scheduler_hints}}:
     type: json
+    description: DEPRECATED - use {{role.name}}SchedulerHints instead
     default: {}
+{%- endif %}
 
   {{role.name}}Parameters:
     type: json
@@ -229,6 +230,19 @@ parameters:
     description: >
       List of server hostnames to blacklist from any triggered deployments.
 
+{% for role in roles %}
+{%- if role.deprecated_param_scheduler_hints is defined %}
+{%- if not parameter_groups_defined|default(false) %}
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+{%- set parameter_groups_defined = true %}
+{%- endif %}
+    - {{role.deprecated_param_scheduler_hints}}
+{%- endif %}
+{%- endfor %}
+
 conditions:
   add_vips_to_etc_hosts: {equals : [{get_param: AddVipsToEtcHosts}, True]}
 
@@ -525,11 +539,14 @@ resources:
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           NodeIndex: '%index%'
-  {% if role.name != 'Compute' %}
-          {{role.name}}SchedulerHints: {get_param: {{role.name}}SchedulerHints}
-  {% else %}
-          NovaComputeSchedulerHints: {get_param: NovaComputeSchedulerHints}
-  {% endif %}
+          # Note, SchedulerHints must be defined here, not only in the
+          # nested template, as it can contain %index%
+          {{role.name}}SchedulerHints:
+            map_merge:
+{%- if role.deprecated_param_scheduler_hints is defined %}
+              - {get_param: {{role.deprecated_param_scheduler_hints}}}
+{%- endif %}
+              - {get_param: {{role.name}}SchedulerHints}
           ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
           ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]}
           MonitoringSubscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]}

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 5453e65..f58f740 100644 (file)
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -148,12 +148,6 @@ parameters:
     type: json
     description: Optional scheduler hints to pass to nova
     default: {}
-{%- if role.deprecated_param_scheduler_hints is defined %}
-  {{role.deprecated_param_scheduler_hints}}:
-    type: json
-    description: DEPRECATED - use {{role.name}}SchedulerHints instead
-    default: {}
-{%- endif %}
   NodeIndex:
     type: number
     default: 0
@@ -239,7 +233,7 @@ parameter_groups:
   description: Do not use deprecated params, they will be removed.
   parameters:
 {%- for property in role %}
-{%- if property.startswith('deprecated_param_') %}
+{%- if property.startswith('deprecated_param_') and not role[property].endswith('SchedulerHints') %}
   - {{role[property]}}
 {%- endif %}
 {%- endfor %}
@@ -317,12 +311,7 @@ resources:
 {%- endif %}
           - {get_param: {{role.name}}ServerMetadata}
           - {get_param: ServiceMetadataSettings}
-      scheduler_hints:
-        map_merge:
-{%- if role.deprecated_param_scheduler_hints is defined %}
-          - {get_param: {{role.deprecated_param_scheduler_hints}}}
-{%- endif %}
-          - {get_param: {{role.name}}SchedulerHints}
+      scheduler_hints: {get_param: {{role.name}}SchedulerHints}
       deployment_swift_data:
         if:
           - deployment_swift_data_map_unset

diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml
index 6963e84..4e59d53 100644 (file)
--- a/sample-env-generator/ssl.yaml
+++ b/sample-env-generator/ssl.yaml
@@ -91,39 +91,6 @@ environments:
             CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiPublic: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpAdmin: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpInternal: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpPublic: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshAdmin: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshInternal: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshPublic: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpAdmin: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpInternal: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpPublic: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisAdmin: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisInternal: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisPublic: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailConfigAdmin: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigInternal: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigPublic: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailDiscoveryAdmin: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryInternal: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryPublic: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsAdmin: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsInternal: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsPublic: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
             Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'IP_ADDRESS'}
@@ -225,39 +192,6 @@ environments:
             CongressAdmin: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressInternal: {protocol: 'http', port: '1789', host: 'IP_ADDRESS'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
-            ContrailAnalyticsApiAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiPublic: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpAdmin: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpInternal: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpPublic: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshAdmin: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshInternal: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshPublic: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpAdmin: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpInternal: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpPublic: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisAdmin: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisInternal: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisPublic: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailConfigAdmin: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigInternal: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigPublic: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailDiscoveryAdmin: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryInternal: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryPublic: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsAdmin: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsInternal: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsPublic: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
             Ec2ApiAdmin: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiInternal: {protocol: 'http', port: '8788', host: 'IP_ADDRESS'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}
@@ -359,39 +293,6 @@ environments:
             CongressAdmin: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
             CongressInternal: {protocol: 'https', port: '1789', host: 'CLOUDNAME'}
             CongressPublic: {protocol: 'https', port: '13789', host: 'CLOUDNAME'}
-            ContrailAnalyticsApiAdmin: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiInternal: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsApiPublic: {protocol: 'http', port: '8081', host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpAdmin: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpInternal: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorHttpPublic: {protocol: 'http', port: '8089',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshAdmin: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshInternal: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsCollectorSandeshPublic: {protocol: 'http', port: '8086',
-            host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpAdmin: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpInternal: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsHttpPublic: {protocol: 'http', port: '8090', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisAdmin: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisInternal: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailAnalyticsRedisPublic: {protocol: 'http', port: '6379', host: 'IP_ADDRESS'}
-            ContrailConfigAdmin: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigInternal: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailConfigPublic: {protocol: 'http', port: '8082', host: 'IP_ADDRESS'}
-            ContrailDiscoveryAdmin: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryInternal: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailDiscoveryPublic: {protocol: 'http', port: '5998', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpPublic: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsAdmin: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsInternal: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
-            ContrailWebuiHttpsPublic: {protocol: 'http', port: '8143', host: 'IP_ADDRESS'}
             Ec2ApiAdmin: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
             Ec2ApiInternal: {protocol: 'https', port: '8788', host: 'CLOUDNAME'}
             Ec2ApiPublic: {protocol: 'https', port: '13788', host: 'CLOUDNAME'}