From d35de18275874d61634b3faecaa54011110f9b94 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 25 Jan 2016 22:23:31 -0500 Subject: Patches keystone endpoint setup to include Aodh Note this behavior has changed in TripleO post Brahmaputra. The endpoints and services are created in THT rather than hardcoded in tripleoclient. JIRA: APEX-65 Change-Id: Ie595f2778fb509213e2992bf1ef60df82cf22666 Signed-off-by: Tim Rozet --- build/aodh-tripleoclient.patch | 51 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 build/aodh-tripleoclient.patch (limited to 'build/aodh-tripleoclient.patch') diff --git a/build/aodh-tripleoclient.patch b/build/aodh-tripleoclient.patch new file mode 100644 index 00000000..5464ddf5 --- /dev/null +++ b/build/aodh-tripleoclient.patch @@ -0,0 +1,51 @@ +From de3bb2ff31fb19238b164dcc794f6df80f0d0d38 Mon Sep 17 00:00:00 2001 +From: Tim Rozet +Date: Mon, 25 Jan 2016 19:15:38 +0000 +Subject: [PATCH] Adds aodh keystone + +--- + constants.py | 1 + + utils.py | 2 ++ + v1/overcloud_deploy.py | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/constants.py b/constants.py +index 5b0218f..3816622 100644 +--- a/constants.py ++++ b/constants.py +@@ -29,6 +29,7 @@ SERVICE_LIST = { + 'port': '80', + 'path': WEBROOT, + 'admin_path': '%sadmin' % WEBROOT}, ++ 'aodh': {'password_field': 'OVERCLOUD_AODH_PASSWORD'}, + } + + TRIPLEO_HEAT_TEMPLATES = "/usr/share/openstack-tripleo-heat-templates/" +diff --git a/utils.py b/utils.py +index 35591f2..a8eae54 100644 +--- a/utils.py ++++ b/utils.py +@@ -60,6 +60,8 @@ def generate_overcloud_passwords(output_file="tripleo-overcloud-passwords"): + "OVERCLOUD_NOVA_PASSWORD", + "OVERCLOUD_SWIFT_HASH", + "OVERCLOUD_SWIFT_PASSWORD", ++ "OVERCLOUD_AODH_PASSWORD", ++ "OVERCLOUD_AODH_SECRET", + ) + + passwords = dict((p, passutils.generate_password(size=_MIN_PASSWORD_SIZE)) +diff --git a/v1/overcloud_deploy.py b/v1/overcloud_deploy.py +index f4c4892..1a356c4 100644 +--- a/v1/overcloud_deploy.py ++++ b/v1/overcloud_deploy.py +@@ -79,6 +79,7 @@ class DeployOvercloud(command.Command): + parameters['SwiftPassword'] = passwords['OVERCLOUD_SWIFT_PASSWORD'] + parameters['SnmpdReadonlyUserPassword'] = ( + undercloud_ceilometer_snmpd_password) ++ parameters['AodhPassword'] = passwords['OVERCLOUD_AODH_PASSWORD'] + + def _update_paramaters(self, args, network_client, stack): + parameters = constants.PARAMETERS.copy() +-- +1.8.3.1 + -- cgit 1.2.3-korg