aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-10-17 15:27:37 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-10-18 02:32:39 +0000
commit558d8ae99879d91e8a0334708dcd214c5951c6ae (patch)
tree413807e346f907aa3e298b7252d731743025909e
parente29a09df239e36991f5210da3934ee291a47a4ec (diff)
downloadkolla-558d8ae99879d91e8a0334708dcd214c5951c6ae.tar.gz
kolla-558d8ae99879d91e8a0334708dcd214c5951c6ae.zip
Fix neutron upgrade permission issue
Change-Id: Id4e9d019ee5072b3a24e383174a2acfdb3ed984d Partial-Bug: #1631503
-rw-r--r--ansible/roles/neutron/templates/neutron-dhcp-agent.json.j212
-rw-r--r--ansible/roles/neutron/templates/neutron-l3-agent.json.j212
-rw-r--r--ansible/roles/neutron/templates/neutron-lbaas-agent.json.j212
-rw-r--r--ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j27
-rw-r--r--ansible/roles/neutron/templates/neutron-metadata-agent.json.j212
-rw-r--r--ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j27
-rw-r--r--ansible/roles/neutron/templates/neutron-server.json.j27
-rw-r--r--ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j212
8 files changed, 81 insertions, 0 deletions
diff --git a/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2 b/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2
index bdd30c42e..f5eed2a52 100644
--- a/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-dhcp-agent.json.j2
@@ -25,5 +25,17 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ },
+ {
+ "path": "/var/lib/neutron/kolla",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-l3-agent.json.j2 b/ansible/roles/neutron/templates/neutron-l3-agent.json.j2
index 24bcc2849..d3ef7653f 100644
--- a/ansible/roles/neutron/templates/neutron-l3-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-l3-agent.json.j2
@@ -25,5 +25,17 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ },
+ {
+ "path": "/var/lib/neutron/kolla",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
index 6bb45cdee..0955c3051 100644
--- a/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-lbaas-agent.json.j2
@@ -19,5 +19,17 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ },
+ {
+ "path": "/var/lib/neutron/kolla",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2 b/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
index 0da4f5a16..6055414af 100644
--- a/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-linuxbridge-agent.json.j2
@@ -13,5 +13,12 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2 b/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2
index ba0d1b9c9..205ad3bd3 100644
--- a/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-metadata-agent.json.j2
@@ -19,5 +19,17 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ },
+ {
+ "path": "/var/lib/neutron/kolla",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2 b/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
index 36a9a03f7..853db8108 100644
--- a/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-openvswitch-agent.json.j2
@@ -13,5 +13,12 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-server.json.j2 b/ansible/roles/neutron/templates/neutron-server.json.j2
index 54fed2e00..36402f0a5 100644
--- a/ansible/roles/neutron/templates/neutron-server.json.j2
+++ b/ansible/roles/neutron/templates/neutron-server.json.j2
@@ -25,5 +25,12 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}
diff --git a/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2 b/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2
index dff9c44d9..2c0853d48 100644
--- a/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2
+++ b/ansible/roles/neutron/templates/neutron-vpnaas-agent.json.j2
@@ -31,5 +31,17 @@
"owner": "neutron",
"perm": "0600"
}
+ ],
+ "permissions": [
+ {
+ "path": "/var/log/kolla/neutron",
+ "owner": "neutron:neutron",
+ "recurse": true
+ },
+ {
+ "path": "/var/lib/neutron/kolla",
+ "owner": "neutron:neutron",
+ "recurse": true
+ }
]
}