Merge "CORD-3112 Fix key problems in synchronizers"
diff --git a/xos-profiles/mcord/values.yaml b/xos-profiles/mcord/values.yaml
index 62a0ab8..3c916d2 100644
--- a/xos-profiles/mcord/values.yaml
+++ b/xos-profiles/mcord/values.yaml
@@ -36,3 +36,7 @@
keystoneAdminPassword: "password"
keystoneAdminTenant: "admin"
keystoneDomain: "Default"
+
+global:
+ proxySshEnabled: true
+ proxySshUser: root
diff --git a/xos-services/hssdb/templates/_helpers.tpl b/xos-services/hssdb/templates/_helpers.tpl
index fec2d8d..2ac6d58 100644
--- a/xos-services/hssdb/templates/_helpers.tpl
+++ b/xos-services/hssdb/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/hssdb/templates/deployment.yaml b/xos-services/hssdb/templates/deployment.yaml
index a4b610b..9b4511d 100644
--- a/xos-services/hssdb/templates/deployment.yaml
+++ b/xos-services/hssdb/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: hssdb-keys
mountPath: /opt/xos/services/hssdb/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: hssdb-config
configMap:
@@ -68,6 +71,12 @@
- name: hssdb-keys
secret:
secretName: hssdb-keys
+ defaultMode: 256
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/hssdb/values.yaml b/xos-services/hssdb/values.yaml
index d663dd5..e5d4ae6 100644
--- a/xos-services/hssdb/values.yaml
+++ b/xos-services/hssdb/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/internetemulator/templates/_helpers.tpl b/xos-services/internetemulator/templates/_helpers.tpl
index dc70a3b..9539cf5 100644
--- a/xos-services/internetemulator/templates/_helpers.tpl
+++ b/xos-services/internetemulator/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/internetemulator/templates/deployment.yaml b/xos-services/internetemulator/templates/deployment.yaml
index 22415d8..dde880b 100644
--- a/xos-services/internetemulator/templates/deployment.yaml
+++ b/xos-services/internetemulator/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: internetemulator-keys
mountPath: /opt/xos/services/internetemulator/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: internetemulator-config
configMap:
@@ -68,6 +71,11 @@
- name: internetemulator-keys
secret:
secretName: internetemulator-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/internetemulator/values.yaml b/xos-services/internetemulator/values.yaml
index 4aba234..9d1c67c 100644
--- a/xos-services/internetemulator/values.yaml
+++ b/xos-services/internetemulator/values.yaml
@@ -35,6 +35,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/sdncontroller/templates/_helpers.tpl b/xos-services/sdncontroller/templates/_helpers.tpl
index b5ae337..41cbe8f 100644
--- a/xos-services/sdncontroller/templates/_helpers.tpl
+++ b/xos-services/sdncontroller/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/sdncontroller/templates/deployment.yaml b/xos-services/sdncontroller/templates/deployment.yaml
index 167b54e..23d6095 100644
--- a/xos-services/sdncontroller/templates/deployment.yaml
+++ b/xos-services/sdncontroller/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: sdncontroller-keys
mountPath: /opt/xos/services/sdncontroller/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: sdncontroller-config
configMap:
@@ -68,6 +71,11 @@
- name: sdncontroller-keys
secret:
secretName: sdncontroller-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/sdncontroller/values.yaml b/xos-services/sdncontroller/values.yaml
index da24f44..d08ab76 100644
--- a/xos-services/sdncontroller/values.yaml
+++ b/xos-services/sdncontroller/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/vhss/templates/_helpers.tpl b/xos-services/vhss/templates/_helpers.tpl
index 4ecf8d7..5accd51 100644
--- a/xos-services/vhss/templates/_helpers.tpl
+++ b/xos-services/vhss/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/vhss/templates/deployment.yaml b/xos-services/vhss/templates/deployment.yaml
index fe3f768..abeb18a 100644
--- a/xos-services/vhss/templates/deployment.yaml
+++ b/xos-services/vhss/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: vhss-keys
mountPath: /opt/xos/services/vhss/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: vhss-config
configMap:
@@ -68,6 +71,11 @@
- name: vhss-keys
secret:
secretName: vhss-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/vhss/values.yaml b/xos-services/vhss/values.yaml
index 3992a6d..b5a304f 100644
--- a/xos-services/vhss/values.yaml
+++ b/xos-services/vhss/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/vmme/templates/_helpers.tpl b/xos-services/vmme/templates/_helpers.tpl
index 63bd7c8..3b7a765 100644
--- a/xos-services/vmme/templates/_helpers.tpl
+++ b/xos-services/vmme/templates/_helpers.tpl
@@ -77,4 +77,7 @@
- console
- file
level: DEBUG
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/vmme/templates/deployment.yaml b/xos-services/vmme/templates/deployment.yaml
index 6f69763..b586a8e 100644
--- a/xos-services/vmme/templates/deployment.yaml
+++ b/xos-services/vmme/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: vmme-keys
mountPath: /opt/xos/services/vmme/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: vmme-config
configMap:
@@ -68,6 +71,11 @@
- name: vmme-keys
secret:
secretName: vmme-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/vmme/values.yaml b/xos-services/vmme/values.yaml
index 1bccaaa..50346af 100644
--- a/xos-services/vmme/values.yaml
+++ b/xos-services/vmme/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/vspgwc/templates/_helpers.tpl b/xos-services/vspgwc/templates/_helpers.tpl
index 8331074..7786e55 100644
--- a/xos-services/vspgwc/templates/_helpers.tpl
+++ b/xos-services/vspgwc/templates/_helpers.tpl
@@ -114,5 +114,8 @@
links:
- name: HSSDBServiceInstance
- name: HSSDBServiceInstance
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/vspgwc/templates/deployment.yaml b/xos-services/vspgwc/templates/deployment.yaml
index 28d0485..568d39d 100644
--- a/xos-services/vspgwc/templates/deployment.yaml
+++ b/xos-services/vspgwc/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: vspgwc-keys
mountPath: /opt/xos/services/vspgwc/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: vspgwc-config
configMap:
@@ -68,6 +71,11 @@
- name: vspgwc-keys
secret:
secretName: vspgwc-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/vspgwc/values.yaml b/xos-services/vspgwc/values.yaml
index db4e35a..985c700 100644
--- a/xos-services/vspgwc/values.yaml
+++ b/xos-services/vspgwc/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}
diff --git a/xos-services/vspgwu/templates/_helpers.tpl b/xos-services/vspgwu/templates/_helpers.tpl
index 7f25fce..e14cce5 100644
--- a/xos-services/vspgwu/templates/_helpers.tpl
+++ b/xos-services/vspgwu/templates/_helpers.tpl
@@ -100,4 +100,7 @@
links:
- name: VENBServiceInstance
- name: VSPGWUTenant
+proxy_ssh:
+ enabled: {{ .Values.global.proxySshEnabled }}
+ user: {{ .Values.global.proxySshUser }}
{{- end -}}
diff --git a/xos-services/vspgwu/templates/deployment.yaml b/xos-services/vspgwu/templates/deployment.yaml
index cf23fc7..52d9635 100644
--- a/xos-services/vspgwu/templates/deployment.yaml
+++ b/xos-services/vspgwu/templates/deployment.yaml
@@ -52,6 +52,9 @@
- name: vspgwu-keys
mountPath: /opt/xos/services/vspgwu/keys
readOnly: true
+ - name: node-key
+ mountPath: /opt/cord_profile
+ readOnly: true
volumes:
- name: vspgwu-config
configMap:
@@ -68,6 +71,11 @@
- name: vspgwu-keys
secret:
secretName: vspgwu-keys
+ - name: node-key
+ secret:
+ secretName: node-key
+ defaultMode: 256
+ optional: true
{{- with .Values.nodeSelector }}
nodeSelector:
{{ toYaml . | indent 8 }}
diff --git a/xos-services/vspgwu/values.yaml b/xos-services/vspgwu/values.yaml
index 2c59312..b034ab1 100644
--- a/xos-services/vspgwu/values.yaml
+++ b/xos-services/vspgwu/values.yaml
@@ -36,6 +36,11 @@
publicKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDL5L5vDsQ1bmSeisxMf/GZEqv85oHHu6RFE17VYoTAuBBsHQnETOccbQT85qSBy5NAMAICtOd15iXYfmul0eFeSHoQr1H3IAXT0if6ANxXOm8/Z2rlRNthOEgsjDQU9foNxQ4wksygy5epKmbEhMqbFZjuj4zYfStPzE/gkFSE9QjhKMWaJmyLFfq9f8DnC+TTE41K5iGbtramr7qHSWsKKy75XV6MZZLLFExrQqlYDlLA2V0aYezCql3fB96KJmf6GJRT3j3Y7oWaj7gEzMCycA2QgP8ZNFL/2Q1qgvQRc6I46/HUiOh3IT8LVDdo2ZUn9qrNameQ1zR7a+wBvYIV Insecure M-CORD keypair"
privateKeyFile: "files/id_rsa"
+# These variables can be overridden by the profile chart
+global:
+ proxySshEnabled: true
+ proxySshUser: "root"
+
resources: {}
nodeSelector: {}