Merge "Start to commit CIG ONF config files"
diff --git a/deployment-configs/onlab-pod1.yml b/deployment-configs/onlab-pod1.yml
index 8285c37..b282c5a 100644
--- a/deployment-configs/onlab-pod1.yml
+++ b/deployment-configs/onlab-pod1.yml
@@ -44,6 +44,7 @@
ip: '10.90.0.114'
user: 'root'
pass: 'onl'
+ fortygig: 'true'
onus:
-
diff --git a/kubernetes-configs/edgecore-pod1.yml b/kubernetes-configs/edgecore-pod1.yml
index 8bb7735..eae1a3a 100644
--- a/kubernetes-configs/edgecore-pod1.yml
+++ b/kubernetes-configs/edgecore-pod1.yml
@@ -1,18 +1,72 @@
# SEBA Values
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.1'
-netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.1'
-ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.1'
-vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.1'
-vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.1'
+# envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.2'
+# netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.2'
+# ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.2'
+# vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.2'
+# vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.2'
-onosImage: 'matteoscandolo/onos:ams-1.0.0'
+envoyForEtcdImage: '192.168.99.181:30500/voltha/voltha-envoy:ams-1.0.2'
+netconfImage: '192.168.99.181:30500/voltha/voltha-netconf:ams-1.0.2'
+ofagentImage: '192.168.99.181:30500/voltha/voltha-ofagent:ams-1.0.2'
+vcliImage: '192.168.99.181:30500/voltha/voltha-cli:ams-1.0.2'
+vcoreImage: '192.168.99.181:30500/voltha/voltha-voltha:ams-1.0.2'
+httpBackendImage: '192.168.99.181:30500/google_containers/defaultbackend:1.4'
+ingressControllerImage: '192.168.99.181:30500/quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
-xos_coreImage: 'xosproject/xos-core:2.1.0'
+onosImage: '192.168.99.181:30500/onos/onos:ams-1.0.0'
+
+# xos
+xos_coreImage: '192.168.99.181:30500/xosproject/xos-core:2.1.4'
+xos_chameleonImage: '192.168.99.181:30500/xosproject/chameleon:master'
+xos_toscaImage: '192.168.99.181:30500/xosproject/xos-tosca:master'
+xos-gui:
+ xos_guiImage: '192.168.99.181:30500/xosproject/xos-gui:master'
+ xos_wsImage: '192.168.99.181:30500/xosproject/xos-ws:master'
+xos-db:
+ postgresImage: '192.168.99.181:30500/postgres:10.3-alpine'
+
+# synchronizers
+rcord:
+ rcord_synchronizerImage: '192.168.99.181:30500/xosproject/rcord-synchronizer:1.0.3'
fabric:
- fabric_synchronizerImage: 'xosproject/fabric-synchronizer:2.1.0'
+ fabric_synchronizerImage: '192.168.99.181:30500/xosproject/fabric-synchronizer:2.1.1'
+volt:
+ volt_synchronizerImage: '192.168.99.181:30500/xosproject/volt-synchronizer:2.0.3'
+fabric-crossconnect:
+ fabric_crossconnect_synchronizerImage: '192.168.99.181:30500/xosproject/fabric-crossconnect-synchronizer:1.0.2'
+onos-service:
+ onos_synchronizerImage: '192.168.99.181:30500/xosproject/onos-synchronizer:2.0.4'
att-workflow-driver:
- attWorkflowDriver_synchronizerImage: '192.168.99.181:30500/xosproject/att-workflow-driver-synchronizer:candidate'
+ attWorkflowDriver_synchronizerImage: '192.168.99.181:30500/xosproject/att-workflow-driver-synchronizer:1.0.0'
+kubernetes:
+ kubernetes_synchronizerImage: "192.168.99.181:30500/xosproject/kubernetes-synchronizer:1.0.2"
+
+# kafka
+image: '192.168.99.181:30500/confluentinc/cp-kafka:4.1.2-2'
+
+zookeper:
+ image: '192.168.99.181:30500/google_samples/k8szk:v3'
+
+# etcd
+# FIXME not used....
+etcd-operator:
+ etcdOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+ tag: v0.7.0
+ etcdCluster:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd
+ tag: v3.2.13
+ backupOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+ tag: v0.7.0
+ restoreOperator:
+ image:
+ repository: 192.168.99.181:30500/quay.io/coreos/etcd-operator
+ tag: v0.7.0
application_logs: |
log4j.logger.org.opencord.olt = DEBUG
diff --git a/kubernetes-configs/flex-pod1-olt.yml b/kubernetes-configs/flex-pod1-olt.yml
index a56c3a9..aed4ad0 100644
--- a/kubernetes-configs/flex-pod1-olt.yml
+++ b/kubernetes-configs/flex-pod1-olt.yml
@@ -14,17 +14,17 @@
# Automated deployment configuration for Flex POD 1 , olt/onu are connected to this
-# This file is used to optionally customize helm charts installations
+# This file is used to optionally customize helm charts installations
---
# SEBA Values
-envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.1'
-netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.1'
-ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.1'
-vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.1'
-vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.1'
+envoyForEtcdImage: 'matteoscandolo/voltha-envoy:ams-1.0.2'
+netconfImage: 'matteoscandolo/voltha-netconf:ams-1.0.2'
+ofagentImage: 'matteoscandolo/voltha-ofagent:ams-1.0.2'
+vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.2'
+vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.2'
onosImage: 'matteoscandolo/onos:ams-1.0.0'
diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 0d87f1a..f3a7506 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -6,11 +6,11 @@
vcliImage: 'matteoscandolo/voltha-cli:ams-1.0.2'
vcoreImage: 'matteoscandolo/voltha-voltha:ams-1.0.2'
-# envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:ams-1.0.2-alpha'
-# netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:ams-1.0.2-alpha'
-# ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:ams-1.0.2-alpha'
-# vcliImage: '10.90.0.101:30500/voltha/voltha-cli:ams-1.0.2-alpha'
-# vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:ams-1.0.2-alpha'
+# envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:dev'
+# netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:dev'
+# ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:dev'
+# vcliImage: '10.90.0.101:30500/voltha/voltha-cli:dev'
+# vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:dev'
onosImage: 'matteoscandolo/onos:ams-1.0.0'
@@ -20,14 +20,8 @@
# sadisAppUrl: http://10.90.0.101:30160/repository/sadis-app-2.2.0-SNAPSHOT.oar
# oltAppUrl: http://10.90.0.101:30160/repository/olt-app-2.0.0-SNAPSHOT.oar
-xos_coreImage: 'xosproject/xos-core:2.1.0'
-fabric:
- fabric_synchronizerImage: 'xosproject/fabric-synchronizer:2.1.0'
-att-workflow-driver:
- attWorkflowDriver_synchronizerImage: '10.90.0.101:30500/xosproject/att-workflow-driver-synchronizer:candidate'
-
application_logs: |
log4j.logger.org.opencord.olt = DEBUG
log4j.logger.org.opencord.kafka = DEBUG
log4j.logger.org.opencord.sadis = DEBUG
- log4j.logger.org.opencord.aaa = DEBUG
+ log4j.logger.org.opencord.aaa = TRACE
diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index fefcc3c..e9b71d5 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-fabric.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-fabric.yaml http://192.168.99.181:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -80,23 +80,24 @@
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
serial_number: ALPHe3d1cea3
- pon_port_id: 536870912
+ # pon_port_id: 536870912
+ pon_port_id: 536870913
device_id: of:00000000c0a863b6
requirements:
- owner:
node: service#att
relationship: tosca.relationships.BelongsToOne
- ALPHe3d1cee9:
- type: tosca.nodes.AttWorkflowDriverWhiteListEntry
- properties:
- serial_number: ALPHe3d1cee9
- pon_port_id: 536870912
- device_id: of:00000000c0a863b6
- requirements:
- - owner:
- node: service#att
- relationship: tosca.relationships.BelongsToOne
+ # ALPHe3d1cee9:
+ # type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ # properties:
+ # serial_number: ALPHe3d1cee9
+ # pon_port_id: 536870912
+ # device_id: of:00000000c0a863b6
+ # requirements:
+ # - owner:
+ # node: service#att
+ # relationship: tosca.relationships.BelongsToOne
ISKT71e810c0:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
diff --git a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
index 853e0b1..6db62e5 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-edgecore-olt.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-olt.yaml http://192.168.99.181:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index babe922..fedcbd1 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-subscriber.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-subscriber.yaml http://192.168.99.181:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports: