Merge "Ceilometer Wsgi Mitaka->Newton upgrades"

3 files changed, 166 insertions, 16 deletions

diff --git a/extraconfig/tasks/major_upgrade_ceilometer_wsgi_mitaka_newton.yaml b/extraconfig/tasks/major_upgrade_ceilometer_wsgi_mitaka_newton.yaml
new file mode 100644
index 00000000..c87e6824
--- /dev/null
+++ b/extraconfig/tasks/major_upgrade_ceilometer_wsgi_mitaka_newton.yaml
@@ -0,0 +1,62 @@
+heat_template_version: 2014-10-16
+
+description: >
+  Software-config for ceilometer configuration under httpd during upgrades
+
+parameters:
+  servers:
+    type: json
+  input_values:
+    type: json
+    description: input values for the software deployments
+resources:
+  CeilometerWsgiMitakaNewtonPreUpgradeConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: puppet
+      config:
+        get_file: mitaka_to_newton_ceilometer_wsgi_upgrade.pp
+
+  CeilometerWsgiMitakaNewtonUpgradeConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: script
+      config:
+        list_join:
+          - ''
+          - - "#!/bin/bash\n\nset -e\n\n"
+            - get_file: pacemaker_common_functions.sh
+            - get_file: major_upgrade_pacemaker_migrations.sh
+            - "disable_standalone_ceilometer_api\n\n"
+
+  CeilometerWsgiMitakaNewtonPostUpgradeConfig:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: script
+      config: |
+        #!/bin/bash
+        set -e
+        /usr/bin/systemctl reload httpd
+
+  CeilometerWsgiMitakaNewtonPreUpgradeDeployment:
+    type: OS::Heat::SoftwareDeploymentGroup
+    properties:
+      name: CeilometerWsgiMitakaNewtonPreUpgradeDeployment
+      servers: {get_param: [servers, Controller]}
+      config: {get_resource: CeilometerWsgiMitakaNewtonPreUpgradeConfig}
+
+  CeilometerWsgiMitakaNewtonUpgradeConfigDeployment:
+    type: OS::Heat::SoftwareDeploymentGroup
+    depends_on: CeilometerWsgiMitakaNewtonPreUpgradeDeployment
+    properties:
+      name: CeilometerWsgiMitakaNewtonUpgradeConfigDeployment
+      servers: {get_param: [servers, Controller]}
+      config: {get_resource: CeilometerWsgiMitakaNewtonUpgradeConfig}
+
+  CeilometerWsgiMitakaNewtonPostUpgradeDeployment:
+    type: OS::Heat::SoftwareDeploymentGroup
+    depends_on: CeilometerWsgiMitakaNewtonUpgradeConfigDeployment
+    properties:
+      name: CeilometerWsgiMitakaNewtonPostUpgradeDeployment
+      servers: {get_param: [servers, Controller]}
+      config: {get_resource: CeilometerWsgiMitakaNewtonPostUpgradeConfig}
diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index df87c93f..7c9083a4 100644
--- a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
+++ b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
@@ -77,7 +77,6 @@ function services_to_migrate {
     openstack-aodh-evaluator-clone
     openstack-aodh-listener-clone
     openstack-aodh-notifier-clone
-    openstack-ceilometer-api-clone
     openstack-ceilometer-central-clone
     openstack-ceilometer-collector-clone
     openstack-ceilometer-notification-clone
@@ -170,21 +169,13 @@ function migrate_full_to_ng_ha {
     fi
 }
 
-# This function will make sure that the rabbitmq ha policies are converted from mitaka to newton
-# In mitaka we had: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"
-# In newton we want: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}"
-# The nr "2" should be CEIL(N/2) where N is the number of Controllers (i.e. rabbit instances)
-# Note that changing an attribute like this makes the rabbitmq resource restart
-function rabbitmq_mitaka_newton_upgrade {
-    if pcs resource show rabbitmq-clone | grep -q -E "Attributes:.*\"ha-mode\":\"all\""; then
-        # Number of controller is obtained by counting how many hostnames we
-        # have in controller_node_names hiera key
-        nr_controllers=$(($(hiera controller_node_names | grep -o "," |wc -l) + 1))
-        nr_queues=$(($nr_controllers / 2 + ($nr_controllers % 2)))
-        if ! [ $nr_queues -gt 0 -a $nr_queues -le $nr_controllers ]; then
-            echo_error "ERROR: The nr. of HA queues during the M/N upgrade is out of range $nr_queues"
-            exit 1
+function disable_standalone_ceilometer_api {
+    if [[ -n $(is_bootstrap_node) ]]; then
+        if [[ -n $(is_pacemaker_managed openstack-ceilometer-api) ]]; then
+            # Disable pacemaker resources for ceilometer-api
+            manage_pacemaker_service disable openstack-ceilometer-api
+            check_resource_pacemaker openstack-ceilometer-api stopped 600
+            pcs resource delete openstack-ceilometer-api --wait=600
         fi
-        pcs resource update rabbitmq set_policy='ha-all ^(?!amq\\.).* {"ha-mode":"exactly","ha-params":'"$nr_queues}" --wait=600
     fi
 }
diff --git a/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp b/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp
new file mode 100644
index 00000000..1c376285
--- /dev/null
+++ b/extraconfig/tasks/mitaka_to_newton_ceilometer_wsgi_upgrade.pp
@@ -0,0 +1,97 @@
+# Copyright 2015 Red Hat, Inc.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+# This puppet manifest is to be used only during a Mitaka->Newton upgrade
+# It configures ceilometer to be run under httpd but it makes sure to not
+# restart any services. This snippet needs to be called before init as a
+# pre upgrade migration.
+
+Service <|
+  tag == 'ceilometer-service'
+|> {
+  hasrestart => true,
+  restart    => '/bin/true',
+  start      => '/bin/true',
+  stop       => '/bin/true',
+}
+
+if $::hostname == downcase(hiera('bootstrap_nodeid')) {
+  $pacemaker_master = true
+  $sync_db = true
+} else {
+  $pacemaker_master = false
+  $sync_db = false
+}
+
+include ::tripleo::packages
+
+
+if str2bool(hiera('mongodb::server::ipv6', false)) {
+  $mongo_node_ips_with_port_prefixed = prefix(hiera('mongodb_node_ips'), '[')
+  $mongo_node_ips_with_port = suffix($mongo_node_ips_with_port_prefixed, ']:27017')
+} else {
+  $mongo_node_ips_with_port = suffix(hiera('mongodb_node_ips'), ':27017')
+}
+$mongodb_replset = hiera('mongodb::server::replset')
+$mongo_node_string = join($mongo_node_ips_with_port, ',')
+$database_connection = "mongodb://${mongo_node_string}/ceilometer?replicaSet=${mongodb_replset}"
+
+include ::ceilometer
+
+class {'::ceilometer::db':
+  database_connection => $database_connection,
+}
+
+if $sync_db  {
+  include ::ceilometer::db::sync
+}
+
+include ::ceilometer::config
+
+class { '::ceilometer::api':
+  enabled           => true,
+  service_name      => 'httpd',
+  keystone_password => hiera('ceilometer::keystone::auth::password'),
+  identity_uri      => hiera('ceilometer::keystone::authtoken::auth_url'),
+  auth_uri          => hiera('ceilometer::keystone::authtoken::auth_uri'),
+  keystone_tenant   => hiera('ceilometer::keystone::authtoken::project_name'),
+}
+
+class { '::apache' :
+  service_enable  => false,
+  service_manage  => true,
+  service_restart => '/bin/true',
+  purge_configs   => false,
+  purge_vhost_dir => false,
+}
+
+# To ensure existing ports are not overridden
+class { '::aodh::wsgi::apache':
+  servername => $::hostname,
+  ssl        => false,
+}
+class { '::gnocchi::wsgi::apache':
+  servername => $::hostname,
+  ssl        => false,
+}
+
+class { '::keystone::wsgi::apache':
+  servername => $::hostname,
+  ssl        => false,
+}
+class { '::ceilometer::wsgi::apache':
+  servername => $::hostname,
+  ssl        => false,
+}