build/aodh-tripleoclient.patch

   1 From de3bb2ff31fb19238b164dcc794f6df80f0d0d38 Mon Sep 17 00:00:00 2001
   2 From: Tim Rozet <trozet@redhat.com>
   3 Date: Mon, 25 Jan 2016 19:15:38 +0000
   4 Subject: [PATCH] Adds aodh keystone
   5
   6 ---
   7  constants.py           | 1 +
   8  utils.py               | 2 ++
   9  v1/overcloud_deploy.py | 1 +
  10  3 files changed, 4 insertions(+)
  11
  12 diff --git a/constants.py b/constants.py
  13 index 5b0218f..3816622 100644
  14 --- a/constants.py
  15 +++ b/constants.py
  16 @@ -29,6 +29,7 @@ SERVICE_LIST = {
  17          'port': '80',
  18          'path': WEBROOT,
  19          'admin_path': '%sadmin' % WEBROOT},
  20 +    'aodh': {'password_field': 'OVERCLOUD_AODH_PASSWORD'},
  21  }
  22
  23  TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/"
  24 diff --git a/utils.py b/utils.py
  25 index 35591f2..a8eae54 100644
  26 --- a/utils.py
  27 +++ b/utils.py
  28 @@ -60,6 +60,8 @@ def generate_overcloud_passwords(output_file="tripleo-overcloud-passwords"):
  29          "OVERCLOUD_NOVA_PASSWORD",
  30          "OVERCLOUD_SWIFT_HASH",
  31          "OVERCLOUD_SWIFT_PASSWORD",
  32 +        "OVERCLOUD_AODH_PASSWORD",
  33 +        "OVERCLOUD_AODH_SECRET",
  34      )
  35
  36      passwords = dict((p, passutils.generate_password(size=_MIN_PASSWORD_SIZE))
  37 diff --git a/v1/overcloud_deploy.py b/v1/overcloud_deploy.py
  38 index f4c4892..1a356c4 100644
  39 --- a/v1/overcloud_deploy.py
  40 +++ b/v1/overcloud_deploy.py
  41 @@ -79,6 +79,7 @@ class DeployOvercloud(command.Command):
  42          parameters['SwiftPassword'] = passwords['OVERCLOUD_SWIFT_PASSWORD']
  43          parameters['SnmpdReadonlyUserPassword'] = (
  44              undercloud_ceilometer_snmpd_password)
  45 +        parameters['AodhPassword'] = passwords['OVERCLOUD_AODH_PASSWORD']
  46
  47      def _update_paramaters(self, args, network_client, stack):
  48          parameters = constants.PARAMETERS.copy()
  49 --
  50 1.8.3.1
  51