Merge "Deprecate hooks in heat-templates"
This commit is contained in:
commit
6b5a7cd2b5
@ -2,6 +2,11 @@
|
|||||||
Software configuration hooks
|
Software configuration hooks
|
||||||
============================
|
============================
|
||||||
|
|
||||||
|
.. warning::
|
||||||
|
All hooks (heat agents) in heat-templates repository are deprecated,
|
||||||
|
please use hooks in `heat-agents https://git.openstack.org/cgit/openstack/heat-agents` instead.
|
||||||
|
Here is document entry for heat-agents: `https://docs.openstack.org/heat-agents/latest/`
|
||||||
|
|
||||||
This directory contains `diskimage-builder <https://github.com/openstack/diskimage-builder>`_
|
This directory contains `diskimage-builder <https://github.com/openstack/diskimage-builder>`_
|
||||||
elements to build an image which contains the software configuration hook
|
elements to build an image which contains the software configuration hook
|
||||||
required to use your preferred configuration method.
|
required to use your preferred configuration method.
|
||||||
|
@ -17,6 +17,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
WORKING_DIR = os.environ.get('HEAT_ANSIBLE_WORKING',
|
WORKING_DIR = os.environ.get('HEAT_ANSIBLE_WORKING',
|
||||||
'/var/lib/heat-config/heat-config-ansible')
|
'/var/lib/heat-config/heat-config-ansible')
|
||||||
@ -32,6 +33,9 @@ def prepare_dir(path):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -17,11 +17,14 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
APPLY_CONFIG_CMD = os.environ.get('HEAT_APPLY_CONFIG_CMD', 'os-apply-config')
|
APPLY_CONFIG_CMD = os.environ.get('HEAT_APPLY_CONFIG_CMD', 'os-apply-config')
|
||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -17,6 +17,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
# Ideally this path would be /var/lib/heat-cfntools/cfn-init-data
|
# Ideally this path would be /var/lib/heat-cfntools/cfn-init-data
|
||||||
@ -30,6 +31,9 @@ CFN_INIT_CMD = os.environ.get('HEAT_CFN_INIT_CMD',
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr):
|
def main(argv=sys.argv, stdin=sys.stdin, stdout=sys.stdout, stderr=sys.stderr):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(stderr)
|
handler = logging.StreamHandler(stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -19,6 +19,7 @@ import shutil
|
|||||||
import six
|
import six
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
DEPLOY_KEYS = ("deploy_server_id",
|
DEPLOY_KEYS = ("deploy_server_id",
|
||||||
"deploy_action",
|
"deploy_action",
|
||||||
@ -59,6 +60,9 @@ def run_subproc(fn, **kwargs):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -18,6 +18,7 @@ import os
|
|||||||
import six
|
import six
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
@ -52,6 +53,9 @@ def docker_arg_map(key, value):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
global log
|
global log
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
|
@ -20,6 +20,7 @@ import os
|
|||||||
import six
|
import six
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
@ -51,6 +52,8 @@ def build_response(deploy_stdout, deploy_stderr, deploy_status_code):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -16,6 +16,7 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
HIERA_DATADIR = os.environ.get('HEAT_PUPPET_HIERA_DATADIR',
|
HIERA_DATADIR = os.environ.get('HEAT_PUPPET_HIERA_DATADIR',
|
||||||
@ -38,6 +39,9 @@ def prepare_dir(path):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -16,6 +16,7 @@ import json
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
def prepare_dir(path):
|
def prepare_dir(path):
|
||||||
@ -24,6 +25,8 @@ def prepare_dir(path):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -20,6 +20,7 @@ import re
|
|||||||
import six
|
import six
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
import warnings
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import docker
|
import docker
|
||||||
@ -165,6 +166,9 @@ def wait_required_containers(client, log,
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv, sys_stdin=sys.stdin, sys_stdout=sys.stdout):
|
def main(argv=sys.argv, sys_stdin=sys.stdin, sys_stdout=sys.stdout):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
(log, deploy_stdout, deploy_stderr) = configure_logging()
|
(log, deploy_stdout, deploy_stderr) = configure_logging()
|
||||||
client = get_client(log)
|
client = get_client(log)
|
||||||
|
|
||||||
|
@ -18,6 +18,7 @@ import os
|
|||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
WORKING_DIR = os.environ.get('HEAT_PUPPET_WORKING',
|
WORKING_DIR = os.environ.get('HEAT_PUPPET_WORKING',
|
||||||
@ -48,6 +49,8 @@ def get_hostname_f(log):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -20,6 +20,7 @@ import sys
|
|||||||
import salt.cli.caller
|
import salt.cli.caller
|
||||||
import salt.config
|
import salt.config
|
||||||
from salt import exceptions
|
from salt import exceptions
|
||||||
|
import warnings
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
|
|
||||||
@ -35,6 +36,9 @@ def prepare_dir(path):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
|
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
@ -17,6 +17,7 @@ import logging
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
|
import warnings
|
||||||
|
|
||||||
WORKING_DIR = os.environ.get('HEAT_SCRIPT_WORKING',
|
WORKING_DIR = os.environ.get('HEAT_SCRIPT_WORKING',
|
||||||
'/var/lib/heat-config/heat-config-script')
|
'/var/lib/heat-config/heat-config-script')
|
||||||
@ -30,6 +31,8 @@ def prepare_dir(path):
|
|||||||
|
|
||||||
|
|
||||||
def main(argv=sys.argv):
|
def main(argv=sys.argv):
|
||||||
|
warnings.warn('This hook is deprecated, please use hooks from heat-agents '
|
||||||
|
'repository instead.', DeprecationWarning)
|
||||||
log = logging.getLogger('heat-config')
|
log = logging.getLogger('heat-config')
|
||||||
handler = logging.StreamHandler(sys.stderr)
|
handler = logging.StreamHandler(sys.stderr)
|
||||||
handler.setFormatter(
|
handler.setFormatter(
|
||||||
|
Loading…
Reference in New Issue
Block a user