Merge "Disable xinetd class when creating swift-storage puppet configuration" into...

diff --git a/ci/environments/scenario001-multinode-containers.yaml b/ci/environments/scenario001-multinode-containers.yaml
index 8918266..df12bc5 100644 (file)
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@@ -101,7 +101,6 @@ parameter_defaults:
     devices:
       - /dev/loop3
     journal_size: 512
-    journal_collocation: true
     osd_scenario: collocated
   CephAnsibleExtraConfig:
     ceph_conf_overrides:

diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml
index 45f939c..90b2db3 100644 (file)
--- a/docker/services/ceph-ansible/ceph-mon.yaml
+++ b/docker/services/ceph-ansible/ceph-mon.yaml
@@ -83,4 +83,3 @@ outputs:
             - {get_attr: [CephBase, role_data, config_settings, ceph_common_ansible_vars]}
             - monitor_secret: {get_param: CephMonKey}
               admin_secret: {get_param: CephAdminKey}
-              monitor_interface: br_ex

diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml
index a441f5c..de55924 100644 (file)
--- a/docker/services/ceph-ansible/ceph-osd.yaml
+++ b/docker/services/ceph-ansible/ceph-osd.yaml
@@ -37,7 +37,6 @@ parameters:
       devices:
       - /dev/vdb
       journal_size: 512
-      journal_collocation: true
       osd_scenario: collocated
 
 resources:

diff --git a/environments/services/heat-api-cloudwatch.yaml b/environments/services/heat-api-cloudwatch.yaml
new file mode 100644 (file)
index 0000000..ce22a91
--- /dev/null
+++ b/environments/services/heat-api-cloudwatch.yaml
@@ -0,0 +1,2 @@
+resource_registry:
+  OS::TripleO::Services::HeatApiCloudwatch: ../../puppet/services/heat-api-cloudwatch.yaml

diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml
index e19ccd8..dfb0e91 100644 (file)
--- a/network/service_net_map.j2.yaml
+++ b/network/service_net_map.j2.yaml
@@ -103,31 +103,12 @@ parameters:
                  internal use only, this will be removed in future.
     type: json
 
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal_api network.
+{%- for network in networks %}
+  {{network.name}}NetName:
+    default: {{network.name_lower}}
+    description: The name of the {{network.name_lower}} network.
     type: string
-  ExternalNetName:
-    default: external
-    description: The name of the external network.
-    type: string
-  ManagementNetName:
-    default: management
-    description: The name of the management network.
-    type: string
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageMgmtNetName:
-    default: storage_mgmt
-    description: The name of the storage_mgmt network.
-    type: string
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
-    type: string
-
+{%- endfor %}
 
 parameter_groups:
 - label: deprecated
@@ -145,12 +126,9 @@ resources:
           - map_replace:
              - {get_param: ServiceNetMapDefaults}
              - values:
-                 external: {get_param: ExternalNetName}
-                 internal_api: {get_param: InternalApiNetName}
-                 storage: {get_param: StorageNetName}
-                 storage_mgmt: {get_param: StorageMgmtNetName}
-                 tenant: {get_param: TenantNetName}
-                 management: {get_param: ManagementNetName}
+{%- for network in networks %}
+                 {{network.name_lower}}: {get_param: {{network.name}}NetName}
+{%- endfor %}
           - map_replace:
              - {get_param: ServiceNetMap}
              - keys: {get_param: ServiceNetMapDeprecatedMapping}

diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index e402f12..3ee7721 100644 (file)
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -133,7 +133,7 @@ resource_registry:
   OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry-disabled.yaml
   OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml
   OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml
-  OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml
+  OS::TripleO::Services::HeatApiCloudwatch: puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
   OS::TripleO::Services::HeatEngine: puppet/services/heat-engine.yaml
   OS::TripleO::Services::Kernel: puppet/services/kernel.yaml
   OS::TripleO::Services::MySQL: puppet/services/database/mysql.yaml

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.j2.yaml
similarity index 92%
rename from puppet/all-nodes-config.yaml
rename to puppet/all-nodes-config.j2.yaml
index 37c1d4e..bdd2bcf 100644 (file)
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.j2.yaml
@@ -2,14 +2,10 @@ heat_template_version: pike
 description: 'All Nodes Config for Puppet'
 
 parameters:
-  cloud_name_external:
-    type: string
-  cloud_name_internal_api:
-    type: string
-  cloud_name_storage:
-    type: string
-  cloud_name_storage_mgmt:
+{%- for network in networks if network.vip|default(false) %}
+  cloud_name_{{network.name_lower}}:
     type: string
+{%- endfor %}
   cloud_name_ctlplane:
     type: string
   enabled_services:
@@ -70,30 +66,12 @@ parameters:
     type: boolean
     default: false
 
-  InternalApiNetName:
-    default: internal_api
-    description: The name of the internal_api network.
-    type: string
-  ExternalNetName:
-    default: external
-    description: The name of the external network.
-    type: string
-  ManagementNetName:
-    default: management
-    description: The name of the management network.
-    type: string
-  StorageNetName:
-    default: storage
-    description: The name of the storage network.
-    type: string
-  StorageMgmtNetName:
-    default: storage_mgmt
-    description: The name of the storage_mgmt network.
-    type: string
-  TenantNetName:
-    default: tenant
-    description: The name of the tenant network.
+{%- for network in networks %}
+  {{network.name}}NetName:
+    default: {{network.name_lower}}
+    description: The name of the {{network.name_lower}} network.
     type: string
+{%- endfor %}
 
 
 resources:

diff --git a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
new file mode 100644 (file)
index 0000000..f793571
--- /dev/null
+++ b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml
@@ -0,0 +1,48 @@
+heat_template_version: pike
+
+description: >
+  Openstack Heat CloudWatch API service, disabled by default since Pike
+
+parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+outputs:
+  role_data:
+    description: Role data for the disabled Heat CloudWatch API
+    value:
+      service_name:  heat_api_cloudwatch_disabled
+      upgrade_tasks:
+        - name: Check if heat_api_cloudwatch is deployed
+          command: systemctl is-enabled openstack-heat-api-cloudwatch
+          tags: step1
+          ignore_errors: True
+          register: heat_api_cloudwatch_enabled
+        - name: Stop and disable heat_api_cloudwatch service (pre-upgrade not under httpd)
+          tags: step1
+          when: heat_api_cloudwatch_enabled.rc == 0
+          service: name=openstack-heat-api-cloudwatch state=stopped enabled=no

diff --git a/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml b/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml
new file mode 100644 (file)
index 0000000..5c732c0
--- /dev/null
+++ b/releasenotes/notes/disable-heat-api-cloudwatch-d5a471da22472bde.yaml
@@ -0,0 +1,15 @@
+---
+upgrade:
+  - |
+    The Heat API Cloudwatch API is deprecated in Pike and so it removed
+    by default during the Ocata to Pike upgrade. If you wish to keep this
+    service then you should use the environments/heat-api-cloudwatch.yaml
+    environment file in the tripleo-heat-templates during the upgrade (note
+    that this is migrated to running under httpd, if you do decide to keep
+    this service on Pike).
+deprecations:
+  - |
+    The Heat API Cloudwatch API is deprecated in Pike and so it is now not
+    deployed by default. You can override this behaviour with the
+    environments/heat-api-cloudwatch.yaml environment file in the
+    tripleo-heat-templates.