Fix pillar tests

* Update run_tests.sh to the latest revision * drop odd .kitchen.vagrant.yml Related-Bug: PROD-20730 (PROD:20730) Change-Id: I367800a60ad17020700a76670d1216dfdfcfe692
pavel-z1 · Aug 17, 2018 · 4bf8762 · 4bf8762
1 parent 42b64a1
commit 4bf8762
Show file tree

Hide file tree

Showing 12 changed files with 184 additions and 56 deletions.
diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml
diff --git a/linux/meta/fluentd.yml b/linux/meta/fluentd.yml
@@ -1,3 +1,5 @@
+{%- if pillar.get('fluentd', {}).get('agent', {}).get('enabled', False) %}
+{%- set positiondb = pillar.fluentd.agent.dir.positiondb %}
 {%- if grains.get('init') == 'systemd' %}
 agent:
   plugin:
@@ -54,7 +56,7 @@ agent:
             type: systemd
             tag: systemd.source
             path: /run/log/journal
-            pos_file: {{ pillar.fluentd.agent.dir.positiondb }}/systemd.source.pos
+            pos_file: {{ positiondb }}/systemd.source.pos
             entry:
               field_map:
                 MESSAGE: 'Payload'
@@ -142,7 +144,7 @@ agent:
             type: tail
             tag: linux.syslog
             path: /var/log/syslog
-            pos_file: {{ pillar.fluentd.agent.dir.positiondb }}/linux_syslog.pos
+            pos_file: {{ positiondb }}/linux_syslog.pos
             suppress_parse_error_log: true
             parser:
               type: regexp
@@ -170,3 +172,4 @@ agent:
             type: relabel
             label: default_metric
 {%- endif %}
+{%- endif %}
diff --git a/linux/network/hostname.sls b/linux/network/hostname.sls
@@ -25,7 +25,6 @@ linux_enforce_hostname:
     - apply_hostname: True
     - retain_settings: True
 #}
-
 linux_enforce_hostname:
   cmd.run:
   - name: hostname {{ network.hostname }}

diff --git a/tests/pillar/network_openvswitch.sls b/tests/pillar/network_openvswitch.sls
@@ -2,6 +2,7 @@ linux:
   system:
     enabled: true
     domain: local
+    name: linux
   network:
     enabled: true
     hostname: test01

diff --git a/tests/pillar/network_openvswitch_dpdk.sls b/tests/pillar/network_openvswitch_dpdk.sls
@@ -2,6 +2,7 @@ linux:
   system:
     enabled: true
     domain: local
+    name: linux
   network:
     enabled: true
     hostname: test01

diff --git a/tests/pillar/storage.sls b/tests/pillar/storage.sls
@@ -1,4 +1,12 @@
 linux:
+  system:
+    enabled: true
+    name: linux
+    domain: local
+  network:
+    enabled: true
+    hostname: linux
+    fqdn: linux.ci.local
   storage:
     enabled: true
     swap:

diff --git a/tests/pillar/system.sls b/tests/pillar/system.sls
@@ -147,9 +147,10 @@ linux:
           enabled: true
           https: https://127.0.5.1:443
           #http: http://127.0.5.2:8080
-      apt-mk-salt:
-        source: "deb http://apt-mk.mirantis.com/xenial stable salt"
-        #key_url: http://apt-mk.mirantis.com/public.gpg
+      apt-salt:
+        source: "deb http://apt.mirantis.com/xenial stable salt"
+        #key_url: http://apt.mirantis.com/public.gpg
+        # pub   4096R/A76882D3 2015-06-17
         key: |
           -----BEGIN PGP PUBLIC KEY BLOCK-----
           Version: GnuPG v1
@@ -206,15 +207,15 @@ linux:
         architectures: amd64
         proxy:
           enabled: true
-      apt-mk-salt-nightly:
-        source: "deb http://apt-mk.mirantis.com/xenial nightly salt"
-        key_url: http://apt-mk.mirantis.com/public.gpg
+      apt-salt-nightly:
+        source: "deb http://apt.mirantis.com/xenial nightly salt"
+        key_url: http://apt.mirantis.com/public.gpg
         architectures: amd64
         proxy:
           enabled: false
-      apt-mk-extra-nightly:
-        source: "deb http://apt-mk.mirantis.com/xenial nightly extra"
-        key_url: http://apt-mk.mirantis.com/public.gpg
+      apt-extra-nightly:
+        source: "deb http://apt.mirantis.com/xenial nightly extra"
+        key_url: http://apt.mirantis.com/public.gpg
         architectures: amd64
     locale:
       en_US:

diff --git a/tests/pillar/system_banner.sls b/tests/pillar/system_banner.sls
@@ -1,6 +1,11 @@
 linux:
+  network:
+    enabled: true
+    hostname: linux
+    fqdn: linux.ci.local
   system:
     enabled: true
+    name: linux
     banner:
       enabled: true
       contents: |

diff --git a/tests/pillar/system_extra.sls b/tests/pillar/system_extra.sls
@@ -1,5 +1,9 @@
 
 linux:
+  network:
+    enabled: true
+    hostname: linux
+    fqdn: linux.ci.local
   system:
     auth:
       enabled: true

diff --git a/tests/pillar/system_file.sls b/tests/pillar/system_file.sls
@@ -1,5 +1,10 @@
 linux:
+  network:
+    enabled: true
+    hostname: linux
+    fqdn: linux.ci.local
   system:
+    name: linux
     enabled: true
     file:
       /tmp/sample.txt: