From f8ac5392b9d010b6dbdb0925f4eb88ff538c8e22 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Sun, 22 May 2016 14:07:23 +0300 Subject: [PATCH 01/10] CFY-3955-embedded python --- aws-ec2-manager-blueprint.yaml | 4 ++-- .../elasticsearch/scripts/rotate_es_indices | 2 +- components/restservice/scripts/create.py | 23 ------------------- openstack-manager-blueprint.yaml | 4 ++-- simple-manager-blueprint.yaml | 2 +- vcloud-manager-blueprint.yaml | 4 ++-- vsphere-manager-blueprint.yaml | 4 ++-- 7 files changed, 10 insertions(+), 33 deletions(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index 1c1e931bf..2ddfbc2ba 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -121,7 +121,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: aws_configuration: &aws_configuration aws_access_key_id: { get_input: aws_access_key_id } @@ -554,4 +554,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} + value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file diff --git a/components/elasticsearch/scripts/rotate_es_indices b/components/elasticsearch/scripts/rotate_es_indices index 75eee9478..8c775d06b 100644 --- a/components/elasticsearch/scripts/rotate_es_indices +++ b/components/elasticsearch/scripts/rotate_es_indices @@ -1,6 +1,6 @@ #!/bin/sh -curator --host localhost delete indices --timestring '%Y.%m.%d' --older-than {{ ctx.node.properties.es_index_rotation_interval }} --time-unit days +/opt/es-curator/embedded/bin/curator --host localhost delete indices --timestring '%Y.%m.%d' --older-than {{ ctx.node.properties.es_index_rotation_interval }} --time-unit days EXITVALUE=$? if [ $EXITVALUE != 0 ]; then /usr/bin/logger -t elasticsearch-curator "ALERT exited abnormally with [$EXITVALUE]" diff --git a/components/restservice/scripts/create.py b/components/restservice/scripts/create.py index 1cc99a255..bb4bf96d8 100644 --- a/components/restservice/scripts/create.py +++ b/components/restservice/scripts/create.py @@ -112,28 +112,6 @@ def deploy_broker_configuration(): '(broker_ssl_enabled is False).') -def _configure_dbus(rest_venv): - # link dbus-python-1.1.1-9.el7.x86_64 to the venv for `cfy status` - # (module in pypi is very old) - site_packages = 'lib64/python2.7/site-packages' - dbus_relative_path = os.path.join(site_packages, 'dbus') - dbuslib = os.path.join('/usr', dbus_relative_path) - dbus_glib_bindings = os.path.join('/usr', site_packages, - '_dbus_glib_bindings.so') - dbus_bindings = os.path.join('/usr', site_packages, '_dbus_bindings.so') - if os.path.isdir(dbuslib): - dbus_venv_path = os.path.join(rest_venv, dbus_relative_path) - if not os.path.islink(dbus_venv_path): - utils.ln(source=dbuslib, target=dbus_venv_path, params='-sf') - utils.ln(source=dbus_bindings, target=dbus_venv_path, params='-sf') - if not os.path.islink(os.path.join(rest_venv, site_packages)): - utils.ln(source=dbus_glib_bindings, target=os.path.join( - rest_venv, site_packages), params='-sf') - else: - ctx.logger.warn( - 'Could not find dbus install, cfy status will not work') - - def install_restservice(): rest_service_rpm_source_url = \ @@ -161,7 +139,6 @@ def install_restservice(): deploy_broker_configuration() utils.yum_install(rest_service_rpm_source_url, service_name=REST_SERVICE_NAME) - _configure_dbus(rest_venv) install_optional(rest_venv) utils.logrotate(REST_SERVICE_NAME) diff --git a/openstack-manager-blueprint.yaml b/openstack-manager-blueprint.yaml index 396f906cd..7de47e8aa 100644 --- a/openstack-manager-blueprint.yaml +++ b/openstack-manager-blueprint.yaml @@ -156,7 +156,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: openstack_configuration: &openstack_configuration username: { get_input: keystone_username } @@ -640,4 +640,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} + value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file diff --git a/simple-manager-blueprint.yaml b/simple-manager-blueprint.yaml index 4cc9ecab5..54e9a68bb 100644 --- a/simple-manager-blueprint.yaml +++ b/simple-manager-blueprint.yaml @@ -501,4 +501,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_input: private_ip } + value: { get_input: private_ip } \ No newline at end of file diff --git a/vcloud-manager-blueprint.yaml b/vcloud-manager-blueprint.yaml index 735aacbb2..1215b4ee8 100644 --- a/vcloud-manager-blueprint.yaml +++ b/vcloud-manager-blueprint.yaml @@ -228,7 +228,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vcloud blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. @@ -748,4 +748,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} + value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file diff --git a/vsphere-manager-blueprint.yaml b/vsphere-manager-blueprint.yaml index ce07001ad..c585c7516 100644 --- a/vsphere-manager-blueprint.yaml +++ b/vsphere-manager-blueprint.yaml @@ -241,7 +241,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vsphere blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. @@ -634,4 +634,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} + value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file From 24e3e1ba1371645b1c76efcabb6455329220b073 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:16:08 +0300 Subject: [PATCH 02/10] embedded_packages_test --- aws-ec2-manager-blueprint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index 2ddfbc2ba..dd9c654f4 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -554,4 +554,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file + value: { get_attribute: [ manager_host, ip ]} From bd7f0fb61bd32a7a45101b20783e128180d0ac08 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:16:39 +0300 Subject: [PATCH 03/10] embedded_packages_test --- aws-ec2-manager-blueprint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index dd9c654f4..1c1e931bf 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -121,7 +121,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: aws_configuration: &aws_configuration aws_access_key_id: { get_input: aws_access_key_id } From b33beb85874b879d6242e2845d7ff20266e7c47a Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:17:45 +0300 Subject: [PATCH 04/10] embedded_packages_test --- aws-ec2-manager-blueprint.yaml | 2 +- openstack-manager-blueprint.yaml | 2 +- simple-manager-blueprint.yaml | 2 +- vcloud-manager-blueprint.yaml | 2 +- vsphere-manager-blueprint.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index 1c1e931bf..dd9c654f4 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -121,7 +121,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: aws_configuration: &aws_configuration aws_access_key_id: { get_input: aws_access_key_id } diff --git a/openstack-manager-blueprint.yaml b/openstack-manager-blueprint.yaml index 7de47e8aa..a7b46d454 100644 --- a/openstack-manager-blueprint.yaml +++ b/openstack-manager-blueprint.yaml @@ -640,4 +640,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file + value: { get_attribute: [ manager_host, ip ]} diff --git a/simple-manager-blueprint.yaml b/simple-manager-blueprint.yaml index 54e9a68bb..4cc9ecab5 100644 --- a/simple-manager-blueprint.yaml +++ b/simple-manager-blueprint.yaml @@ -501,4 +501,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_input: private_ip } \ No newline at end of file + value: { get_input: private_ip } diff --git a/vcloud-manager-blueprint.yaml b/vcloud-manager-blueprint.yaml index 1215b4ee8..be3763fe8 100644 --- a/vcloud-manager-blueprint.yaml +++ b/vcloud-manager-blueprint.yaml @@ -748,4 +748,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file + value: { get_attribute: [ manager_host, ip ]} diff --git a/vsphere-manager-blueprint.yaml b/vsphere-manager-blueprint.yaml index c585c7516..bce0e416c 100644 --- a/vsphere-manager-blueprint.yaml +++ b/vsphere-manager-blueprint.yaml @@ -634,4 +634,4 @@ outputs: rest_server_public_certificate: value: { get_attribute: [manager_configuration, external_rest_cert_content] } private_ip: - value: { get_attribute: [ manager_host, ip ]} \ No newline at end of file + value: { get_attribute: [ manager_host, ip ]} From f19006c6b279cb92fe4717e96073f5df65052714 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:18:19 +0300 Subject: [PATCH 05/10] embedded_packages_test --- aws-ec2-manager-blueprint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index dd9c654f4..1c1e931bf 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -121,7 +121,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: aws_configuration: &aws_configuration aws_access_key_id: { get_input: aws_access_key_id } From 7fddbdea1462f7ff71c90afe61e66e56a35a59ab Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:19:39 +0300 Subject: [PATCH 06/10] embedded_packages_test --- aws-ec2-manager-blueprint.yaml | 2 +- vsphere-manager-blueprint.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aws-ec2-manager-blueprint.yaml b/aws-ec2-manager-blueprint.yaml index 1c1e931bf..dd9c654f4 100644 --- a/aws-ec2-manager-blueprint.yaml +++ b/aws-ec2-manager-blueprint.yaml @@ -121,7 +121,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: aws_configuration: &aws_configuration aws_access_key_id: { get_input: aws_access_key_id } diff --git a/vsphere-manager-blueprint.yaml b/vsphere-manager-blueprint.yaml index bce0e416c..ce07001ad 100644 --- a/vsphere-manager-blueprint.yaml +++ b/vsphere-manager-blueprint.yaml @@ -241,7 +241,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vsphere blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. From d4533ec0be496d43e895ef15b31c23406ca2fe9b Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:20:02 +0300 Subject: [PATCH 07/10] embedded_packages_test --- openstack-manager-blueprint.yaml | 2 +- vsphere-manager-blueprint.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack-manager-blueprint.yaml b/openstack-manager-blueprint.yaml index a7b46d454..396f906cd 100644 --- a/openstack-manager-blueprint.yaml +++ b/openstack-manager-blueprint.yaml @@ -156,7 +156,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: openstack_configuration: &openstack_configuration username: { get_input: keystone_username } diff --git a/vsphere-manager-blueprint.yaml b/vsphere-manager-blueprint.yaml index ce07001ad..bce0e416c 100644 --- a/vsphere-manager-blueprint.yaml +++ b/vsphere-manager-blueprint.yaml @@ -241,7 +241,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vsphere blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. From 7dfde0b2b4eff92b078bf0a250e5f0f6fd9c9d34 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:20:39 +0300 Subject: [PATCH 08/10] embedded_packages_test --- openstack-manager-blueprint.yaml | 2 +- vcloud-manager-blueprint.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack-manager-blueprint.yaml b/openstack-manager-blueprint.yaml index 396f906cd..a7b46d454 100644 --- a/openstack-manager-blueprint.yaml +++ b/openstack-manager-blueprint.yaml @@ -156,7 +156,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + dsl_definitions: openstack_configuration: &openstack_configuration username: { get_input: keystone_username } diff --git a/vcloud-manager-blueprint.yaml b/vcloud-manager-blueprint.yaml index be3763fe8..735aacbb2 100644 --- a/vcloud-manager-blueprint.yaml +++ b/vcloud-manager-blueprint.yaml @@ -228,7 +228,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vcloud blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. From b605e723e4cbeea837bffcf9e125e31d8c8a9439 Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:21:08 +0300 Subject: [PATCH 09/10] embedded_packages_test --- vcloud-manager-blueprint.yaml | 2 +- vsphere-manager-blueprint.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vcloud-manager-blueprint.yaml b/vcloud-manager-blueprint.yaml index 735aacbb2..be3763fe8 100644 --- a/vcloud-manager-blueprint.yaml +++ b/vcloud-manager-blueprint.yaml @@ -228,7 +228,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vcloud blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. diff --git a/vsphere-manager-blueprint.yaml b/vsphere-manager-blueprint.yaml index bce0e416c..ce07001ad 100644 --- a/vsphere-manager-blueprint.yaml +++ b/vsphere-manager-blueprint.yaml @@ -241,7 +241,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vsphere blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host. From 04663bcea891892c9cfe6cba32547310d715a5eb Mon Sep 17 00:00:00 2001 From: gilzellner Date: Mon, 29 Aug 2016 11:22:41 +0300 Subject: [PATCH 10/10] embedded_packages_test --- vcloud-manager-blueprint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcloud-manager-blueprint.yaml b/vcloud-manager-blueprint.yaml index be3763fe8..735aacbb2 100644 --- a/vcloud-manager-blueprint.yaml +++ b/vcloud-manager-blueprint.yaml @@ -228,7 +228,7 @@ inputs: Set this to true if you want Telecom Edition type: boolean default: false - + ###################################################################### # This is a vcloud blueprint specific node_type to allow us to define # The public_ip of the machine is an accessible property of the host.