Skip to content

Commit 5e9dee0

Browse files
ShannonLeavittShannonLeavitt
authored
Merge pull request #78677 from dominicbetts/factory-updates
Remove redundant Connected Factory files
2 parents acc97b6 + a77403f commit 5e9dee0

File tree

11 files changed

+66
-466
lines changed

11 files changed

+66
-466
lines changed

‎.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30884,6 +30884,16 @@
3088430884
"redirect_url": "/azure/iot-accelerators/quickstart-connected-factory-deploy",
3088530885
"redirect_document_id": false
3088630886
},
30887+
{
30888+
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-sample-walkthrough.md",
30889+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-features",
30890+
"redirect_document_id": false
30891+
},
30892+
{
30893+
"source_path": "articles/iot-accelerators/iot-accelerators-connected-factory-gateway-deployment.md",
30894+
"redirect_url": "/azure/iot-accelerators/iot-accelerators-connected-factory-features",
30895+
"redirect_document_id": false
30896+
},
3088730897
{
3088830898
"source_path": "articles/iot-accelerators/iot-accelerators-predictive-overview.md",
3088930899
"redirect_url": "/azure/iot-accelerators/quickstart-predictive-maintenance-deploy",

‎articles/iot-accelerators/howto-opc-twin-deploy-modules.md

Lines changed: 56 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -28,69 +28,71 @@ All modules are deployed using a deployment manifest. An example manifest to de
2828

2929
```json
3030
{
31-
"modulesContent": {
32-
"$edgeAgent": {
33-
"properties.desired": {
34-
"schemaVersion": "1.0",
35-
"runtime": {
36-
"type": "docker",
37-
"settings": {
38-
"minDockerVersion": "v1.25",
39-
"loggingOptions": "",
40-
"registryCredentials": {}
41-
}
42-
},
43-
"systemModules": {
44-
"edgeAgent": {
31+
"content": {
32+
"modulesContent": {
33+
"$edgeAgent": {
34+
"properties.desired": {
35+
"schemaVersion": "1.0",
36+
"runtime": {
4537
"type": "docker",
4638
"settings": {
47-
"image": "mcr.microsoft.com/azureiotedge-agent:1.0",
48-
"createOptions": ""
39+
"minDockerVersion": "v1.25",
40+
"loggingOptions": "",
41+
"registryCredentials": {}
4942
}
5043
},
51-
"edgeHub": {
52-
"type": "docker",
53-
"status": "running",
54-
"restartPolicy": "always",
55-
"settings": {
56-
"image": "mcr.microsoft.com/azureiotedge-hub:1.0",
57-
"createOptions": "{\"HostConfig\":{\"PortBindings\":{\"5671/tcp\":[{\"HostPort\":\"5671\"}], \"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}"
58-
}
59-
}
60-
},
61-
"modules": {
62-
"opctwin": {
63-
"version": "1.0",
64-
"type": "docker",
65-
"status": "running",
66-
"restartPolicy": "never",
67-
"settings": {
68-
"image": "mcr.microsoft.com/iotedge/opc-twin:latest",
69-
"createOptions": "{\"HostConfig\": { \"NetworkMode\": \"host\", \"CapAdd\": [\"NET_ADMIN\"] } }"
44+
"systemModules": {
45+
"edgeAgent": {
46+
"type": "docker",
47+
"settings": {
48+
"image": "mcr.microsoft.com/azureiotedge-agent:1.0",
49+
"createOptions": ""
50+
}
51+
},
52+
"edgeHub": {
53+
"type": "docker",
54+
"status": "running",
55+
"restartPolicy": "always",
56+
"settings": {
57+
"image": "mcr.microsoft.com/azureiotedge-hub:1.0",
58+
"createOptions": "{\"HostConfig\":{\"PortBindings\":{\"5671/tcp\":[{\"HostPort\":\"5671\"}], \"8883/tcp\":[{\"HostPort\":\"8883\"}],\"443/tcp\":[{\"HostPort\":\"443\"}]}}}"
59+
}
7060
}
7161
},
72-
"opcpublisher": {
73-
"version": "2.0",
74-
"type": "docker",
75-
"status": "running",
76-
"restartPolicy": "never",
77-
"settings": {
78-
"image": "mcr.microsoft.com/iotedge/opc-publisher:latest",
79-
"createOptions": "{\"Hostname\": \"publisher\", \"Cmd\": [ \"publisher\", \"--pf=./pn.json\", \"--di=60\", \"--to\", \"--aa\", \"--si=0\", \"--ms=0\" ], \"ExposedPorts\": { \"62222/tcp\": {} }, \"HostConfig\": { \"PortBindings\": { \"62222/tcp\": [{ \"HostPort\": \"62222\" }] } } }"
62+
"modules": {
63+
"opctwin": {
64+
"version": "1.0",
65+
"type": "docker",
66+
"status": "running",
67+
"restartPolicy": "always",
68+
"settings": {
69+
"image": "mcr.microsoft.com/iotedge/opc-twin:latest",
70+
"createOptions": "{\"NetworkingConfig\":{\"EndpointsConfig\":{\"host\":{}}},\"HostConfig\":{\"NetworkMode\":\"host\",\"CapAdd\":[\"NET_ADMIN\"]}}"
71+
}
72+
},
73+
"opcpublisher": {
74+
"version": "2.0",
75+
"type": "docker",
76+
"status": "running",
77+
"restartPolicy": "always",
78+
"settings": {
79+
"image": "mcr.microsoft.com/iotedge/opc-publisher:latest",
80+
"createOptions": "{\"Hostname\":\"publisher\",\"Cmd\":[\"publisher\",\"--pf=./pn.json\",\"--di=60\",\"--to\",\"--aa\",\"--si=0\",\"--ms=0\"],\"ExposedPorts\":{\"62222/tcp\":{}},\"NetworkingConfig\":{\"EndpointsConfig\":{\"host\":{}}},\"HostConfig\":{\"NetworkMode\":\"host\",\"PortBindings\":{\"62222/tcp\":[{\"HostPort\":\"62222\"}]}}}"
81+
}
8082
}
8183
}
8284
}
83-
}
84-
},
85-
"$edgeHub": {
86-
"properties.desired": {
87-
"schemaVersion": "1.0",
88-
"routes": {
89-
"opctwinToIoTHub": "FROM /messages/modules/opctwin/outputs/* INTO $upstream",
90-
"opcpublisherToIoTHub": "FROM /messages/modules/opcpublisher/outputs/* INTO $upstream"
91-
},
92-
"storeAndForwardConfiguration": {
93-
"timeToLiveSecs": 7200
85+
},
86+
"$edgeHub": {
87+
"properties.desired": {
88+
"schemaVersion": "1.0",
89+
"routes": {
90+
"opctwinToIoTHub": "FROM /messages/modules/opctwin/* INTO $upstream",
91+
"opcpublisherToIoTHub": "FROM /messages/modules/opcpublisher/* INTO $upstream"
92+
},
93+
"storeAndForwardConfiguration": {
94+
"timeToLiveSecs": 7200
95+
}
9496
}
9597
}
9698
}

‎articles/iot-accelerators/iot-accelerators-connected-factory-gateway-deployment.md

Lines changed: 0 additions & 169 deletions
This file was deleted.

0 commit comments

Comments
 (0)