~mpontillo/maas/beaconing--replies-from-maas--wip

« back to all changes in this revision

Viewing changes to src/maasserver/triggers/system.py

Committer: Mike Pontillo
Date: 2017-06-19 22:29:18 UTC
mfrom: (6085.2.8 maas)
Revision ID: mike.pontillo@canonical.com-20170619222918-4pzgkvgr9b7cbob2

Merge trunk.

files added:
src/maasserver/static/js/angular/3rdparty/vs-repeat.js

src/provisioningserver/drivers/osystem/rhel.py

src/provisioningserver/drivers/osystem/tests/test_rhel.py

files modified:
docs/development/notifications.rst

src/apiclient/testing/django.py

src/maasserver/api/doc_handler.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_maas.py

src/maasserver/compose_preseed.py

src/maasserver/djangosettings/settings.py

src/maasserver/forms/__init__.py

src/maasserver/forms/interface.py

src/maasserver/forms/settings.py

src/maasserver/forms/tests/test_interface.py

src/maasserver/models/config.py

src/maasserver/models/largefile.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_physicalblockdevice.py

src/maasserver/preseed.py

src/maasserver/proxyconfig.py

src/maasserver/service_monitor.py

src/maasserver/static/js/angular/controllers/fabric_details.js

src/maasserver/static/js/angular/controllers/tests/test_fabric_details.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/dashboard.html

src/maasserver/static/partials/fabric-details.html

src/maasserver/static/partials/machines-table.html

src/maasserver/static/partials/networks-list.html

src/maasserver/static/partials/node-details.html *

src/maasserver/static/partials/node-events.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/partials/pods-list.html

src/maasserver/templates/maasserver/js-conf.html

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_proxyconfig.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/triggers/system.py

src/maasserver/triggers/testing.py

src/maasserver/triggers/tests/test_init.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/urls.py

src/maasserver/utils/__init__.py

src/maasserver/utils/osystems.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/views/account.py

src/maasserver/views/combo.py

src/maasserver/views/prefs.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_general.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/osystem/centos.py

src/provisioningserver/drivers/osystem/tests/test_centos.py

src/provisioningserver/templates/proxy/maas-proxy.conf.template

src/provisioningserver/utils/service_monitor.py

src/provisioningserver/utils/tests/test_service_monitor.py

Show diffs side-by-side

added added

removed removed

src/maasserver/triggers/system.py

1050

""")

1051

1052

1053

# Triggered when the proxy settings are updated.

1054

PEER_PROXY_CONFIG_INSERT = dedent("""\

1055

CREATE OR REPLACE FUNCTION sys_proxy_config_use_peer_proxy_insert()

1056

RETURNS trigger as $$

1057

BEGIN

1058

IF (NEW.name = 'enable_proxy' OR

1059

NEW.name = 'use_peer_proxy' OR

1060

NEW.name = 'http_proxy') THEN

1061

PERFORM pg_notify('sys_proxy', '');

1062

END IF;

1063

RETURN NEW;

1064

END;

1065

$$ LANGUAGE plpgsql;

1066

""")

1067

1068

1069

# Triggered when the proxy settings are updated.

1070

PEER_PROXY_CONFIG_UPDATE = dedent("""\

1071

CREATE OR REPLACE FUNCTION sys_proxy_config_use_peer_proxy_update()

1072

RETURNS trigger as $$

1073

BEGIN

1074

IF (NEW.name = 'enable_proxy' OR

1075

NEW.name = 'use_peer_proxy' OR

1076

NEW.name = 'http_proxy') THEN

1077

PERFORM pg_notify('sys_proxy', '');

1078

END IF;

1079

RETURN NEW;

1080

END;

1081

$$ LANGUAGE plpgsql;

1082

""")

1083

1084

1053

1085

def render_sys_dns_procedure(proc_name, on_delete=False):

1054

1086

"""Render a database procedure that creates a new DNS publication.

1055

1087

1338

1370

register_trigger(

1339

1371

"maasserver_subnet",

1340

1372

"sys_proxy_subnet_delete", "delete")

1373

1374

# - Config/http_proxy (when use_peer_proxy)

1375

register_procedure(PEER_PROXY_CONFIG_INSERT)

1376

register_trigger(

1377

"maasserver_config", "sys_proxy_config_use_peer_proxy_insert",

1378

"insert")

1379

register_procedure(PEER_PROXY_CONFIG_UPDATE)

1380

register_trigger(

1381

"maasserver_config", "sys_proxy_config_use_peer_proxy_update",

1382

"update")

Older »