Remove Heat CloudWatch API
This API was deprecated, and finally removed from Heat in [1]. [1] - https://review.openstack.org/534660 Change-Id: Ie7400b14749591dac70067b67b747418451e75d5
This commit is contained in:
parent
430dee9e2b
commit
80be10d997
@ -954,9 +954,6 @@ Heat Config parameters
|
|||||||
**CONFIG_HEAT_KS_PW**
|
**CONFIG_HEAT_KS_PW**
|
||||||
Password to use for the Orchestration service to authenticate with the Identity service.
|
Password to use for the Orchestration service to authenticate with the Identity service.
|
||||||
|
|
||||||
**CONFIG_HEAT_CLOUDWATCH_INSTALL**
|
|
||||||
Specify 'y' to install the Orchestration CloudWatch API. ['y', 'n']
|
|
||||||
|
|
||||||
**CONFIG_HEAT_CFN_INSTALL**
|
**CONFIG_HEAT_CFN_INSTALL**
|
||||||
Specify 'y' to install the Orchestration CloudFormation API. ['y', 'n']
|
Specify 'y' to install the Orchestration CloudFormation API. ['y', 'n']
|
||||||
|
|
||||||
|
@ -74,18 +74,6 @@ def initConfig(controller):
|
|||||||
"NEED_CONFIRM": True,
|
"NEED_CONFIRM": True,
|
||||||
"CONDITION": False},
|
"CONDITION": False},
|
||||||
|
|
||||||
{"CMD_OPTION": "os-heat-cloudwatch-install",
|
|
||||||
"PROMPT": "Should Packstack install Heat CloudWatch API",
|
|
||||||
"OPTION_LIST": ["y", "n"],
|
|
||||||
"VALIDATORS": [validators.validate_options],
|
|
||||||
"DEFAULT_VALUE": "n",
|
|
||||||
"MASK_INPUT": False,
|
|
||||||
"LOOSE_VALIDATION": False,
|
|
||||||
"CONF_NAME": "CONFIG_HEAT_CLOUDWATCH_INSTALL",
|
|
||||||
"USE_DEFAULT": False,
|
|
||||||
"NEED_CONFIRM": False,
|
|
||||||
"CONDITION": False},
|
|
||||||
|
|
||||||
{"CMD_OPTION": "os-heat-cfn-install",
|
{"CMD_OPTION": "os-heat-cfn-install",
|
||||||
"PROMPT": "Should Packstack install Heat CloudFormation API",
|
"PROMPT": "Should Packstack install Heat CloudFormation API",
|
||||||
"OPTION_LIST": ["y", "n"],
|
"OPTION_LIST": ["y", "n"],
|
||||||
@ -155,10 +143,6 @@ def initSequences(controller):
|
|||||||
'functions': [create_manifest]},
|
'functions': [create_manifest]},
|
||||||
]
|
]
|
||||||
|
|
||||||
if config.get('CONFIG_HEAT_CLOUDWATCH_INSTALL', 'n') == 'y':
|
|
||||||
steps.append(
|
|
||||||
{'title': 'Preparing Heat CloudWatch API entries',
|
|
||||||
'functions': [create_cloudwatch_manifest]})
|
|
||||||
if config.get('CONFIG_HEAT_CFN_INSTALL', 'n') == 'y':
|
if config.get('CONFIG_HEAT_CFN_INSTALL', 'n') == 'y':
|
||||||
steps.append(
|
steps.append(
|
||||||
{'title': 'Preparing Heat CloudFormation API entries',
|
{'title': 'Preparing Heat CloudFormation API entries',
|
||||||
@ -192,18 +176,6 @@ def create_manifest(config, messages):
|
|||||||
config['FIREWALL_HEAT_RULES'] = fw_details
|
config['FIREWALL_HEAT_RULES'] = fw_details
|
||||||
|
|
||||||
|
|
||||||
def create_cloudwatch_manifest(config, messages):
|
|
||||||
fw_details = dict()
|
|
||||||
key = "heat_api_cloudwatch"
|
|
||||||
fw_details.setdefault(key, {})
|
|
||||||
fw_details[key]['host'] = "ALL"
|
|
||||||
fw_details[key]['service_name'] = "heat api cloudwatch"
|
|
||||||
fw_details[key]['chain'] = "INPUT"
|
|
||||||
fw_details[key]['ports'] = ['8003']
|
|
||||||
fw_details[key]['proto'] = "tcp"
|
|
||||||
config['FIREWALL_HEAT_CLOUDWATCH_RULES'] = fw_details
|
|
||||||
|
|
||||||
|
|
||||||
def create_cfn_manifest(config, messages):
|
def create_cfn_manifest(config, messages):
|
||||||
fw_details = dict()
|
fw_details = dict()
|
||||||
key = "heat_cfn"
|
key = "heat_cfn"
|
||||||
|
@ -1,8 +0,0 @@
|
|||||||
class packstack::heat::cloudwatch ()
|
|
||||||
{
|
|
||||||
create_resources(packstack::firewall, hiera('FIREWALL_HEAT_CLOUDWATCH_RULES', {}))
|
|
||||||
|
|
||||||
class { '::heat::api_cloudwatch':
|
|
||||||
workers => hiera('CONFIG_SERVICE_WORKERS'),
|
|
||||||
}
|
|
||||||
}
|
|
@ -138,9 +138,6 @@ if hiera('CONFIG_HEAT_INSTALL') == 'y' {
|
|||||||
include '::packstack::keystone::heat'
|
include '::packstack::keystone::heat'
|
||||||
include '::packstack::heat::rabbitmq'
|
include '::packstack::heat::rabbitmq'
|
||||||
include '::packstack::heat'
|
include '::packstack::heat'
|
||||||
if hiera('CONFIG_HEAT_CLOUDWATCH_INSTALL') == 'y' {
|
|
||||||
include '::packstack::heat::cloudwatch'
|
|
||||||
}
|
|
||||||
if hiera('CONFIG_HEAT_CFN_INSTALL') == 'y' {
|
if hiera('CONFIG_HEAT_CFN_INSTALL') == 'y' {
|
||||||
include '::packstack::heat::cfn'
|
include '::packstack::heat::cfn'
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The Heat CloudWatch API was removed from the project in
|
||||||
|
https://review.openstack.org/534660. Packstack has also removed all
|
||||||
|
references to the API.
|
Loading…
Reference in New Issue
Block a user