update 201811 from azure

ansible/ansible.cfg

@@ -115,7 +115,7 @@ deprecation_warnings = False
 
 # set plugin path directories here, separate with colons
 action_plugins     = plugins/action
-# callback_plugins   = /usr/share/ansible_plugins/callback_plugins
+callback_plugins   = plugins/callback
 connection_plugins = plugins/connection
 # lookup_plugins     = /usr/share/ansible_plugins/lookup_plugins
 # vars_plugins       = /usr/share/ansible_plugins/vars_plugins
@@ -157,7 +157,7 @@ callback_whitelist = profile_tasks
 # current IP information.
 fact_caching = jsonfile
 fact_caching_connection = ~/.ansible/cache
-fact_caching_timeout = 1200
+fact_caching_timeout = 86400
 
 
 # retry files

ansible/config_sonic_basedon_testbed.yml

@@ -69,6 +69,11 @@
     connection: local
     when: "VM_topo | bool"
 
+  - name: get connection graph if defined for dut (ignore any errors)
+    conn_graph_facts: host="{{ inventory_hostname }}"
+    connection: local
+    ignore_errors: true
+
   - name: find interface name mapping and individual interface speed if defined
     port_alias: hwsku="{{ hwsku }}"
 
@@ -102,6 +107,73 @@
               dest=minigraph/{{ inventory_hostname}}.{{ topo }}.xml
     connection: local
     when: local_minigraph is defined and local_minigraph|bool == true
+
+  - block:
+    - name: Init telemetry keys
+      set_fact:
+        server_key: ""
+        server_cer: ""
+        dsmsroot_key: ""
+        dsmsroot_cer: ""
+        dir_path: ""
+
+    - name: read server key
+      set_fact:
+        server_key: "{{ telemetry_certs['server_key'] }}"
+      when: telemetry_certs['server_key'] is defined
+
+    - name: read server cer
+      set_fact:
+        server_cer: "{{ telemetry_certs['server_cer'] }}"
+      when: telemetry_certs['server_cer'] is defined
+
+    - name: read dsmsroot key
+      set_fact:
+        dsmsroot_key: "{{ telemetry_certs['dsmsroot_key'] }}"
+      when: telemetry_certs['dsmsroot_key'] is defined
+
+    - name: read dsmsroot cer
+      set_fact:
+        dsmsroot_cer: "{{ telemetry_certs['dsmsroot_cer'] }}"
+      when: telemetry_certs['dsmsroot_cer'] is defined
+
+    - name: read directory path
+      set_fact:
+        dir_path: "{{ telemetry_certs['dir_path'] }}"
+      when: telemetry_certs['dir_path'] is defined
+
+    - name: Create telemetry directory
+      file:
+        path: "{{ dir_path }}"
+        state: directory
+        mode: '0755'
+      become: true
+
+    # {{ server_cer }}/ streamingtelemetryserver.cer need to be copied on PTFDocker and renamed as dsmsroot.cer    
+    - name: Generate server cert using openssl.
+      command: openssl req \
+          -x509 \
+          -sha256 \
+          -nodes \
+          -newkey rsa:2048 \
+          -keyout "{{ server_key }}"
+          -subj "/CN=ndastreamingservertest"
+          -out "{{ server_cer }}" 
+      become: true
+
+    # {{ dsmsroot_cer }}/ dsmsroot.cer need to be copied on PTFDocker and renamed as streamingtelemetryclient.cer
+    # {{ dsms_key }}/ dsmsroot.key need to be copied and renamed as streamingtelemetryclient.key
+    - name: Generate dsmsroot cert using openssl.
+      command: openssl req \
+          -x509 \
+          -sha256 \
+          -nodes \
+          -newkey rsa:2048 \
+          -keyout "{{ dsmsroot_key }}"
+          -subj "/CN=ndastreamingclienttest"
+          -out "{{ dsmsroot_cer }}"
+      become: true
+
 
   - block:
       - name: saved original minigraph file in SONiC DUT(ignore errors when file doesnot exist)
@@ -114,6 +186,77 @@
                   dest=/etc/sonic/minigraph.xml
         become: true
 
+      - name: Test if configlet script exist
+        stat:
+            path: vars/configlet/{{ topo }}/apply_clet.sh
+        register: stat_result
+        delegate_to: localhost
+
+      - name: debug print stat_result
+        debug: 
+            msg: Stat result is {{ stat_result }}
+
+      - name: Copy corresponding configlet files if exist
+        copy: src=vars/configlet/{{ topo }}/
+              dest=/etc/sonic/
+        become: true
+        when: stat_result.stat.exists is defined and stat_result.stat.exists
+
+      - name: Init account key and proxy
+        set_fact:
+            core_key: ""
+            core_proxy: ""
+
+      - name: Test if core_analyzer.rc.json exists
+        stat:
+            path: /etc/sonic/core_analyzer.rc.json
+        register: rc_stat
+
+      - name: read account key
+        set_fact:
+            core_key: "{{ corefile_uploader['azure_sonic_core_storage']['account_key'] }}"
+        when: rc_stat.stat.exists is defined and rc_stat.stat.exists and corefile_uploader['azure_sonic_core_storage']['account_key'] is defined
+
+      - name: read https proxy
+        set_fact:
+            core_proxy: "{{ corefile_uploader['env']['https_proxy'] }}"
+        when: rc_stat.stat.exists is defined and rc_stat.stat.exists and corefile_uploader['env']['https_proxy'] is defined
+
+      - name: Put secret in core_analyzer.rc.json
+        lineinfile:
+            name: /etc/sonic/core_analyzer.rc.json
+            regexp: '(^.*)account_key'
+            line: '\1account_key": "{{ core_key }}",'
+            backrefs: yes
+        become: true
+        when: core_key != ""
+
+      - name: Put https-proxy in core_analyzer.rc.json
+        lineinfile:
+            name: /etc/sonic/core_analyzer.rc.json
+            regexp: '(^.*)https_proxy'
+            line: '\1https_proxy": "{{ core_proxy }}"'
+            backrefs: yes
+        become: true
+        when: core_proxy != ""
+
+      - name: enable core uploader service
+        become: true
+        command: systemctl enable core_uploader.service
+        when: core_key != ""
+
+      - name: start core uploader service
+        become: true
+        command: systemctl start core_uploader.service
+        when: core_key != ""
+
+      - name: Replace snmp community string
+        lineinfile:
+            name: /etc/sonic/snmp.yml
+            regexp: '^snmp_rocommunity:'
+            line: 'snmp_rocommunity: {{ snmp_rocommunity }}'
+        become: true
+
       - name: disable automatic minigraph update if we are deploying new minigraph into SONiC
         lineinfile:
             name: /etc/sonic/updategraph.conf
@@ -135,6 +278,11 @@
         become: true
         shell: config bgp startup all
 
+      - name: execute configlet application script, which applies configlets in strict order.
+        become: true
+        shell: bash "/etc/sonic/apply_clet.sh"
+        when: stat_result.stat.exists is defined and stat_result.stat.exists
+
       - name: execute cli "config save -y" to save current minigraph as startup-config
         become: true
         shell: config save -y

ansible/group_vars/all/corefile_uploader.yml

@@ -0,0 +1,7 @@
+# Configure core file storage secret key and https-proxy as required
+#
+#corefile_uploader:
+#        azure_sonic_core_storage:
+#                account_key: "Your Secret"
+#        env:
+#                https_proxy: "http://10.10.10.10:8000"

ansible/group_vars/all/creds.yml

@@ -0,0 +1,11 @@
+eos_default_login: "admin"
+eos_default_password: ""
+eos_login: admin
+eos_password: 123456
+eos_root_password: 123456
+
+sonic_login: "admin"
+sonic_default_passwords:
+ - "YourPaSsWoRd"
+ - "password"
+sonic_password: "password"

ansible/group_vars/all/telemetry_certs.yml

@@ -0,0 +1,10 @@
+# Configure telemetry server and dsmsroot key,cer
+
+telemetry_certs:
+    server_key: "/etc/sonic/telemetry/streamingtelemetryserver.key"
+    server_csr: "/etc/sonic/telemetry/streamingtelemetryserver.csr"
+    server_cer: "/etc/sonic/telemetry/streamingtelemetryserver.cer"
+    dsmsroot_key: "/etc/sonic/telemetry/dsmsroot.key"
+    dsmsroot_csr: "/etc/sonic/telemetry/dsmsroot.csr"
+    dsmsroot_cer: "/etc/sonic/telemetry/dsmsroot.cer"
+    dir_path: "/etc/sonic/telemetry"

ansible/group_vars/eos/eos.yml

@@ -1,4 +1,4 @@
 # snmp variables
 snmp_rocommunity: strcommunity
 snmp_location: str
-
+bgp_gr_timer: 700

ansible/group_vars/fanout/secrets.yml

@@ -1,4 +1,6 @@
 ansible_ssh_user: user
 ansible_ssh_pass: password
+fanout_mlnx_user: admin
+fanout_mlnx_password: admin
 fanout_sonic_user: admin
 fanout_sonic_password: password