4036 Commits

Author SHA1 Message Date
Jenkins
3a35abe4a1 Merge "Remove Disable HAProxy option from Quick Start Guide" 2016-04-13 09:23:56 +00:00
Jenkins
030619535e Merge "Update Mongodb dockerfile for formatting" 2016-04-13 08:57:43 +00:00
Jenkins
b2a3d3bb8b Merge "Update Neutron dockerfiles for formatting" 2016-04-13 08:57:36 +00:00
Jenkins
f40d4dee80 Merge "Update tgtd & iscsid dockerfiles for formatting" 2016-04-13 08:51:46 +00:00
Jenkins
ffc5e11d93 Merge "Update Cinder dockerfiles for formatting" 2016-04-13 08:49:53 +00:00
Jenkins
f36d1c5866 Merge "Update Zaqar dockerfile for formatting" 2016-04-13 08:42:11 +00:00
Jenkins
03b64058a2 Merge "Update Trove dockerfiles for formatting" 2016-04-13 08:42:04 +00:00
Jenkins
d3eba7bab3 Merge "Update Memcached dockerfile for formatting" 2016-04-13 08:34:38 +00:00
Jenkins
b042f4d517 Merge "Update Swift dockerfiles for formatting" 2016-04-13 07:49:13 +00:00
Jenkins
25f322d5d3 Merge "Update OpenVSwitch dockerfile for formatting" 2016-04-13 07:48:37 +00:00
Jenkins
b5658d376e Merge "Update Aodh dockerfiles for formatting" 2016-04-13 07:48:30 +00:00
Jenkins
c7ea6aa13e Merge "Update Ceilometer dockerfiles for formatting" 2016-04-13 07:48:23 +00:00
Jenkins
0a3fa59241 Merge "Update Gnocchi dockerfiles for formatting" 2016-04-13 07:48:16 +00:00
Jenkins
725505c906 Merge "Update Heat dockerfiles for formatting" 2016-04-13 07:48:09 +00:00
Jenkins
c631d94d95 Merge "Update Heka dockerfile for formatting" 2016-04-13 07:48:02 +00:00
Jenkins
de2488aa09 Merge "Update Ironic dockerfile for formatting" 2016-04-13 07:47:55 +00:00
Jenkins
4075c3ecbe Merge "Update Magnum dockerfiles for formatting" 2016-04-13 07:43:29 +00:00
Jenkins
3bb813075a Merge "Update Manila dockerfile for formatting" 2016-04-13 07:42:42 +00:00
Jenkins
135ae2cf8c Merge "Update Marathon dockerfile for formatting" 2016-04-13 07:38:28 +00:00
Jenkins
807892dead Merge "Update Mariadb dockerfile for formatting" 2016-04-13 07:38:19 +00:00
Jenkins
ace413f11d Merge "Update Mesos dockerfiles for formatting" 2016-04-13 07:18:15 +00:00
Jenkins
14121d5f47 Merge "Add missing base os values to kolla-build.conf" 2016-04-13 07:16:55 +00:00
Steven Dake
11e5b7dfa9 Make Heat bootstrapping idempotent
Change-Id: I155707ec6c1973d2a36606a0c73e57bda58ed037
Closes-Bug: #1569696
2016-04-12 23:10:13 -07:00
Swapnil Kulkarni (coolsvap)
22c9cb3a42 Update Neutron dockerfiles for formatting
Change-Id: I19298f750e3bbf6fee12129d424b2c2b8810464c
Partial-Bug:#1569417
2016-04-13 10:16:37 +05:30
Jenkins
3e1acf005e Merge "Fix launch vm failed in neutron-linuxbridge-agent env" 2016-04-13 04:34:03 +00:00
Swapnil Kulkarni (coolsvap)
57616d0ee6 Update tgtd & iscsid dockerfiles for formatting
Change-Id: Ide6c0f96338acfabda96e200c39be3ac899cd591
Partial-Bug:#1569417
2016-04-13 08:03:24 +05:30
Swapnil Kulkarni (coolsvap)
62bffa7436 Update Cinder dockerfiles for formatting
Change-Id: I73a97fa7b7f4a38aea778d9e7e482f35e22c62a8
Partial-Bug:#1569417
2016-04-13 08:01:19 +05:30
Kuo-tung Kao
5c5e903973 check /e/s/s/docker.service in ubuntu
check "/etc/systemd/system/docker.service" instead of
"/lib/systemd/system/docker.service" in ubuntu.

In Ubuntu,
the settings in "/etc/systemd/system/docker.service"
will overwrite the settings in "/lib/systemd/system/docker.service"

Change-Id: Idd5b99643b4fb9a4800f5d450e9aaeb22210aa8b
Closes-Bug: #1569644
2016-04-13 10:30:47 +08:00
Dave McCowan
c2ccf572d6 Remove Disable HAProxy option from Quick Start Guide
The disable HAProxy option is not commonly used and not
recommended.  This patch moves the section that describes it
out of the Quick Start Guide and into the Advanced Configuration
Guide.

Change-Id: Iccd8a6369d772bd85f304cba0a99300180a369c8
Closes-Bug: #1569560
2016-04-12 16:27:56 -04:00
Jenkins
544c00b497 Merge "Adds iscsid and tgtd docker containers" 2016-04-12 19:38:46 +00:00
Serguei Bezverkhi
c605d6ca26 Add iscsid/tgtd specific parameters to Kolla infrastructure
This partially implements iscsi and lvm2 support for cinder
in Kolla. Add integration with Kolla infrastructure.

Change-Id: I5b7d59163518080f38aec0c00617440de0763f1d
Implements: blueprint iscsi-lvm2-docker
2016-04-12 14:58:15 -04:00
Serguei Bezverkhi
6c2d7c7944 Adds ansible code for iscsid and tgtd containers
This partially implements iscsi and lvm2 support for cinder
in Kolla. Adds ansible code for iscsid and tgtd containers.

Change-Id: I2a4cfcf104397396ea61a09637d9ef3fc77b515f
Partially-Implements: blueprint iscsi-lvm2-docker
2016-04-12 14:58:15 -04:00
Swapnil Kulkarni (coolsvap)
480d94ed72 Update Zaqar dockerfile for formatting
Change-Id: I13244ac51ad24e04bbaed7eecef1b1255d0ce008
Partial-Bug:#1569417
2016-04-12 22:10:10 +05:30
Swapnil Kulkarni (coolsvap)
0efd4e2567 Update Trove dockerfiles for formatting
Change-Id: Ia3fef63d4aae1a342f376cd9653a2fe4a820aa7e
Partial-Bug:#1569417
2016-04-12 22:08:02 +05:30
Swapnil Kulkarni (coolsvap)
7959c9ffc8 Update Swift dockerfiles for formatting
Change-Id: Ib61f757e20aaec5941fd989ed5a4cd44f1424a80
Partial-Bug:#1569417
2016-04-12 22:04:52 +05:30
Swapnil Kulkarni (coolsvap)
ddf3282c59 Update OpenVSwitch dockerfile for formatting
Change-Id: Ie76b3ada37266aded0bd9808dffdc1b578be1172
Partial-Bug:#1569417
2016-04-12 22:01:43 +05:30
Swapnil Kulkarni (coolsvap)
3d1e4f4836 Update Mongodb dockerfile for formatting
Change-Id: Id3241ee4512723ce4afca7c904de5287e06160be
Partial-Bug:#1569417
2016-04-12 21:51:32 +05:30
Swapnil Kulkarni (coolsvap)
349d32fcec Update Mesos dockerfiles for formatting
Change-Id: I933c483912e4a7c5b59623357329c98961dfdb57
Partial-Bug:#1569417
2016-04-12 21:49:00 +05:30
Swapnil Kulkarni (coolsvap)
7b3bfc40e3 Update Memcached dockerfile for formatting
Change-Id: I7a234770c0728f064fcebf8ddb934452c548633b
Partial-Bug:#1569417
2016-04-12 21:47:04 +05:30
Swapnil Kulkarni (coolsvap)
7294ed9d90 Update Mariadb dockerfile for formatting
Change-Id: I6f5b28dc6520e3d31f413b0da708d9b14c9e9671
Partial-Bug:#1569417
2016-04-12 21:45:20 +05:30
Swapnil Kulkarni (coolsvap)
84aceccf27 Update Manila dockerfile for formatting
Change-Id: I83a7292ce84cd951de0127e6d3593e4e3beb43af
Partial-Bug:#1569417
2016-04-12 16:14:10 +00:00
Swapnil Kulkarni (coolsvap)
b028831d96 Update Marathon dockerfile for formatting
Change-Id: Ie50b130b536741fc55fd33f2c5a4c71ea4dc2b56
Partial-Bug:#1569417
2016-04-12 21:43:17 +05:30
Swapnil Kulkarni (coolsvap)
2a19d8e6e3 Update Magnum dockerfiles for formatting
Change-Id: Ieaad94d423d58b153bbf7f634be44a0e48ac775f
Partial-Bug:#1569417
2016-04-12 21:37:56 +05:30
Swapnil Kulkarni (coolsvap)
e561ce2fc2 Update Ironic dockerfile for formatting
Change-Id: I73fd2030f353f7daa35e71b62491cdf0b3fcf5cf
Partial-Bug:#1569417
2016-04-12 21:31:01 +05:30
Swapnil Kulkarni (coolsvap)
b1f3aa0c1c Update Heka dockerfile for formatting
Change-Id: Ib5cab0200f6e8fbea3de89624067771e92024b2f
Partial-Bug:#1569417
2016-04-12 21:27:54 +05:30
Swapnil Kulkarni (coolsvap)
d206bd1b8b Update Heat dockerfiles for formatting
Change-Id: Ic6cc78f2d105dd6ae9de200fee40e9fa2031088f
Partial-Bug:#1569417
2016-04-12 21:24:59 +05:30
Swapnil Kulkarni (coolsvap)
9fe4d3585c Update Gnocchi dockerfiles for formatting
Change-Id: I9a3560e3ec207f5aff0a0d8e608ab481989a8d82
Partial-Bug:#1569417
2016-04-12 21:21:46 +05:30
Swapnil Kulkarni (coolsvap)
2075d27c11 Update Aodh dockerfiles for formatting
Change-Id: Icd64f9798482cfaea05dc34eb9f799e7b0f32188
Partial-Bug:#1569417
2016-04-12 15:33:49 +00:00
Swapnil Kulkarni (coolsvap)
970075d49a Update Ceilometer dockerfiles for formatting
Change-Id: If5ead9a476a9fede105b328d7ba7422b45eae8a7
Partial-Bug:#1569417
2016-04-12 20:57:37 +05:30
Jenkins
35e379a97c Merge "Create /var/cache/swift in source installation" 2016-04-12 15:22:34 +00:00