diff options
author | Jun Hu <jh245g@att.com> | 2017-09-05 13:51:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-09-05 13:51:35 +0000 |
commit | 4ee07eaeb5fa3c88c83e288215ad5c6a70bed199 (patch) | |
tree | c93286e461eaaad19ccbbe91dc929a48c52eb85c | |
parent | 7234ff7880279771bbfb1e4db85bfced4faec7b5 (diff) | |
parent | 06bdb6a3ec916137534e627a275141c8c587dff7 (diff) |
Merge "Cloudify blueprint for provisioning ONAP"
-rw-r--r-- | cloudify/scripts/onap/configure_docker_secret_workaround.py | 40 | ||||
-rw-r--r-- | cloudify/scripts/onap/create_init_pod.py | 65 | ||||
-rw-r--r-- | cloudify/scripts/onap/create_namespace.py | 101 | ||||
-rw-r--r-- | cloudify/scripts/onap/create_resources_services.py | 131 | ||||
-rw-r--r-- | cloudify/scripts/onap/delete_init_pod.py | 64 | ||||
-rw-r--r-- | cloudify/scripts/onap/delete_namespace.py | 101 | ||||
-rw-r--r-- | cloudify/scripts/onap/delete_resources_services.py | 132 | ||||
-rw-r--r-- | cloudify/scripts/onap/patch_definitions.py | 1 | ||||
-rw-r--r-- | cloudify/scripts/onap/provision_definitions.py | 1 | ||||
-rw-r--r-- | cloudify/scripts/onap/read_definitions.py | 1 | ||||
-rw-r--r-- | cloudify/types/onap.yaml | 61 | ||||
-rw-r--r-- | onap-blueprint.yaml | 182 |
12 files changed, 775 insertions, 105 deletions
diff --git a/cloudify/scripts/onap/configure_docker_secret_workaround.py b/cloudify/scripts/onap/configure_docker_secret_workaround.py new file mode 100644 index 0000000000..6e9deff059 --- /dev/null +++ b/cloudify/scripts/onap/configure_docker_secret_workaround.py @@ -0,0 +1,40 @@ +from fabric.api import run + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +def _retrieve_namespace(): + namespace = ctx.node.properties.get( + 'namespace', + ctx.node.properties + .get('options', {}) + .get('namespace', None) + ) + + if not namespace: + raise NonRecoverableError( + 'Namespace is not defined (node={})'.format(ctx.node.name) + ) + + return namespace + + +def configure_secret(): + namespace = _retrieve_namespace() + ctx.logger.info( + 'Configuring docker secrets for namespace: {0}'.format(namespace) + ) + + command = 'kubectl create secret ' \ + 'docker-registry onap-docker-registry-key ' \ + '--docker-server=nexus3.onap.org:10001 ' \ + '--docker-username=docker ' \ + '--docker-password=docker ' \ + '--docker-email=email@email.com ' \ + '--namespace={0}'.format(namespace) + + ctx.logger.info('Command "{0}" will be executed'.format(command)) + run(command) + + ctx.logger.info('Docker secrets configured successfully') diff --git a/cloudify/scripts/onap/create_init_pod.py b/cloudify/scripts/onap/create_init_pod.py new file mode 100644 index 0000000000..c82172d15f --- /dev/null +++ b/cloudify/scripts/onap/create_init_pod.py @@ -0,0 +1,65 @@ +import pip + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +SERVICES_FILE_PARTS_SEPARATOR = '---' + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + import yaml + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin + + +def _retrieve_path(): + return ctx.node.properties.get('init_pod', None) + + +def _save_deployment_result(key): + result = ctx.instance.runtime_properties['kubernetes'] + ctx.instance.runtime_properties[key] = result + ctx.instance.runtime_properties['kubernetes'] = {} + + +def _do_create_init_pod(kubernetes_plugin, yaml): + ctx.logger.info('Creating init pod') + init_pod_file_path = _retrieve_path() + + if not init_pod_file_path: + raise NonRecoverableError('Init pod file is not defined.') + + temp_file_path = ctx.download_resource_and_render( + init_pod_file_path + ) + + with open(temp_file_path) as temp_file: + init_pod_file_content = temp_file.read() + init_pod_yaml_content = yaml.load(init_pod_file_content) + + kubernetes_plugin.resource_create(definition=init_pod_yaml_content) + _save_deployment_result('init_pod') + + ctx.logger.info('Init pod created successfully') + + +if __name__ == '__main__': + yaml, kubernetes_plugin = _import_or_install() + + _do_create_init_pod(kubernetes_plugin, yaml) + diff --git a/cloudify/scripts/onap/create_namespace.py b/cloudify/scripts/onap/create_namespace.py new file mode 100644 index 0000000000..c0f1f19680 --- /dev/null +++ b/cloudify/scripts/onap/create_namespace.py @@ -0,0 +1,101 @@ +import pip + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + import yaml + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin + + +def _retrieve_namespace(): + namespace = ctx.node.properties.get( + 'namespace', + ctx.node.properties + .get('options', {}) + .get('namespace', None) + ) + + if not namespace: + raise NonRecoverableError( + 'Namespace is not defined (node={})'.format(ctx.node.name) + ) + + return namespace + + +def _prepare_namespace_resource_template(name): + return { + 'definition': { + 'apiVersion': 'v1', + 'kind': 'Namespace', + 'metadata': { + 'name': name, + 'labels': { + 'name': name + }, + }, + }, + 'api_mapping': { + 'create': { + 'api': 'CoreV1Api', + 'method': 'create_namespace', + 'payload': 'V1Namespace' + }, + 'read': { + 'api': 'CoreV1Api', + 'method': 'read_namespace', + }, + 'delete': { + 'api': 'CoreV1Api', + 'method': 'delete_namespace', + 'payload': 'V1DeleteOptions' + } + } + } + + +def _save_deployment_result(key): + result = ctx.instance.runtime_properties['kubernetes'] + ctx.instance.runtime_properties[key] = result + ctx.instance.runtime_properties['kubernetes'] = {} + + +def _do_create_namespace(kubernetes_plugin): + namespace = _retrieve_namespace() + ctx.logger.info('Creating namespace: {0}'.format(namespace)) + + namespace_resource_template = _prepare_namespace_resource_template( + namespace + ) + + ctx.logger.debug( + 'Kubernetes object which will be deployed: {0}' + .format(namespace_resource_template) + ) + + kubernetes_plugin.custom_resource_create(**namespace_resource_template) + _save_deployment_result('namespace') + ctx.logger.info('Namespace created successfully') + + +if __name__ == '__main__': + _, kubernetes_plugin = _import_or_install() + + _do_create_namespace(kubernetes_plugin) diff --git a/cloudify/scripts/onap/create_resources_services.py b/cloudify/scripts/onap/create_resources_services.py new file mode 100644 index 0000000000..8548e29b70 --- /dev/null +++ b/cloudify/scripts/onap/create_resources_services.py @@ -0,0 +1,131 @@ +import pip + +from cloudify import ctx + + +SERVICES_FILE_PARTS_SEPARATOR = '---' + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + try: + import jinja2 + except ImportError: + pip.main(["install", "jinja2"]) + + import yaml + import jinja2 + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin, jinja2 + + +def _init_jinja(jinja2): + return jinja2.Environment( + loader=jinja2.BaseLoader() + ) + + +def _render_template(jinja_env, template_content, values): + template_content = template_content.replace('.Values', 'Values') + + template = jinja_env.from_string(template_content) + rendered_template = template.render(Values=values) + return rendered_template + + +def _retrieve_resources_paths(): + return ctx.node.properties.get('resources', []) + + +def _retrieve_services_paths(): + return ctx.node.properties.get('services', None) + + +def _retrieve_values(yaml): + values_file_path = ctx.node.properties.get('values', None) + + if values_file_path: + return yaml.load(ctx.get_resource(values_file_path)) + + ctx.logger.warn('Values file not found') + + +def _save_deployment_result(key): + result = ctx.instance.runtime_properties['kubernetes'] + ctx.instance.runtime_properties[key] = result + ctx.instance.runtime_properties['kubernetes'] = {} + + +def _do_create_resources(kubernetes_plugin, yaml, jinja_env, values): + for path in _retrieve_resources_paths(): + ctx.logger.info('Creating resource defined in: {0}'.format(path)) + + template_content = ctx.get_resource(path) + yaml_content = _render_template( + jinja_env, + template_content, + values + ) + content = yaml.load(yaml_content) + + kubernetes_plugin.resource_create(definition=content) + _save_deployment_result( + 'resource_{0}'.format(content['metadata']['name']) + ) + + ctx.logger.info('Resources created successfully') + + +def _do_create_services(kubernetes_plugin, yaml, jinja_env, values): + ctx.logger.info('Creating services') + services_file_path = _retrieve_services_paths() + + if not services_file_path: + ctx.logger.warn( + 'Service file is not defined. Skipping services provisioning !' + ) + + return + + template_content = ctx.get_resource(services_file_path) + yaml_content = _render_template( + jinja_env, + template_content, + values + ) + + yaml_content_parts = \ + yaml_content.split(SERVICES_FILE_PARTS_SEPARATOR) + + for yaml_content_part in yaml_content_parts: + content = yaml.load(yaml_content_part) + + kubernetes_plugin.resource_create(definition=content) + _save_deployment_result( + 'service_{0}'.format(content['metadata']['name']) + ) + + ctx.logger.info('Services created successfully') + + +if __name__ == '__main__': + yaml, kubernetes_plugin, jinja2 = _import_or_install() + jinja_env = _init_jinja(jinja2) + values = _retrieve_values(yaml) + + _do_create_resources(kubernetes_plugin, yaml, jinja_env, values) + _do_create_services(kubernetes_plugin, yaml, jinja_env, values) + diff --git a/cloudify/scripts/onap/delete_init_pod.py b/cloudify/scripts/onap/delete_init_pod.py new file mode 100644 index 0000000000..1da805b959 --- /dev/null +++ b/cloudify/scripts/onap/delete_init_pod.py @@ -0,0 +1,64 @@ +import pip + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +SERVICES_FILE_PARTS_SEPARATOR = '---' + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + import yaml + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin + + +def _retrieve_path(): + return ctx.node.properties.get('init_pod', None) + + +def _set_deployment_result(key): + result = ctx.instance.runtime_properties.pop(key) + ctx.instance.runtime_properties['kubernetes'] = result + + +def _do_delete_init_pod(kubernetes_plugin, yaml): + ctx.logger.info('Deleting init pod') + init_pod_file_path = _retrieve_path() + + if not init_pod_file_path: + raise NonRecoverableError('Init pod file is not defined.') + + temp_file_path = ctx.download_resource_and_render( + init_pod_file_path + ) + + with open(temp_file_path) as temp_file: + init_pod_file_content = temp_file.read() + init_pod_yaml_content = yaml.load(init_pod_file_content) + + _set_deployment_result('init_pod') + kubernetes_plugin.resource_delete(definition=init_pod_yaml_content) + + ctx.logger.info('Init pod deleted successfully') + + +if __name__ == '__main__': + yaml, kubernetes_plugin = _import_or_install() + + _do_delete_init_pod(kubernetes_plugin, yaml) + diff --git a/cloudify/scripts/onap/delete_namespace.py b/cloudify/scripts/onap/delete_namespace.py new file mode 100644 index 0000000000..6973e59944 --- /dev/null +++ b/cloudify/scripts/onap/delete_namespace.py @@ -0,0 +1,101 @@ +import pip + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + import yaml + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin + + +def _retrieve_namespace(): + namespace = ctx.node.properties.get( + 'namespace', + ctx.node.properties + .get('options', {}) + .get('namespace', None) + ) + + if not namespace: + raise NonRecoverableError( + 'Namespace is not defined (node={})'.format(ctx.node.name) + ) + + return namespace + + +def _prepare_namespace_resource_template(name): + return { + 'definition': { + 'apiVersion': 'v1', + 'kind': 'Namespace', + 'metadata': { + 'name': name, + 'labels': { + 'name': name + }, + }, + }, + 'api_mapping': { + 'create': { + 'api': 'CoreV1Api', + 'method': 'create_namespace', + 'payload': 'V1Namespace' + }, + 'read': { + 'api': 'CoreV1Api', + 'method': 'read_namespace', + }, + 'delete': { + 'api': 'CoreV1Api', + 'method': 'delete_namespace', + 'payload': 'V1DeleteOptions' + } + } + } + + +def _set_deployment_result(key): + result = ctx.instance.runtime_properties.pop(key) + ctx.instance.runtime_properties['kubernetes'] = result + + +def _do_delete_namespace(kubernetes_plugin): + namespace = _retrieve_namespace() + ctx.logger.info('Deleting namespace: {0}'.format(namespace)) + + namespace_resource_template = _prepare_namespace_resource_template( + namespace + ) + + ctx.logger.debug( + 'Kubernetes object which will be deleted: {0}' + .format(namespace_resource_template) + ) + + _set_deployment_result('namespace') + kubernetes_plugin.custom_resource_delete(**namespace_resource_template) + ctx.logger.info('Namespace deleted successfully') + + +if __name__ == '__main__': + _, kubernetes_plugin = _import_or_install() + + _do_delete_namespace(kubernetes_plugin) + diff --git a/cloudify/scripts/onap/delete_resources_services.py b/cloudify/scripts/onap/delete_resources_services.py new file mode 100644 index 0000000000..305a7484bd --- /dev/null +++ b/cloudify/scripts/onap/delete_resources_services.py @@ -0,0 +1,132 @@ +import pip + +from cloudify import ctx +from cloudify.exceptions import NonRecoverableError + + +SERVICES_FILE_PARTS_SEPARATOR = '---' + + +def _import_or_install(): + try: + import yaml + except ImportError: + pip.main(["install", "pyaml"]) + + try: + import cloudify_kubernetes.tasks as kubernetes_plugin + except ImportError: + pip.main([ + "install", + "https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/archive/1.2.1rc1.zip" + ]) + + try: + import jinja2 + except ImportError: + pip.main(["install", "jinja2"]) + + import yaml + import jinja2 + import cloudify_kubernetes.tasks as kubernetes_plugin + + return yaml, kubernetes_plugin, jinja2 + + +def _init_jinja(jinja2): + return jinja2.Environment( + loader=jinja2.BaseLoader() + ) + + +def _render_template(jinja_env, template_content, values): + template_content = template_content.replace('.Values', 'Values') + + template = jinja_env.from_string(template_content) + rendered_template = template.render(Values=values) + return rendered_template + + +def _retrieve_resources_paths(): + return ctx.node.properties.get('resources', []) + + +def _retrieve_services_paths(): + return ctx.node.properties.get('services', None) + + +def _retrieve_values(yaml): + values_file_path = ctx.node.properties.get('values', None) + + if values_file_path: + return yaml.load(ctx.get_resource(values_file_path)) + + ctx.logger.warn('Values file not found') + + +def _set_deployment_result(key): + result = ctx.instance.runtime_properties.pop(key) + ctx.instance.runtime_properties['kubernetes'] = result + + +def _do_delete_resources(kubernetes_plugin, yaml, jinja_env, values): + for path in _retrieve_resources_paths(): + ctx.logger.info('Deleting resource defined in: {0}'.format(path)) + + template_content = ctx.get_resource(path) + yaml_content = _render_template( + jinja_env, + template_content, + values + ) + content = yaml.load(yaml_content) + + _set_deployment_result( + 'resource_{0}'.format(content['metadata']['name']) + ) + kubernetes_plugin.resource_delete(definition=content) + + ctx.logger.info('Resources deleted successfully') + + +def _do_delete_services(kubernetes_plugin, yaml, jinja_env, values): + ctx.logger.info('Deleting services') + services_file_path = _retrieve_services_paths() + + if not services_file_path: + ctx.logger.warn( + 'Service file is not defined. Skipping services provisioning !' + ) + + return + + template_content = ctx.get_resource(services_file_path) + yaml_content = _render_template( + jinja_env, + template_content, + values + ) + + yaml_content_parts = \ + yaml_content.split(SERVICES_FILE_PARTS_SEPARATOR) + + for yaml_content_part in yaml_content_parts: + content = yaml.load(yaml_content_part) + + _set_deployment_result( + 'service_{0}'.format(content['metadata']['name']) + ) + kubernetes_plugin.resource_delete(definition=content) + + ctx.logger.info('Services deleted successfully') + + +if __name__ == '__main__': + yaml, kubernetes_plugin, jinja2 = _import_or_install() + jinja_env = _init_jinja(jinja2) + values = _retrieve_values(yaml) + + _do_delete_services(kubernetes_plugin, yaml, jinja_env, values) + _do_delete_resources(kubernetes_plugin, yaml, jinja_env, values) + + diff --git a/cloudify/scripts/onap/patch_definitions.py b/cloudify/scripts/onap/patch_definitions.py deleted file mode 100644 index d43e921593..0000000000 --- a/cloudify/scripts/onap/patch_definitions.py +++ /dev/null @@ -1 +0,0 @@ -from cloudify import ctx diff --git a/cloudify/scripts/onap/provision_definitions.py b/cloudify/scripts/onap/provision_definitions.py deleted file mode 100644 index d43e921593..0000000000 --- a/cloudify/scripts/onap/provision_definitions.py +++ /dev/null @@ -1 +0,0 @@ -from cloudify import ctx diff --git a/cloudify/scripts/onap/read_definitions.py b/cloudify/scripts/onap/read_definitions.py deleted file mode 100644 index d43e921593..0000000000 --- a/cloudify/scripts/onap/read_definitions.py +++ /dev/null @@ -1 +0,0 @@ -from cloudify import ctx diff --git a/cloudify/types/onap.yaml b/cloudify/types/onap.yaml index 20ef33f2f3..7e9b83425e 100644 --- a/cloudify/types/onap.yaml +++ b/cloudify/types/onap.yaml @@ -1,4 +1,33 @@ node_types: + cloudify.onap.kubernetes.Environment: + derived_from: cloudify.nodes.Root + properties: + namespace: + type: string + init_pod: + type: string + description: > + Path to init pod YAML file + options: + description: > + For compatibility with kubernetes plugin. + To be removed in the future. + default: {} + interfaces: + cloudify.interfaces.lifecycle: + create: + implementation: cloudify/scripts/onap/create_namespace.py + executor: central_deployment_agent + start: + implementation: cloudify/scripts/onap/create_init_pod.py + executor: central_deployment_agent + stop: + implementation: cloudify/scripts/onap/delete_init_pod.py + executor: central_deployment_agent + delete: + implementation: cloudify/scripts/onap/delete_namespace.py + executor: central_deployment_agent + cloudify.onap.kubernetes.App: derived_from: cloudify.nodes.Root properties: @@ -6,6 +35,11 @@ node_types: type: string description: > Name of ONAP app + values: + type: string + description: > + Paths (relative, blueprint prespective) to values.yaml file + required: false resources: description: > List of paths (relative, blueprint prespective) @@ -21,14 +55,35 @@ node_types: description: > Parameters required to create kubernetes resources for each app default: {} + options: + description: > + For compatibility with kubernetes plugin. + To be removed in the future. + default: {} interfaces: cloudify.interfaces.lifecycle: create: - implementation: cloudify/scripts/onap/read_definitions.py + implementation: cloudify/scripts/onap/create_namespace.py executor: central_deployment_agent configure: - implementation: cloudify/scripts/onap/patch_definitions.py + implementation: fabric.fabric_plugin.tasks.run_task executor: central_deployment_agent + inputs: + tasks_file: + default: cloudify/scripts/onap/configure_docker_secret_workaround.py + task_name: + default: configure_secret + fabric_env: + default: + host_string: { get_secret: kubernetes_master_ip } + user: { get_secret: agent_user } + key: { get_secret: agent_key_private } start: - implementation: cloudify/scripts/onap/provision_definitions.py + implementation: cloudify/scripts/onap/create_resources_services.py + executor: central_deployment_agent + stop: + implementation: cloudify/scripts/onap/delete_resources_services.py + executor: central_deployment_agent + delete: + implementation: cloudify/scripts/onap/delete_namespace.py executor: central_deployment_agent diff --git a/onap-blueprint.yaml b/onap-blueprint.yaml index 50ac29b997..f12d6ac02e 100644 --- a/onap-blueprint.yaml +++ b/onap-blueprint.yaml @@ -8,8 +8,10 @@ description: > imports: - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-manager/4.1/resources/rest-service/cloudify/types/types.yaml - # Plugin required: https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases/download/1.2.0/cloudify_kubernetes_plugin-1.2.0-py27-none-linux_x86_64-centos-Core.wgn - - https://raw.githubusercontent.com/cloudify-incubator/cloudify-kubernetes-plugin/1.2.0/plugin.yaml + # Plugin required: https://github.com/cloudify-incubator/cloudify-kubernetes-plugin/releases/download/1.2.1rc1/cloudify_kubernetes_plugin-1.2.1rc1-py27-none-linux_x86_64-centos-Core.wgn + - https://raw.githubusercontent.com/cloudify-incubator/cloudify-kubernetes-plugin/1.2.1rc1/plugin.yaml + # Plugin required: http://repository.cloudifysource.org/cloudify/wagons/cloudify-fabric-plugin/1.4.2/cloudify_fabric_plugin-1.4.2-py27-none-linux_x86_64-centos-Core.wgn + - http://www.getcloudify.org/spec/fabric-plugin/1.4.2/plugin.yaml - cloudify/types/onap.yaml inputs: @@ -17,46 +19,16 @@ inputs: description: > File content of kubernetes master YAML configuration - apps: - description: > - List of ONAP apps names to be deployed. - Default empty array (deploy all available apps). - default: [] - namespace_prefix: type: string description: > Kubernetes namespace name prefix which will be uese for all ONAP apps default: onap - docker_registry: - type: string - default: regsecret - - docker_server: - type: string - default: nexus3.onap.org:10001 - - docker_username: - type: string - default: docker - - docker_password: - type: string - default: docker - - docker_email: - type: string - default: email@email.com - dsl_definitions: - inputs: &app_inputs - namespace_prefix: { get_input: namespace_prefix } - docker_registry: { get_input: docker_registry } - docker_server: { get_input: docker_server } - docker_username: { get_input: docker_username } - docker_password: { get_input: docker_password } - docker_email: { get_input: docker_email } + options: &app_options + namespace: + concat: [{ get_input: namespace_prefix }, '-', { get_property: [SELF, name] }] node_templates: kubernetes_master: @@ -65,12 +37,13 @@ node_templates: configuration: file_content: { get_input: kubernetes_configuration_file_content } - init_pod: - type: cloudify.kubernetes.resources.Pod + onap_environment: + type: cloudify.onap.kubernetes.Environment properties: - definition: - file: - resource_path: kubernetes/config/pod-config-init.yaml + namespace: { get_input: namespace_prefix } + init_pod: kubernetes/config/pod-config-init.yaml + options: + namespace: { get_input: namespace_prefix } relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master @@ -79,162 +52,173 @@ node_templates: type: cloudify.onap.kubernetes.App properties: name: mso + values: kubernetes/mso/values.yaml resources: - - kubernetes/mso/templates/mso-deployment.yaml - - kubernetes/mso/templates/db-deployment.yaml + - kubernetes/mso/templates/mso-deployment.yaml + - kubernetes/mso/templates/db-deployment.yaml services: kubernetes/mso/templates/all-services.yaml - inputs: *app_inputs + services: _temp/services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment message_router_app: type: cloudify.onap.kubernetes.App properties: name: message-router + values: kubernetes/message-router/values.yaml resources: - kubernetes/message-router/templates/message-router-zookeeper.yaml - kubernetes/message-router/templates/message-router-dmaap.yaml - kubernetes/message-router/templates/message-router-kafka.yaml services: kubernetes/message-router/templates/all-services.yaml - inputs: *app_inputs + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment sdc_app: type: cloudify.onap.kubernetes.App properties: name: sdc + values: kubernetes/sdc/values.yaml resources: - - kubernetes/sdc/sdc-es.yaml - - kubernetes/sdc/sdc-fe.yaml - - kubernetes/sdc/sdc-kb.yaml - - kubernetes/sdc/sdc-cs.yaml - - kubernetes/sdc/sdc-be.yaml - services: kubernetes/sdc/all-services.yaml - inputs: *app_inputs + - kubernetes/sdc/templates/sdc-es.yaml + - kubernetes/sdc/templates/sdc-fe.yaml + - kubernetes/sdc/templates/sdc-kb.yaml + - kubernetes/sdc/templates/sdc-cs.yaml + - kubernetes/sdc/templates/sdc-be.yaml + services: kubernetes/sdc/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment aai_app: type: cloudify.onap.kubernetes.App properties: name: aai + values: kubernetes/aai/values.yaml resources: - - kubernetes/aai/aai-deployment.yaml - - kubernetes/aai/modelloader-deployment.yaml - - kubernetes/aai/hbase-deployment.yaml - services: kubernetes/aai/all-services.yaml - inputs: *app_inputs + - kubernetes/aai/templates/aai-deployment.yaml + - kubernetes/aai/templates/modelloader-deployment.yaml + - kubernetes/aai/templates/hbase-deployment.yaml + services: kubernetes/aai/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment robot_app: type: cloudify.onap.kubernetes.App properties: name: robot + values: kubernetes/robot/values.yaml resources: - - kubernetes/robot/robot-deployment.yaml - services: kubernetes/robot/all-services.yaml - inputs: *app_inputs + - kubernetes/robot/templates/robot-deployment.yaml + services: kubernetes/robot/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment vid_app: type: cloudify.onap.kubernetes.App properties: name: vid + values: kubernetes/vid/values.yaml resources: - - kubernetes/vid/vid-mariadb-deployment.yaml - - kubernetes/vid/vid-server-deployment.yaml - services: kubernetes/vid/all-services.yaml - inputs: *app_inputs + - kubernetes/templates/vid-mariadb-deployment.yaml + - kubernetes/templates/vid-server-deployment.yaml + services: kubernetes/vid/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment sdnc_app: type: cloudify.onap.kubernetes.App properties: name: sdnc + values: kubernetes/sdnc/values.yaml resources: - - kubernetes/sdnc/web-deployment.yaml - - kubernetes/sdnc/sdnc-deployment.yaml - - kubernetes/sdnc/dgbuilder-deployment.yaml - - kubernetes/sdnc/db-deployment.yaml - services: kubernetes/sdnc/all-services.yaml - inputs: *app_inputs + - kubernetes/sdnc/templates/web-deployment.yaml + - kubernetes/sdnc/templates/sdnc-deployment.yaml + - kubernetes/sdnc/templates/dgbuilder-deployment.yaml + - kubernetes/sdnc/templates/db-deployment.yaml + services: kubernetes/sdnc/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment portal_app: type: cloudify.onap.kubernetes.App properties: name: portal + values: kubernetes/portal/values.yaml resources: - - kubernetes/portal/portal-widgets-deployment.yaml - - kubernetes/portal/portal-apps-deployment.yaml - - kubernetes/portal/portal-mariadb-deployment.yaml - - kubernetes/portal/portal-vnc-dep.yaml - services: kubernetes/portal/all-services.yaml - inputs: *app_inputs + - kubernetes/portal/templates/portal-widgets-deployment.yaml + - kubernetes/portal/templates/portal-apps-deployment.yaml + - kubernetes/portal/templates/portal-mariadb-deployment.yaml + - kubernetes/portal/templates/portal-vnc-dep.yaml + services: kubernetes/portal/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment policy_app: type: cloudify.onap.kubernetes.App properties: name: policy + values: kubernetes/policy/values.yaml resources: - - kubernetes/policy/dep-drools.yaml - - kubernetes/policy/dep-nexus.yaml - - kubernetes/policy/dep-brmsgw.yaml - - kubernetes/policy/dep-pdp.yaml - - kubernetes/policy/dep-pap.yaml - - kubernetes/policy/dep-maria.yaml - - kubernetes/policy/dep-pypdp.yaml - services: kubernetes/policy/all-services.yaml - inputs: *app_inputs + - kubernetes/policy/templates/dep-drools.yaml + - kubernetes/policy/templates/dep-nexus.yaml + - kubernetes/policy/templates/dep-brmsgw.yaml + - kubernetes/policy/templates/dep-pdp.yaml + - kubernetes/policy/templates/dep-pap.yaml + - kubernetes/policy/templates/dep-maria.yaml + - kubernetes/policy/templates/dep-pypdp.yaml + services: kubernetes/policy/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment appc_app: type: cloudify.onap.kubernetes.App properties: name: appc + values: kubernetes/appc/values.yaml resources: - - kubernetes/appc/appc-deployment.yaml - - kubernetes/appc/dgbuilder-deployment.yaml - - kubernetes/appc/db-deployment.yaml - services: kubernetes/appc/all-services.yaml - inputs: *app_inputs + - kubernetes/appc/templates/appc-deployment.yaml + - kubernetes/appc/templates/dgbuilder-deployment.yaml + - kubernetes/appc/templates/db-deployment.yaml + services: kubernetes/appc/templates/all-services.yaml + options: *app_options relationships: - type: cloudify.kubernetes.relationships.managed_by_master target: kubernetes_master - type: cloudify.relationships.depends_on - target: init_pod + target: onap_environment |