Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 11 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ script:
after_success:
- md5sum ${PKG_RELEASE_EL7} > ${PKG_RELEASE_EL7}.md5 && md5sum --check ${PKG_RELEASE_EL7}.md5
- md5sum ${PKG_RELEASE_1404} > ${PKG_RELEASE_1404}.md5 && md5sum --check ${PKG_RELEASE_1404}.md5

deploy:
- provider: releases
api_key:
Expand All @@ -90,20 +91,20 @@ deploy:
# tags: true
# python: 2.7
# skip_cleanup: true

# - provider: script
# skip_cleanup: true
# on:
# all_branches: true
# repo: F5Networks/f5-openstack-agent
# tags: true
# script:
# - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION

# skip_cleanup: true
# on:
# all_branches: true
# repo: F5Networks/f5-openstack-agent
# tags: true
script:
- echo $CTLR_VERSION
# # - ./docs/scripts/docker-docs.sh ./docs/scripts/test-docs.sh && ./docs/scripts/deploy-docs.sh publish-product-docs-to-prod openstack/agent $CTLR_VERSION

notifications:
slack:
rooms:
- f5openstackdev:$SLACK_TOKEN#f5-openstack-agent
- f5openstackdev:$SLACK_TOKEN#build_status
on_success: change
on_failure: always
on_failure: always
5 changes: 3 additions & 2 deletions f5_openstack_agent/lbaasv2/drivers/bigip/resource_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -1954,7 +1954,7 @@ def _update_payload(self, old_resource, resource, service, **kwargs):
create_payload = kwargs.get('create_payload',
self._create_payload(resource, service))

keys_ignore = ['expected_codes', 'url_path', 'http_method']
keys_ignore = ['expected_codes', 'url_path', 'http_method']
for key in self.mutable_props.keys():
if old_resource.get('type') == 'PING' and key in keys_ignore:
continue
Expand All @@ -1965,7 +1965,8 @@ def _update_payload(self, old_resource, resource, service, **kwargs):
if old != new:
prop = self.mutable_props[key]
payload[prop] = create_payload[prop]


LOG.info('_update_payload MonitorManager')
LOG.info(payload)
# changing only interval needs to update timeout as well
if 'interval' in payload:
Expand Down