Merge pull request #78 from Martin819/master
Update .travis.yml and notififcations
diff --git a/README.rst b/README.rst
index f9dede9..2cccd1d 100644
--- a/README.rst
+++ b/README.rst
@@ -888,6 +888,14 @@
- timeout: 2
- attempts: 2
+**setting custom TX queue length for tap interfaces**
+
+.. code-block:: yaml
+
+ linux:
+ network:
+ tap_custom_txqueuelen: 10000
+
DPDK OVS interfaces
--------------------
@@ -998,6 +1006,22 @@
- file_system: cifs
- options: guest,uid=myuser,iocharset=utf8,file_mode=0777,dir_mode=0777,noperm
+NFS mount
+
+.. code-block:: yaml
+
+ linux:
+ storage:
+ enabled: true
+ mount:
+ nfs_glance:
+ enabled: true
+ path: /var/lib/glance/images
+ device: 172.16.10.110:/var/nfs/glance
+ file_system: nfs
+ opts: rw,sync
+
+
File swap configuration
.. code-block:: yaml
diff --git a/linux/files/60-net-txqueue.rules b/linux/files/60-net-txqueue.rules
new file mode 100644
index 0000000..7805c9c
--- /dev/null
+++ b/linux/files/60-net-txqueue.rules
@@ -0,0 +1 @@
+KERNEL==”tap[0-9a-z\-]*", RUN+="/sbin/ip link set %k txqueuelen {{ network.tap_custom_txqueuelen }}"
\ No newline at end of file
diff --git a/linux/files/etc_environment b/linux/files/etc_environment
index 3b6f480..0ffa7e1 100644
--- a/linux/files/etc_environment
+++ b/linux/files/etc_environment
@@ -11,22 +11,22 @@
{%- endfor %}
{%- if ftp_proxy and ftp_proxy.lower() != 'none' %}
-ftp_proxy="{{ ftp_proxy }}";
-FTP_PROXY="{{ ftp_proxy }}";
+ftp_proxy="{{ ftp_proxy }}"
+FTP_PROXY="{{ ftp_proxy }}"
{%- endif %}
{%- if http_proxy and http_proxy.lower() != 'none' %}
-http_proxy="{{ http_proxy }}";
-HTTP_PROXY="{{ http_proxy }}";
+http_proxy="{{ http_proxy }}"
+HTTP_PROXY="{{ http_proxy }}"
{%- endif %}
{%- if https_proxy and https_proxy.lower() != 'none' %}
-https_proxy="{{ https_proxy }}";
-HTTPS_PROXY="{{ https_proxy }}";
+https_proxy="{{ https_proxy }}"
+HTTPS_PROXY="{{ https_proxy }}"
{%- endif %}
{%- if no_proxy %}
-no_proxy="{{ no_proxy|join(',') }}";
-NO_PROXY="{{ no_proxy|join(',') }}";
+no_proxy="{{ no_proxy|join(',') }}"
+NO_PROXY="{{ no_proxy|join(',') }}"
{%- endif %}
diff --git a/linux/network/interface.sls b/linux/network/interface.sls
index ad695ae..bed9a3f 100644
--- a/linux/network/interface.sls
+++ b/linux/network/interface.sls
@@ -292,3 +292,13 @@
- enable: false
{%- endif %}
+
+{%- if network.tap_custom_txqueuelen is defined %}
+
+/etc/udev/rules.d/60-net-txqueue.rules:
+ file.managed:
+ - source: salt://linux/files/60-net-txqueue.rules
+ - mode: 755
+ - template: jinja
+
+{%- endif %}
diff --git a/linux/system/profile.sls b/linux/system/profile.sls
index 1ccea1e..7e1fb28 100644
--- a/linux/system/profile.sls
+++ b/linux/system/profile.sls
@@ -1,12 +1,6 @@
{%- from "linux/map.jinja" import system with context %}
{%- if system.enabled %}
-/etc/profile.d:
- file.directory:
- - user: root
- - mode: 750
- - makedirs: true
-
profile.d_clean:
file.directory:
- name: /etc/profile.d
@@ -19,7 +13,6 @@
profile.d_script_{{ name }}:
file.managed:
- name: /etc/profile.d/salt_profile_{{ name }}{%if name.split('.')|length == 1 %}.sh{% endif %}
- - mode: 755
- source:
- salt://linux/files/etc_profile_{{ name }}
- salt://linux/files/etc_profile
diff --git a/linux/system/repo.sls b/linux/system/repo.sls
index 5a4dce7..abb0ffb 100644
--- a/linux/system/repo.sls
+++ b/linux/system/repo.sls
@@ -88,6 +88,7 @@
- architectures: {{ repo.architectures }}
{%- endif %}
- file: /etc/apt/sources.list.d/{{ name }}.list
+ - clean_file: {{ repo.clean|default(True) }}
{%- if repo.key_id is defined %}
- keyid: {{ repo.key_id }}
{%- endif %}