Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CFY-5573 extract sanity app file name to inputs #352

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

CFY-5573 extract sanity app file name to inputs #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions aws-ec2-manager-blueprint-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,12 @@ aws_secret_access_key: ''
# Minimum number of worker processes maintained by the management worker.
#management_worker_min_workers: 2

#################################
# Sanity Node Configuration
#################################
# The application used to prefore sanity validations at the end of bootstrap/upgrade/rollback.
#application_file_name: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Offline Resources Upload
#############################
Expand Down
9 changes: 9 additions & 0 deletions aws-ec2-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down
9 changes: 9 additions & 0 deletions azure-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down
7 changes: 3 additions & 4 deletions components/manager/scripts/sanity/sanity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
join(dirname(__file__), 'utils.py'))
import utils # NOQA

REST_VERSION = 'v2.1'
BLUEPRINT_ID = 'sanity_bp'
DEPLOYMENT_ID = 'sanity_deployment'
SANITY_SERVICE_NAME = 'sanity'
Expand Down Expand Up @@ -47,9 +46,9 @@ def _upload_app_blueprint(app_tar):
headers = utils.create_maintenance_headers()
headers['Content-Length'] = length
headers['Content-Type'] = 'application/octet-stream'
application_file_name = ctx_properties['application_file_name']
params = urllib.urlencode(
dict(application_file_name='no-monitoring-'
'singlehost-blueprint.yaml'))
dict(application_file_name=application_file_name))

endpoint = '{0}/blueprints/{1}'.format(_get_url_prefix(), BLUEPRINT_ID)
url = endpoint + '?' + params
Expand Down Expand Up @@ -251,7 +250,7 @@ def _get_url_prefix():
rest_protocol,
manager_ip,
rest_port,
REST_VERSION)
utils.REST_VERSION)


def perform_sanity():
Expand Down
6 changes: 6 additions & 0 deletions openstack-manager-blueprint-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,12 @@ agents_user: ''
# Minimum number of worker processes maintained by the management worker.
#management_worker_min_workers: 2

#################################
# Sanity Node Configuration
#################################
# The application used to prefore sanity validations at the end of bootstrap/upgrade/rollback.
#application_file_name: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Offline Resources Upload
#############################
Expand Down
9 changes: 9 additions & 0 deletions openstack-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down
8 changes: 8 additions & 0 deletions simple-manager-blueprint-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,14 @@ agents_user: ''
# Minimum number of worker processes maintained by the management worker.
#management_worker_min_workers: 2


#################################
# Sanity Node Configuration
#################################
# The application used to prefore sanity validations at the end of bootstrap/upgrade/rollback.
#application_file_name: 'no-monitoring-singlehost-blueprint.yaml'


#############################
# Offline Resources Upload
#############################
Expand Down
9 changes: 9 additions & 0 deletions simple-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down
4 changes: 4 additions & 0 deletions types/manager-types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,10 @@ node_types:
description: Sanity app Source URL
type: string
default: { get_input: sanity_app_source_url }
application_file_name:
description: Sanity app blueprint file name
type: string
default: { get_input: application_file_name }
interfaces:
cloudify.interfaces.lifecycle:
create:
Expand Down
6 changes: 6 additions & 0 deletions vcloud-manager-blueprint-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,12 @@ user_public_key: ssh-rsa...
# Minimum number of worker processes maintained by the management worker.
#management_worker_min_workers: 2

#################################
# Sanity Node Configuration
#################################
# The application used to prefore sanity validations at the end of bootstrap/upgrade/rollback.
#application_file_name: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Offline Resources Upload
#############################
Expand Down
9 changes: 9 additions & 0 deletions vcloud-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down
6 changes: 6 additions & 0 deletions vsphere-manager-blueprint-inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,12 @@
# Minimum number of worker processes maintained by the management worker.
#management_worker_min_workers: 2

#################################
# Sanity Node Configuration
#################################
# The application used to prefore sanity validations at the end of bootstrap/upgrade/rollback.
#application_file_name: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Offline Resources Upload
#############################
Expand Down
9 changes: 9 additions & 0 deletions vsphere-manager-blueprint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,15 @@ inputs:
type: integer
default: 2

#############################
# Sanity Node Inputs
#############################
application_file_name:
description: >
Sanity app blueprint file name.
type: string
default: 'no-monitoring-singlehost-blueprint.yaml'

#############################
# Upload Resources Inputs
#############################
Expand Down