From 02f46ab25503474e79c923339f3d3272f041dee6 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 2 Feb 2015 19:17:38 +0000 Subject: Add persistence-administrator and dependencies --- strata/genivi.morph | 25 +++++++++++++++++++++++++ strata/genivi/libarchive.morph | 6 ++++++ strata/genivi/persistence-administrator.morph | 5 +++++ strata/genivi/persistence-common-object.morph | 5 +++++ 4 files changed, 41 insertions(+) create mode 100644 strata/genivi/libarchive.morph create mode 100644 strata/genivi/persistence-administrator.morph create mode 100644 strata/genivi/persistence-common-object.morph diff --git a/strata/genivi.morph b/strata/genivi.morph index c8fe1532..062db399 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -3,6 +3,7 @@ kind: stratum description: Software components designed by genivi, for genivi. build-depends: - morph: strata/foundation.morph +- morph: strata/audio-bluetooth.morph chunks: - name: linuxquota morph: strata/genivi/linuxquota.morph @@ -78,3 +79,27 @@ chunks: build-depends: - DLT-daemon - persistence-client-library +- name: libarchive + morph: strata/genivi/libarchive.morph + repo: git://github.com/libarchive/libarchive.git + ref: 19f23e191f9d3e1dd2a518735046100419965804 + unpetrify-ref: v3.1.2 + build-depends: [] +- name: persistence-common-object + morph: strata/genivi/persistence-common-object.morph + repo: upstream:genivi/persistence-common-object + ref: dc46126214022d068729f7ccd47415dc5f86f425 + unpetrify-ref: baserock/pedroalvarez/1.0.2 + build-depends: + - itzam-tarball + - DLT-daemon +- name: persistence-administrator + morph: strata/genivi/persistence-administrator.morph + repo: upstream:genivi/persistence-administrator + ref: f9d62e70237c05323cbd60f1d5c7b574fbc2de43 + unpetrify-ref: baserock/pedroalvarez/1.0.5 + build-depends: + - persistence-common-object + - DLT-daemon + - libarchive + - node-state-manager diff --git a/strata/genivi/libarchive.morph b/strata/genivi/libarchive.morph new file mode 100644 index 00000000..bf840f58 --- /dev/null +++ b/strata/genivi/libarchive.morph @@ -0,0 +1,6 @@ +name: libarchive +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-acl diff --git a/strata/genivi/persistence-administrator.morph b/strata/genivi/persistence-administrator.morph new file mode 100644 index 00000000..f4fd07a5 --- /dev/null +++ b/strata/genivi/persistence-administrator.morph @@ -0,0 +1,5 @@ +name: persistence-administrator +kind: chunk +build-system: autotools +pre-configure-commands: +- chmod +x autogen.sh diff --git a/strata/genivi/persistence-common-object.morph b/strata/genivi/persistence-common-object.morph new file mode 100644 index 00000000..179a6031 --- /dev/null +++ b/strata/genivi/persistence-common-object.morph @@ -0,0 +1,5 @@ +name: persistence-common-object +kind: chunk +build-system: autotools +pre-configure-commands: +- chmod +x autogen.sh -- cgit v1.2.1 From 8cb780490026cc11c225bddb51f7432fe3621013 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 3 Mar 2015 17:15:50 +0000 Subject: Upgrade persistence-client-library to v1.0.0 --- strata/genivi.morph | 22 ++++++++++++---------- strata/genivi/persistence-client-library.morph | 6 ++++++ 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 strata/genivi/persistence-client-library.morph diff --git a/strata/genivi.morph b/strata/genivi.morph index 062db399..6f03fc52 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -65,11 +65,21 @@ chunks: ref: 4ebcf671416927b64475da7b810b6016c847bf73 unpetrify-ref: baserock/genivi/baseline build-depends: [] +- name: persistence-common-object + morph: strata/genivi/persistence-common-object.morph + repo: upstream:genivi/persistence-common-object + ref: dc46126214022d068729f7ccd47415dc5f86f425 + unpetrify-ref: baserock/pedroalvarez/1.0.2 + build-depends: + - itzam-tarball + - DLT-daemon - name: persistence-client-library + morph: strata/genivi/persistence-client-library.morph repo: upstream:genivi/persistence-client-library - ref: 0934ba263e69be8453cc3150f997dad28489f0c7 - unpetrify-ref: baserock/genivi/baseline + ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80 + unpetrify-ref: baserock/pedroalvarez/v1.0.0 build-depends: + - persistence-common-object - DLT-daemon - itzam-tarball - name: node-state-manager @@ -85,14 +95,6 @@ chunks: ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 build-depends: [] -- name: persistence-common-object - morph: strata/genivi/persistence-common-object.morph - repo: upstream:genivi/persistence-common-object - ref: dc46126214022d068729f7ccd47415dc5f86f425 - unpetrify-ref: baserock/pedroalvarez/1.0.2 - build-depends: - - itzam-tarball - - DLT-daemon - name: persistence-administrator morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator diff --git a/strata/genivi/persistence-client-library.morph b/strata/genivi/persistence-client-library.morph new file mode 100644 index 00000000..6ea6aef2 --- /dev/null +++ b/strata/genivi/persistence-client-library.morph @@ -0,0 +1,6 @@ +name: persistence-client-library +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-werror -- cgit v1.2.1 From 127319cf6c726ff729dde1f4128fe7a19e7bef56 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 4 Mar 2015 14:36:08 +0000 Subject: Add x-common to the genivi systems --- systems/genivi-baseline-system-armv7lhf-jetson.morph | 2 ++ systems/genivi-baseline-system-armv7lhf-versatile.morph | 2 ++ systems/genivi-baseline-system-x86_64-generic.morph | 2 ++ 3 files changed, 6 insertions(+) diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 50581561..512248e2 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -33,6 +33,8 @@ strata: morph: strata/input-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 16bed197..ee089536 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -31,6 +31,8 @@ strata: morph: strata/graphics-common.morph - name: input-common morph: strata/input-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f4828688..d50068e9 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -35,6 +35,8 @@ strata: morph: strata/llvm-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: x-common + morph: strata/x-common.morph - name: weston-genivi morph: strata/weston-genivi.morph configuration-extensions: -- cgit v1.2.1 From 797163858d3bac0aae11faccc250d6e48468b5ca Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 5 Mar 2015 19:03:58 +0000 Subject: Add node-health-monitor to genivi.morph --- strata/genivi.morph | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/strata/genivi.morph b/strata/genivi.morph index 6f03fc52..bc03de45 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -105,3 +105,11 @@ chunks: - DLT-daemon - libarchive - node-state-manager +- name: node-health-monitor + repo: upstream:genivi/node-health-monitor + ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0 + unpetrify-ref: baserock/pedroalvarez/1.3.3 + build-depends: + - node-state-manager + - persistence-client-library + - DLT-daemon -- cgit v1.2.1 From 7b6512340fa31b02a497e32a6c9b8b8c52aa49fe Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 6 Mar 2015 11:11:10 +0000 Subject: Install systemd units in DLT-daemon --- strata/genivi.morph | 1 + strata/genivi/DLT-daemon.morph | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 strata/genivi/DLT-daemon.morph diff --git a/strata/genivi.morph b/strata/genivi.morph index bc03de45..ef8d670b 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -12,6 +12,7 @@ chunks: unpetrify-ref: baserock/genivi/morph build-depends: [] - name: DLT-daemon + morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon ref: 8b48e73f79b4463393916e4c6696917e3dedd026 unpetrify-ref: v2.10.0 diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph new file mode 100644 index 00000000..e22e31e3 --- /dev/null +++ b/strata/genivi/DLT-daemon.morph @@ -0,0 +1,5 @@ +name: DLT-deamon +kind: chunk +build-system: cmake +configure-commands: +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_SYSTEMD=ON -- cgit v1.2.1 From d3cde58109cfe415a6545d9eafa6caadf8f43b1b Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 6 Mar 2015 13:07:24 +0000 Subject: Fix merge 6f6ae875a9026949d8c143c54b2dd39fe7280cb3 I forgot to change personal branches for non-personal ones when doing this merge. --- strata/genivi.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/genivi.morph b/strata/genivi.morph index ef8d670b..f91bda09 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -70,7 +70,7 @@ chunks: morph: strata/genivi/persistence-common-object.morph repo: upstream:genivi/persistence-common-object ref: dc46126214022d068729f7ccd47415dc5f86f425 - unpetrify-ref: baserock/pedroalvarez/1.0.2 + unpetrify-ref: baserock/1.0.2 build-depends: - itzam-tarball - DLT-daemon @@ -78,7 +78,7 @@ chunks: morph: strata/genivi/persistence-client-library.morph repo: upstream:genivi/persistence-client-library ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80 - unpetrify-ref: baserock/pedroalvarez/v1.0.0 + unpetrify-ref: baserock/v1.0.0 build-depends: - persistence-common-object - DLT-daemon @@ -100,7 +100,7 @@ chunks: morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator ref: f9d62e70237c05323cbd60f1d5c7b574fbc2de43 - unpetrify-ref: baserock/pedroalvarez/1.0.5 + unpetrify-ref: baserock/1.0.5 build-depends: - persistence-common-object - DLT-daemon @@ -109,7 +109,7 @@ chunks: - name: node-health-monitor repo: upstream:genivi/node-health-monitor ref: 2af264563ef1b60ba2636cbf5e8cd6a7ed07b0c0 - unpetrify-ref: baserock/pedroalvarez/1.3.3 + unpetrify-ref: baserock/1.3.3 build-depends: - node-state-manager - persistence-client-library -- cgit v1.2.1 From 4c462d124de7163a0d4c122bcce5b791b848aa63 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 6 Mar 2015 13:10:21 +0000 Subject: Use latest morph --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 86f41271..05b7c149 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -71,7 +71,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: a2645411b875a5faae17489c5b4bb11670b36259 + ref: 9e105fccb12de23551c93aac6cb2b1056b858700 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 3766dd82f92a58e47e4f80b1c9583f88f553fcd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 5 Mar 2015 16:32:17 +0000 Subject: strata/build-essential: Update busybox to latest (1.23.1) --- strata/build-essential.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/build-essential.morph b/strata/build-essential.morph index e7da1784..ac88b860 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -136,8 +136,8 @@ chunks: - name: stage2-busybox morph: strata/build-essential/stage2-busybox.morph repo: upstream:busybox - ref: 8a801e0f024f1385d8e989b80b90443546bceae7 - unpetrify-ref: baserock/build-essential + ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca + unpetrify-ref: 1_23_1 build-depends: - stage1-binutils - stage1-gcc @@ -294,8 +294,8 @@ chunks: - name: busybox morph: strata/build-essential/busybox.morph repo: upstream:busybox - ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c - unpetrify-ref: baserock/build-essential + ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca + unpetrify-ref: 1_23_1 build-depends: - stage2-binutils - stage2-busybox -- cgit v1.2.1 From ced4ed5f7aa35b46d161c5efea972699826f09de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 4 Mar 2015 18:35:21 +0000 Subject: Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1) --- VERSION | 2 +- strata/NetworkManager-common.morph | 2 -- strata/ansible.morph | 1 - strata/apache-httpd-server.morph | 2 -- strata/armv7lhf-cross-toolchain.morph | 2 -- strata/audio-bluetooth.morph | 8 -------- strata/baserock-import.morph | 4 ---- strata/bsp-armv7-highbank.morph | 1 - strata/bsp-armv7-versatile.morph | 1 - strata/bsp-armv7b-highbank.morph | 1 - strata/bsp-armv7b-vexpress-tc2.morph | 1 - strata/bsp-armv8l64-generic.morph | 1 - strata/bsp-jetson.morph | 4 ---- strata/bsp-ppc64-generic.morph | 1 - strata/bsp-wandboard.morph | 1 - strata/bsp-x86_32-generic.morph | 2 -- strata/bsp-x86_64-generic.morph | 2 -- strata/bsp-x86_both-tools.morph | 1 - strata/build-essential.morph | 3 --- strata/ceph-service.morph | 6 ------ strata/chef.morph | 29 ----------------------------- strata/cloudinit-support.morph | 3 --- strata/connectivity.morph | 2 -- strata/connman-common.morph | 1 - strata/core.morph | 10 ---------- strata/coreutils-common.morph | 1 - strata/cross-bootstrap.morph | 3 --- strata/cross-tools.morph | 1 - strata/cxmanage.morph | 4 ---- strata/databases.morph | 4 ---- strata/devtools.morph | 4 ---- strata/django.morph | 3 --- strata/enlightenment.morph | 2 -- strata/erlang.morph | 1 - strata/foundation.morph | 12 ------------ strata/genivi.morph | 6 ------ strata/gitlab.morph | 3 --- strata/graphics-common.morph | 6 ------ strata/gtk-deps.morph | 5 ----- strata/gtk2.morph | 1 - strata/gtk3.morph | 1 - strata/initramfs-utils.morph | 1 - strata/input-common.morph | 3 --- strata/installer-utils.morph | 1 - strata/libdrm-common.morph | 1 - strata/lighttpd-server.morph | 1 - strata/llvm-common.morph | 1 - strata/lorry-controller.morph | 1 - strata/lorry.morph | 9 --------- strata/lua.morph | 2 -- strata/lvm.morph | 1 - strata/mesa-common.morph | 1 - strata/morph-utils.morph | 8 -------- strata/multimedia-common.morph | 1 - strata/multimedia-gstreamer-0.10.morph | 1 - strata/multimedia-gstreamer.morph | 1 - strata/network-security.morph | 1 - strata/networking-utils.morph | 2 -- strata/nfs.morph | 2 -- strata/nodejs.morph | 1 - strata/ntpd.morph | 1 - strata/openstack-clients.morph | 5 ----- strata/openstack-common.morph | 12 ------------ strata/patch-manager-gerrit.morph | 1 - strata/pcre-utils.morph | 1 - strata/python-common.morph | 5 ----- strata/python-core.morph | 3 --- strata/python-tools.morph | 1 - strata/python3-core.morph | 1 - strata/qt4-sdk.morph | 1 - strata/qt4-tools.morph | 2 -- strata/qt5-sdk.morph | 1 - strata/qt5-tools-qtmultimedia.morph | 1 - strata/qt5-tools-qtwebkit.morph | 1 - strata/qt5-tools.morph | 1 - strata/ruby.morph | 2 -- strata/tools.morph | 13 ------------- strata/trove.morph | 3 --- strata/virtualbox-guest-x86_64.morph | 1 - strata/virtualization.morph | 11 ----------- strata/wayland-generic.morph | 1 - strata/webtools.morph | 4 ---- strata/weston-common.morph | 1 - strata/weston-genivi.morph | 1 - strata/x-common.morph | 26 -------------------------- strata/x-generic.morph | 6 ------ strata/xfce.morph | 7 ------- strata/xorg-util-macros-common.morph | 1 - strata/xstatic.morph | 25 ------------------------- strata/zookeeper-client.morph | 1 - strata/zookeeper-server.morph | 1 - strata/zookeeper.morph | 2 -- 92 files changed, 1 insertion(+), 329 deletions(-) diff --git a/VERSION b/VERSION index 85260cb1..b8255184 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version: 0 +version: 1 diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 8115c309..93b94dff 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:libndp ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 unpetrify-ref: v1.4 - build-depends: [] - name: readline6 repo: upstream:readline ref: 7628b745a813aac53586b640da056a975f1c443e unpetrify-ref: readline-6.3 - build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph repo: upstream:NetworkManager diff --git a/strata/ansible.morph b/strata/ansible.morph index 5903017a..33a23750 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:ansible ref: ebc8d48d34296fe010096f044e2b7591df37a622 unpetrify-ref: baserock/v1.8.4 - build-depends: [] diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 065ec155..7a403535 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk - build-depends: [] - name: httpd morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd @@ -23,7 +22,6 @@ chunks: repo: upstream:python-packages/psutil ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 unpetrify-ref: release-2.2.0 - build-depends: [] - name: mod_wsgi-metrics repo: upstream:python-packages/mod_wsgi-metrics ref: ec715eb593255229f9f45f3f323edbb845c691d8 diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index a3539d65..f153e0c3 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -9,14 +9,12 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] - name: armv7lhf-cross-linux-api-headers morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph repo: upstream:linux ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa unpetrify-ref: baserock/v3.8 - build-depends: [] - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 829cf6f8..00a614c9 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -8,12 +8,10 @@ chunks: repo: upstream:libatomic_ops ref: 0a58f5d63969c10d2141af89cb7a53df786909ab unpetrify-ref: baserock/morph - build-depends: [] - name: alsa-lib repo: upstream:alsa-lib ref: 9cfd1faa27511edbb8bebbab85030125f33590ae unpetrify-ref: v1.0.28 - build-depends: [] - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils @@ -26,7 +24,6 @@ chunks: repo: upstream:libical ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 unpetrify-ref: baserock/morph - build-depends: [] - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez @@ -40,7 +37,6 @@ chunks: repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph - build-depends: [] - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc @@ -52,7 +48,6 @@ chunks: repo: upstream:speex ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa unpetrify-ref: baserock/morph - build-depends: [] - name: nohands morph: strata/audio-bluetooth/nohands.morph repo: upstream:nohands @@ -65,7 +60,6 @@ chunks: repo: upstream:mobile-broadband-provider-info ref: 4ed19e11c2975105b71b956440acdb25d46a347d unpetrify-ref: baserock/morph - build-depends: [] - name: ofono morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono @@ -79,13 +73,11 @@ chunks: repo: upstream:json-c ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch - build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph repo: upstream:libsndfile ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 unpetrify-ref: baserock/morph - build-depends: [] - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index 7ca5e7ce..a3a195db 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -8,22 +8,18 @@ chunks: repo: upstream:python-packages/ansicolor ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef unpetrify-ref: 0.2.4 - build-depends: [] - name: python-decorator repo: upstream:python-packages/python-decorator ref: b02f7a254c3679dfac57a824e08dd02ced850636 unpetrify-ref: decorator-3.4.0 - build-depends: [] - name: networkx repo: upstream:python-packages/networkx ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c unpetrify-ref: networkx-1.9.1 - build-depends: [] - name: requests-cache repo: upstream:python-packages/requests-cache ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf unpetrify-ref: 0.4.6 - build-depends: [] - name: baserock-import repo: baserock:baserock/import ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index bdf047cf..2cf541a7 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 529b563c..f8d19b9b 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 97ccfe3c..7b0f0fa0 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index f8a7ff00..616d564f 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index 63c4ff5b..a5edb9db 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -13,4 +13,3 @@ chunks: repo: upstream:linux ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge - build-depends: [] diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 111402a7..85ab5ecf 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -17,7 +17,6 @@ chunks: repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: u-boot@jetson morph: strata/bsp-jetson/u-boot@jetson.morph repo: upstream:u-boot @@ -30,13 +29,11 @@ chunks: repo: upstream:linux ref: 682c943b0159b1a4105f31020605bf8a0f155ffd unpetrify-ref: baserock/v3.18-with-cpufreq - build-depends: [] - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: [] - name: nouveau-drm morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau @@ -49,4 +46,3 @@ chunks: repo: upstream:linux-firmware ref: 9322ef5b14c78ec28163baa41bff240a0e098810 unpetrify-ref: baserock/jetson - build-depends: [] diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index 002c00be..58038d60 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4ffd2e0e..2ab095df 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: linux-armv7-wandboard morph: strata/bsp-wandboard/linux-armv7-wandboard.morph repo: upstream:linux diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 244745bf..10c4dbe5 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 04be0dcd..749e3722 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index b5bee9cb..f7212054 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux diff --git a/strata/build-essential.morph b/strata/build-essential.morph index ac88b860..0758fee8 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -46,7 +46,6 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] build-mode: bootstrap prefix: /tools @@ -150,7 +149,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] build-mode: bootstrap prefix: /tools @@ -159,7 +157,6 @@ chunks: repo: baserock:baserock/fhs-dirs ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4 unpetrify-ref: master - build-depends: [] build-mode: bootstrap prefix: /tools diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 1108ab4b..0fc987c4 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libaio ref: 08f50baec0e7731116d3f665c6155d7829edf5d7 unpetrify-ref: libaio-0.3.110-1 - build-depends: [] - name: keyutils morph: strata/ceph-service/keyutils.morph repo: upstream:keyutils ref: 9209a0c8fd63afc59f644e078b40cec531409c30 unpetrify-ref: v1.5.9 - build-depends: [] - name: libunwind repo: upstream:libunwind ref: d7322f0f64dab715c4feb5f08edef5660d8719c0 unpetrify-ref: v1.1 - build-depends: [] - name: gperftools repo: upstream:gperftools ref: 846b775dfadb77901202ae7ddbac30ad1de7df01 @@ -31,7 +28,6 @@ chunks: repo: upstream:snappy-git ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4 unpetrify-ref: master - build-depends: [] - name: leveldb morph: strata/ceph-service/leveldb.morph repo: upstream:leveldb @@ -44,13 +40,11 @@ chunks: repo: upstream:libeditline-tarball ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph - build-depends: [] - name: boost morph: strata/ceph-service/boost.morph repo: upstream:boost-tarball ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304 unpetrify-ref: boost_1_56_0 - build-depends: [] - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph diff --git a/strata/chef.morph b/strata/chef.morph index 9105a2e0..69b495aa 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:yajl ref: a0ecdde0c042b9256170f2f8890dd9451a4240aa unpetrify-ref: 2.1.0 - build-depends: [] - name: libyajl2-1.0.1 morph: strata/chef/libyajl2-1.0.1.morph repo: upstream:ruby-gems/libyajl2-gem @@ -23,31 +22,26 @@ chunks: repo: upstream:ruby-gems/chef ref: 9841bc9c6271c6d9add3aff0c2e11239cfb129ca unpetrify-ref: 12.0.3 - build-depends: [] - name: chef-zero-2.2 morph: strata/chef/chef-zero-2.2.morph repo: upstream:ruby-gems/chef-zero ref: 231c3abd052e606820297a97e4bc32bdab656a02 unpetrify-ref: v2.2 - build-depends: [] - name: coderay-1.1.0.rc1 morph: strata/chef/coderay-1.1.0.morph repo: upstream:ruby-gems/coderay ref: a48037b85a12228431b32103786456f36beb355f unpetrify-ref: v1.1.0 - build-depends: [] - name: erubis-master morph: strata/chef/erubis-master.morph repo: upstream:ruby-gems/erubis ref: 14d3eab57fbc361312c8f3af350cbf9a5bafce17 unpetrify-ref: master - build-depends: [] - name: ffi-1.9.3 morph: strata/chef/ffi-1.9.3.morph repo: upstream:ruby-gems/ffi ref: d982b7049336106c04f7721045dc5613b16d3545 unpetrify-ref: 1.9.3 - build-depends: [] - name: ffi-yajl-1.0.2 morph: strata/chef/ffi-yajl-master.morph repo: upstream:ruby-gems/ffi-yajl @@ -60,19 +54,16 @@ chunks: repo: upstream:ruby-gems/hashie ref: 95b97fbff2cac643d56ec718cb708665500682e5 unpetrify-ref: v2.1.2 - build-depends: [] - name: highline-1.6.21 morph: strata/chef/highline-master.morph repo: upstream:ruby-gems/highline ref: 51de22e436e6d45696759d673d7b9ceba16cae39 unpetrify-ref: master - build-depends: [] - name: hoe-master morph: strata/chef/hoe-master.morph repo: upstream:ruby-gems/hoe ref: d94b26b4687be0a24d04b7cb582753fbec33d7e4 unpetrify-ref: master - build-depends: [] - name: diff-lcs-1.2.5 morph: strata/chef/diff-lcs-1.2.5.morph repo: upstream:diff-lcs @@ -85,19 +76,16 @@ chunks: repo: upstream:ruby-gems/ipaddress ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845 unpetrify-ref: master - build-depends: [] - name: json-1.8.1 morph: strata/chef/json-1.8.1.morph repo: upstream:ruby-gems/json ref: 92a96dea2b24b9c68856004d69491f46aedd0925 unpetrify-ref: v1.8.1 - build-depends: [] - name: method_source-0.8.1 morph: strata/chef/method_source-0.8.2.morph repo: upstream:ruby-gems/method_source ref: 1b1f8323a7c25f29331fe32511f50697e5405dbd unpetrify-ref: v0.8.2 - build-depends: [] - name: mime-types-1.25.1 morph: strata/chef/mime-types-1.25.1.morph repo: upstream:ruby-gems/mime-types @@ -110,103 +98,86 @@ chunks: repo: upstream:ruby-gems/mixlib-authentication ref: db24a56c6f5b99114998a50942220a7023060229 unpetrify-ref: 1.3.0 - build-depends: [] - name: mixlib-cli-1.5.0 morph: strata/chef/mixlib-cli-1.5.0.morph repo: upstream:ruby-gems/mixlib-cli ref: b3b3c12141b5380ec61945770690fc1ae31d92b0 unpetrify-ref: 1.5.0 - build-depends: [] - name: mixlib-config-2.1.0 morph: strata/chef/mixlib-config-2.1.0.morph repo: upstream:ruby-gems/mixlib-config ref: c5e2dee2beb5fdd17442ff92e520f2ef01d17ee5 unpetrify-ref: v2.1.0 - build-depends: [] - name: mixlib-log-1.6.0 morph: strata/chef/mixlib-log-master.morph repo: upstream:ruby-gems/mixlib-log ref: 50ec55964ce19d3a8a14050be9a23c4b8990e2f0 unpetrify-ref: master - build-depends: [] - name: mixlib-shellout-1.4.0 morph: strata/chef/mixlib-shellout-1.4.0.morph repo: upstream:ruby-gems/mixlib-shellout ref: a04ce6db22edf0575c50e18ae2db09adced7dedc unpetrify-ref: 1.4.0 - build-depends: [] - name: net-dhcp-1.2.1 morph: strata/chef/net-dhcp-1.2.1.morph repo: upstream:net-dhcp-ruby ref: b644922a08aa09e2ce75f8f9f9fa1f0b8cecb2e9 unpetrify-ref: v1.2.1 - build-depends: [] - name: net-ssh-2.9.1 morph: strata/chef/net-ssh-2.9.1.morph repo: upstream:ruby-gems/net-ssh ref: 9f8607984d8e904f211cc5edb39ab2a2ca94008e unpetrify-ref: v2.9.1 - build-depends: [] - name: net-ssh-gateway-1.2.0 morph: strata/chef/net-ssh-gateway-1.2.0.morph repo: upstream:ruby-gems/net-ssh-gateway ref: 1de7611a7f7cedbe7a4c6cf3798c88d00637582d unpetrify-ref: v1.2.0 - build-depends: [] - name: net-ssh-multi-1.2.0 morph: strata/chef/net-ssh-multi-1.2.0.morph repo: upstream:ruby-gems/net-ssh-multi ref: b659f2884b2c9abdbe3bbf3c844937a0799ed5ac unpetrify-ref: v1.2.0 - build-depends: [] - name: ohai-7.4.0.dev morph: strata/chef/ohai-master.morph repo: upstream:ruby-gems/ohai ref: 0bf2ed32744445a253082910ee4e07b2b38023a7 unpetrify-ref: master - build-depends: [] - name: plist-master morph: strata/chef/plist-master.morph repo: upstream:ruby-gems/plist ref: 12eb82d283cab148183c37c07e3f75a309969dec unpetrify-ref: master - build-depends: [] - name: pry-0.10.1 morph: strata/chef/pry-master.morph repo: upstream:ruby-gems/pry ref: 6d5eb0831b50ec729d2dc3356255b49535535e37 unpetrify-ref: master - build-depends: [] - name: rack-1.5.2 morph: strata/chef/rack-1.5.2.morph repo: upstream:ruby-gems/rack ref: ac590d055c936bb9a618e955a690dc836c625211 unpetrify-ref: 1.5.2 - build-depends: [] - name: slop-3.6.0 morph: strata/chef/slop-3.6.0.morph repo: upstream:ruby-gems/slop ref: c3f84e7e794004f9ae6958c13ef3dd3038c2c0eb unpetrify-ref: v3.6.0 - build-depends: [] - name: systemu-2.6.4 morph: strata/chef/systemu-master.morph repo: upstream:ruby-gems/systemu ref: 35340f1e91941af47988b1b9d77705493b96d3db unpetrify-ref: master - build-depends: [] - name: wmi-lite-1.0.0 morph: strata/chef/wmi-lite-1.0.0.morph repo: upstream:ruby-gems/wmi-lite ref: 9377836dc0a5487474038ec727f02f9b33facfa6 unpetrify-ref: 1.0.0 - build-depends: [] - name: libpopt morph: strata/chef/libpopt.morph repo: upstream:libpopt ref: c224abf28f4ff9bbf292908324359cb5905addf8 unpetrify-ref: master - build-depends: [] - name: sgdisk morph: strata/chef/sgdisk.morph repo: upstream:sgdisk diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 5281b745..1c752e58 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -11,17 +11,14 @@ chunks: repo: upstream:configobj ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph - build-depends: [] - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed unpetrify-ref: baserock/morph - build-depends: [] - name: boto repo: upstream:boto ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf unpetrify-ref: baserock/morph - build-depends: [] - name: cloud-init morph: strata/cloudinit-support/cloud-init.morph repo: upstream:cloud-init diff --git a/strata/connectivity.morph b/strata/connectivity.morph index 2cc6bb69..dbd4a263 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:libnl ref: a2c4bd8f094a7247903578860a9c42049991860b unpetrify-ref: baserock/morph - build-depends: [] - name: wpa_supplicant morph: strata/connectivity/wpa_supplicant.morph repo: upstream:hostap @@ -19,4 +18,3 @@ chunks: repo: upstream:iptables ref: 482c6d3731e2681cb4baae835c294840300197e6 unpetrify-ref: v1.4.21 - build-depends: [] diff --git a/strata/connman-common.morph b/strata/connman-common.morph index f6f7ddb0..a22b7e90 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:connman ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 unpetrify-ref: baserock/1.24 - build-depends: [] diff --git a/strata/core.morph b/strata/core.morph index 5de96bd4..b424a023 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -9,37 +9,31 @@ chunks: repo: upstream:sqlite3 ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 - build-depends: [] - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake ref: 0b3781e4c497566acaa504d4106d11c02a642501 unpetrify-ref: v2.8.12.2 - build-depends: [] - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 unpetrify-ref: gdbm-1.11 - build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph repo: upstream:gettext-tarball ref: 482840e61f86ca321838a91e902c41d40c098bbb unpetrify-ref: gettext-0.19.4 - build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 unpetrify-ref: master - build-depends: [] - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 unpetrify-ref: ncurses-5.9-20150131 - build-depends: [] - name: perl morph: strata/core/perl.morph repo: upstream:perl @@ -76,7 +70,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] - name: flex morph: strata/core/flex.morph repo: upstream:flex @@ -97,7 +90,6 @@ chunks: repo: upstream:bzip2 ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 unpetrify-ref: baserock/morph - build-depends: [] - name: readline morph: strata/core/readline.morph repo: upstream:readline @@ -121,7 +113,6 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 - build-depends: [] - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 @@ -218,7 +209,6 @@ chunks: repo: upstream:gperf ref: 5094e4a539adf845111013f82c2c4fcaec637983 unpetrify-ref: baserock/morph - build-depends: [] - name: intltool repo: upstream:intltool ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4 diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2051cf50..f226f50b 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: [] - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 3aa61caf..ffed2e66 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph repo: upstream:openssh-git @@ -22,10 +21,8 @@ chunks: repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 - build-depends: [] diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph index c3e35e6d..36a82808 100644 --- a/strata/cross-tools.morph +++ b/strata/cross-tools.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:patchelf ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph index 057558b8..326f7a59 100644 --- a/strata/cxmanage.morph +++ b/strata/cxmanage.morph @@ -8,23 +8,19 @@ chunks: repo: upstream:ipmitool ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd unpetrify-ref: baserock/morph - build-depends: [] - name: pexpect morph: strata/cxmanage/pexpect.morph repo: upstream:pexpect ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c unpetrify-ref: baserock/morph - build-depends: [] - name: pyipmi repo: upstream:pyipmi ref: bb7dba84578c05ba87db3c4186a2989c89e4e519 unpetrify-ref: baserock/morph - build-depends: [] - name: tftpy repo: upstream:tftpy ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b unpetrify-ref: baserock/morph - build-depends: [] - name: cxmanage repo: upstream:cxmanage ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6 diff --git a/strata/databases.morph b/strata/databases.morph index 9171925c..89aa996e 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -10,19 +10,16 @@ chunks: repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 unpetrify-ref: REL9_3_4 - build-depends: [] - name: redis morph: strata/databases/redis.morph repo: upstream:redis ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 unpetrify-ref: baserock/3.0 - build-depends: [] - name: memcached morph: strata/databases/memcached.morph repo: upstream:memcached ref: c5530027c8ea28674358327ab8212ebaf014c848 unpetrify-ref: 1.4.22 - build-depends: [] - name: psycopg2 repo: upstream:python-packages/psycopg2 ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8 @@ -33,4 +30,3 @@ chunks: repo: upstream:python-packages/python-memcached ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db unpetrify-ref: master - build-depends: [] diff --git a/strata/devtools.morph b/strata/devtools.morph index 73ebd783..9a295db5 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -13,20 +13,16 @@ chunks: repo: upstream:vim ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 unpetrify-ref: baserock/morph - build-depends: [] - name: pv repo: upstream:pv ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a unpetrify-ref: baserock/morph - build-depends: [] - name: screen morph: strata/devtools/screen.morph repo: upstream:screen ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 unpetrify-ref: baserock/morph - build-depends: [] - name: less repo: upstream:less ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/django.morph b/strata/django.morph index 7659593c..8ae63801 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:python-packages/django ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb unpetrify-ref: 1.6.8 - build-depends: [] - name: django-appconf repo: upstream:python-packages/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 unpetrify-ref: 0.6 - build-depends: [] - name: django-compressor repo: upstream:python-packages/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 @@ -25,7 +23,6 @@ chunks: repo: upstream:python-packages/pyscss ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 unpetrify-ref: 1.2.1 - build-depends: [] - name: django-pyscss repo: upstream:python-packages/django-pyscss ref: 665270b54eea5de5aca379a78673b411ed6b1f04 diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 25eafce2..d1637f48 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -13,13 +13,11 @@ chunks: repo: upstream:fribidi ref: c9916f2ab289126a32febcc4754efc73a011fb0c unpetrify-ref: baserock/morph/0.19.6 - build-depends: [] - name: bullet3 morph: strata/enlightenment/bullet3.morph repo: upstream:bullet3 ref: 940059ddb3c4476bb9860f79f35b0b1230857f54 unpetrify-ref: baserock/morph - build-depends: [] - name: efl morph: strata/enlightenment/efl.morph repo: upstream:enlightenment/efl diff --git a/strata/erlang.morph b/strata/erlang.morph index bea09d61..d31e78cd 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:erlang ref: 9417f044ee3c291c2ea343c203aebdcc40597226 unpetrify-ref: OTP-17.3.4 - build-depends: [] - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/strata/foundation.morph b/strata/foundation.morph index d85ed9c4..775444c9 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -9,25 +9,21 @@ chunks: repo: upstream:attr ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph - build-depends: [] - name: groff morph: strata/foundation/groff.morph repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 - build-depends: [] - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz ref: a0782484f101ac55c916568bc1c490d7761fc904 unpetrify-ref: 2015a - build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -40,13 +36,11 @@ chunks: repo: upstream:libffi ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph - build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph - build-depends: [] - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -67,7 +61,6 @@ chunks: - name: libgpg-error repo: upstream:libgpg-error ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 - build-depends: [] - name: libgcrypt repo: upstream:libgcrypt ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 @@ -78,7 +71,6 @@ chunks: repo: upstream:linux-pam ref: b1521c97e73b10469f7b34c0571d51c647eca83c unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -108,13 +100,11 @@ chunks: repo: upstream:lzo ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 unpetrify-ref: lzo-2.08 - build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 unpetrify-ref: baserock/morph - build-depends: [] - name: acl morph: strata/foundation/acl.morph repo: upstream:acl @@ -127,7 +117,6 @@ chunks: repo: upstream:e2fsprogs ref: 6a3741ad293031447b95b88431eafa77401a8987 unpetrify-ref: v1.42.12 - build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs @@ -150,7 +139,6 @@ chunks: repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e unpetrify-ref: baserock/morph - build-depends: [] - name: openssh morph: strata/foundation/openssh.morph repo: upstream:openssh-git diff --git a/strata/genivi.morph b/strata/genivi.morph index f91bda09..197943cc 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linuxquota ref: 0804c89a16736533e440771dc42a15e5d0223902 unpetrify-ref: baserock/genivi/morph - build-depends: [] - name: DLT-daemon morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon ref: 8b48e73f79b4463393916e4c6696917e3dedd026 unpetrify-ref: v2.10.0 - build-depends: [] - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller @@ -29,7 +27,6 @@ chunks: repo: upstream:googletest ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08 unpetrify-ref: baserock/morph - build-depends: [] - name: googlemock morph: strata/genivi/googlemock.morph repo: upstream:googlemock @@ -42,7 +39,6 @@ chunks: repo: upstream:genivi-common-api-runtime ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 - build-depends: [] - name: genivi-common-api-dbus-runtime morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime @@ -65,7 +61,6 @@ chunks: repo: upstream:itzam-tarball ref: 4ebcf671416927b64475da7b810b6016c847bf73 unpetrify-ref: baserock/genivi/baseline - build-depends: [] - name: persistence-common-object morph: strata/genivi/persistence-common-object.morph repo: upstream:genivi/persistence-common-object @@ -95,7 +90,6 @@ chunks: repo: git://github.com/libarchive/libarchive.git ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 - build-depends: [] - name: persistence-administrator morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator diff --git a/strata/gitlab.morph b/strata/gitlab.morph index 0a1c35bb..ab77e7bb 100644 --- a/strata/gitlab.morph +++ b/strata/gitlab.morph @@ -9,16 +9,13 @@ chunks: repo: upstream:gitlab/gitlab-ce ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425 unpetrify-ref: baserock/v7.0.0 - build-depends: [] - name: gitlab-ci morph: strata/gitlab/gitlab-ci.morph repo: upstream:gitlab/gitlab-ci ref: c74044d65dec2ba8311e242c84e07a67abd52d37 unpetrify-ref: baserock/morph - build-depends: [] - name: gitlab-shell morph: strata/gitlab/gitlab-shell.morph repo: upstream:gitlab/gitlab-shell ref: 0b4106d57223c666d9360339fd3790174aa43800 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index baa935f5..d885ff72 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 - build-depends: [] - name: freetype2 repo: upstream:freetype2 ref: ec8853cd18e1a0c275372769bdad37a79550ed66 unpetrify-ref: VER-2-5-3 - build-depends: [] - name: fontconfig repo: upstream:fontconfig ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a @@ -26,22 +24,18 @@ chunks: repo: upstream:freefont-otf ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 unpetrify-ref: baserock/morph - build-depends: [] - name: libpng repo: upstream:libpng ref: 259fb7761d747655c607efcec7a12ff1f3c24561 unpetrify-ref: libpng-1.6.13-signed - build-depends: [] - name: libjpeg repo: upstream:libjpeg ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a unpetrify-ref: baserock/morph - build-depends: [] - name: libtiff repo: upstream:libtiff ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd unpetrify-ref: Release-v4-0-3 - build-depends: [] - name: cairo morph: strata/graphics-common/cairo.morph repo: upstream:cairo diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index f1141fcd..0493245f 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -10,24 +10,20 @@ chunks: repo: upstream:pango ref: e0a21abf52a0b7588b1aa3357818948816ed9103 unpetrify-ref: 1.36.8 - build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info ref: c136fc2578aa8f7c0e098008da18d324033eb991 unpetrify-ref: Release-1-4 - build-depends: [] - name: gnome-common repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: gdk-pixbuf morph: strata/gtk-deps/gdk-pixbuf.morph repo: upstream:gdk-pixbuf ref: b86959aa16e9d49ec6e286bc57d36c5249578c59 unpetrify-ref: 2.30.8 - build-depends: [] - name: atk repo: upstream:atk ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 @@ -38,7 +34,6 @@ chunks: repo: upstream:at-spi2-core ref: 96c2842088008670e72739ea7921d654487a57fb unpetrify-ref: AT_SPI2_CORE_2_14_1 - build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 8ac31eaa..4a19606a 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -9,4 +9,3 @@ chunks: morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ ref: fbf38d16bcc26630f0f721d266509f5bc292f606 - build-depends: [] diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 8af030bb..826555a0 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph index b6076cde..35bc78cd 100644 --- a/strata/initramfs-utils.morph +++ b/strata/initramfs-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/initramfs-scripts ref: a97dea93d28ba272613029e46a8a0b1f699729d8 unpetrify-ref: master - build-depends: [] diff --git a/strata/input-common.morph b/strata/input-common.morph index dab05826..e6ebad9a 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -8,18 +8,15 @@ chunks: repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: v1.1.5 - build-depends: [] - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf unpetrify-ref: xkeyboard-config-2.13 - build-depends: [] - name: libevdev repo: upstream:libevdev ref: 7ac00d7e920c56bb8617403699030a5300bfae1c unpetrify-ref: libevdev-1.3.2 - build-depends: [] - name: libinput repo: upstream:libinput ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 diff --git a/strata/installer-utils.morph b/strata/installer-utils.morph index b97a7c09..fe6c65fe 100644 --- a/strata/installer-utils.morph +++ b/strata/installer-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/installer-scripts ref: master unpetrify-ref: master - build-depends: [] diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 316bf483..0efac1e3 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-lib-libpciaccess ref: f99c2e4199ce37f6f94428df504427f67c3ec543 unpetrify-ref: libpciaccess-0.13.3 - build-depends: [] - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph index cf3dec19..9aa166fd 100644 --- a/strata/lighttpd-server.morph +++ b/strata/lighttpd-server.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 243461d6..1291e062 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:llvm ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f unpetrify-ref: release_33 - build-depends: [] diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 38d90471..18339df2 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -13,4 +13,3 @@ chunks: repo: baserock:baserock/lorry-controller ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd unpetrify-ref: master - build-depends: [] diff --git a/strata/lorry.morph b/strata/lorry.morph index 8a813d58..741bbc34 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -19,12 +19,10 @@ chunks: repo: upstream:bzr-tarball ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52 unpetrify-ref: baserock/morph - build-depends: [] - name: python-fastimport repo: upstream:python-fastimport ref: 6500a5e7d82651ade9002d44e3ecc71a50302616 unpetrify-ref: baserock/morph - build-depends: [] - name: bzr-fastimport repo: upstream:bzr-fastimport ref: b3cda9967f857127bd4dab5eb72223a95916f5ea @@ -37,13 +35,11 @@ chunks: repo: upstream:cvs-tarball ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph - build-depends: [] - name: libapr morph: strata/lorry/libapr.morph repo: upstream:libapr ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 unpetrify-ref: 1.5.1 - build-depends: [] - name: libapr-util morph: strata/lorry/libapr-util.morph repo: upstream:libapr-util @@ -56,7 +52,6 @@ chunks: repo: upstream:perl-dbi-tarball ref: 09e269cff811f0c1881ea0d6b7571173bab8377b unpetrify-ref: baserock/morph - build-depends: [] - name: perl-dbd-sqlite-tarball repo: upstream:perl-dbd-sqlite-tarball ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02 @@ -76,13 +71,11 @@ chunks: repo: upstream:swig-tarball ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b unpetrify-ref: baserock/morph - build-depends: [] - name: neon morph: strata/lorry/neon.morph repo: upstream:neon ref: 837374e9d797e216f1de684595cefe791f67c0e4 unpetrify-ref: baserock/morph - build-depends: [] - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball @@ -99,7 +92,6 @@ chunks: repo: upstream:mercurial-tarball ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a unpetrify-ref: baserock/morph - build-depends: [] - name: hg-fast-export morph: strata/lorry/hg-fast-export.morph repo: upstream:hg-fast-export @@ -112,7 +104,6 @@ chunks: repo: upstream:cvsps ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49 unpetrify-ref: baserock/morph - build-depends: [] - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry diff --git a/strata/lua.morph b/strata/lua.morph index 75ccad86..dcdd8801 100644 --- a/strata/lua.morph +++ b/strata/lua.morph @@ -9,10 +9,8 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: luajit2 morph: strata/lua/luajit2.morph repo: upstream:luajit2 ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d unpetrify-ref: v2.0.3 - build-depends: [] diff --git a/strata/lvm.morph b/strata/lvm.morph index 8c1c3f67..92a06f41 100644 --- a/strata/lvm.morph +++ b/strata/lvm.morph @@ -13,4 +13,3 @@ chunks: repo: upstream:lvm2 ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 unpetrify-ref: v2_02_115 - build-depends: [] diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index efae2449..8967446c 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:mesa ref: 1a9cc5f50db5d27530a3449743b43aac389d781f unpetrify-ref: mesa-10.3.3 - build-depends: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 05b7c149..7e3fdb30 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,30 +9,25 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph - build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph - build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -58,17 +53,14 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph - build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph - build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph ref: 9e105fccb12de23551c93aac6cb2b1056b858700 diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index f10dd2b3..69f3ccad 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:ogg ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f unpetrify-ref: master - build-depends: [] - name: libvorbis repo: upstream:libvorbis ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index e87c4050..51230de2 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:orc ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a unpetrify-ref: baserock/morph - build-depends: [] - name: gstreamer@0.10 repo: upstream:gstreamer ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 2df8a0ce..f91e5173 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:orc ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 unpetrify-ref: orc-0.4.22 - build-depends: [] - name: gstreamer repo: upstream:gstreamer ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86 diff --git a/strata/network-security.morph b/strata/network-security.morph index 3d0c7814..d88d2f43 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:nspr-hg ref: a6ee84946475c1fb7624973af28163f6da247c0d unpetrify-ref: baserock/morph - build-depends: [] - name: nss morph: strata/network-security/nss.morph repo: upstream:nss diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index 5af03abb..689bec87 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -14,12 +14,10 @@ chunks: repo: upstream:iproute2 ref: 50231ad2a554fcb02462bed6405c970833c1baee unpetrify-ref: v3.17.0 - build-depends: [] - name: libmnl repo: upstream:libmnl ref: c9f19b98cd8e108617e825e071091df14f78c53a unpetrify-ref: master - build-depends: [] - name: ipset morph: strata/networking-utils/ipset.morph repo: upstream:ipset diff --git a/strata/nfs.morph b/strata/nfs.morph index 3dbead9d..0d04812b 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -8,13 +8,11 @@ chunks: repo: upstream:libevent ref: 0b49ae34594533daa82c06a506078de9e336a013 unpetrify-ref: release-2.1.5-beta - build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph repo: upstream:ti-rpc ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f unpetrify-ref: baserock/master - build-depends: [] - name: rpcbind morph: strata/nfs/rpcbind.morph repo: upstream:rpcbind diff --git a/strata/nodejs.morph b/strata/nodejs.morph index f8955a01..58dbdd0b 100644 --- a/strata/nodejs.morph +++ b/strata/nodejs.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:node ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e unpetrify-ref: v0.10.26 - build-depends: [] diff --git a/strata/ntpd.morph b/strata/ntpd.morph index e45e6424..e2ccc84a 100644 --- a/strata/ntpd.morph +++ b/strata/ntpd.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:ntp ref: d4b7cd9723cce9561fa15f74b90b85a3a61b5ef8 unpetrify-ref: ntp-dev-4.2.7p482 - build-depends: [] diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 65f38855..91559113 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -8,12 +8,10 @@ chunks: repo: upstream:warlock ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 unpetrify-ref: 1.1.0 - build-depends: [] - name: python-keystoneclient repo: upstream:openstack/python-keystoneclient ref: 79d1eec35aad874a7c08ff22c39260884a5524ba unpetrify-ref: 0.11.1 - build-depends: [] - name: python-glanceclient repo: upstream:openstack/python-glanceclient ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b @@ -31,12 +29,10 @@ chunks: repo: upstream:openstack/python-swiftclient ref: bb4d2ab59c4de9389667eeed255642f51e276f1e unpetrify-ref: 2.3.1 - build-depends: [] - name: python-troveclient repo: upstream:openstack/python-troveclient ref: e010a919750f07493afd42a4db867853b925bcbf unpetrify-ref: 1.0.7 - build-depends: [] - name: python-cinderclient repo: upstream:openstack/python-cinderclient ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab @@ -48,7 +44,6 @@ chunks: repo: upstream:python-packages/pyparsing.git ref: 8062c76ab3958a570052124f17e71f3dd3ec2257 unpetrify-ref: pyparsing_2.0.3 - build-depends: [] - name: cmd2 repo: upstream:python-packages/cmd2.git ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 396d77c6..f59f6705 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:python-packages/pycparser ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 unpetrify-ref: master - build-depends: [] - name: cffi repo: upstream:python-packages/cffi ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 @@ -22,7 +21,6 @@ chunks: repo: upstream:pytz-tarball ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c unpetrify-ref: pytz-2014.10 - build-depends: [] - name: babel repo: upstream:babel ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c @@ -33,12 +31,10 @@ chunks: repo: upstream:python-packages/enum34.git ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55 unpetrify-ref: enum34-1.0 - build-depends: [] - name: pyasn1 repo: upstream:python-packages/pyasn1 ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f unpetrify-ref: release_0_1_7_tag - build-depends: [] - name: cryptography repo: upstream:python-packages/cryptography ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f @@ -51,17 +47,14 @@ chunks: repo: upstream:pyiso8601 ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab unpetrify-ref: 0.1.10 - build-depends: [] - name: netaddr repo: upstream:netaddr ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b unpetrify-ref: release-0.7.12 - build-depends: [] - name: stevedore ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2 unpetrify-ref: 1.0.0.0a2 repo: upstream:openstack/stevedore - build-depends: [] - name: oslo-config repo: upstream:openstack/oslo-config ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 @@ -73,7 +66,6 @@ chunks: repo: upstream:python-packages/pyopenssl ref: 0146d447e63a737b4f05a1164d5950eff68543e7 unpetrify-ref: 0.14 - build-depends: [] - name: oslo-i18n repo: upstream:openstack/oslo-i18n ref: 040f1d6afa733527385d2309e485bf37e9843b0e @@ -92,19 +84,15 @@ chunks: repo: upstream:python-packages/futures ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597 unpetrify-ref: 2.2.0 - build-depends: [] - name: oslo-serialization repo: upstream:openstack/oslo-serialization.git ref: 80fec894a54253d9b4c80dd8a563957966ca0b88 unpetrify-ref: 0.3.0 - build-depends: [] - name: jsonschema repo: upstream:jsonschema ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 - build-depends: [] - name: simplejson repo: upstream:simplejson ref: 54d5ff15d508c51366986cc4f77f2f287f036582 unpetrify-ref: v3.6.4 - build-depends: [] diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph index bcc03c86..60e6d6cd 100644 --- a/strata/patch-manager-gerrit.morph +++ b/strata/patch-manager-gerrit.morph @@ -8,4 +8,3 @@ chunks: repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph index 44d0bab2..8d0c2489 100644 --- a/strata/pcre-utils.morph +++ b/strata/pcre-utils.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:pcre ref: 2720152c58e13e7cc7403642ec33127101b9971b unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/python-common.morph b/strata/python-common.morph index 850ad720..5879febd 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:python-packages/pycrypto ref: af058ee6f5da391a05275470ab4a4a96aa22b350 unpetrify-ref: v2.7a1 - build-depends: [] - name: ecdsa repo: upstream:python-packages/ecdsa ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c unpetrify-ref: python-ecdsa-0.11 - build-depends: [] - name: paramiko repo: upstream:paramiko ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22 @@ -26,7 +24,6 @@ chunks: repo: upstream:markupsafe ref: feb1d70c16df62f60dcb521d127fdad8819fc036 unpetrify-ref: 0.23 - build-depends: [] - name: jinja2 repo: upstream:jinja2 ref: 762c612e7276889aac265645da00e62e33d1573c @@ -37,7 +34,6 @@ chunks: repo: upstream:python-json-pointer ref: 34073e561261cb413b9bdff5beac31b070d98ea2 unpetrify-ref: v1.4 - build-depends: [] - name: python-json-patch repo: upstream:python-json-patch ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3 @@ -48,4 +44,3 @@ chunks: repo: upstream:python-prettytable ref: 7a48f1e84049577370cf28632a75d2fd01e4142d unpetrify-ref: master - build-depends: [] diff --git a/strata/python-core.morph b/strata/python-core.morph index 2daf78b0..342e8c68 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master - build-depends: [] - name: pip repo: upstream:pip ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 @@ -26,12 +25,10 @@ chunks: repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 - build-depends: [] - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 - build-depends: [] - name: pyyaml morph: strata/python-core/pyyaml.morph repo: upstream:pyyaml diff --git a/strata/python-tools.morph b/strata/python-tools.morph index d1ce912d..0acc1c0c 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:python-packages/virtualenv ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c unpetrify-ref: 12.0.5 - build-depends: [] diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 2dc41438..192e9201 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:cpython ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c unpetrify-ref: v3.4.2 - build-depends: [] diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index b260c9d9..0533ea58 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 - build-depends: [] diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 18d2cc5f..698dc5ce 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -11,13 +11,11 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: ruby-1.9 morph: strata/qt4-tools/ruby-1.9.morph repo: upstream:ruby diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 066f62a0..d4c76ee8 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt-creator ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 unpetrify-ref: baserock/3.3.0 - build-depends: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index df36ccad..92bfcde9 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt5/qtmultimedia ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f unpetrify-ref: v5.3.2 - build-depends: [] diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 4441e46b..e5338d7a 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:qt5/qtwebkit ref: 13f80d34ae84c3231118c8013beee55badab8929 unpetrify-ref: v5.3.2 - build-depends: [] - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 34e57bc4..dbda3a2e 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase diff --git a/strata/ruby.morph b/strata/ruby.morph index c5bd9993..eba231be 100644 --- a/strata/ruby.morph +++ b/strata/ruby.morph @@ -15,12 +15,10 @@ chunks: repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: libyaml repo: upstream:libyaml-hg ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e unpetrify-ref: master - build-depends: [] - name: ruby morph: strata/ruby/ruby.morph repo: upstream:ruby diff --git a/strata/tools.morph b/strata/tools.morph index 9dcc2c7b..bdc7e8e7 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -9,46 +9,38 @@ chunks: repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph - build-depends: [] - name: file repo: upstream:file ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 unpetrify-ref: file-5.22 - build-depends: [] - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch - build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 - build-depends: [] - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 unpetrify-ref: v4.8 - build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap - build-depends: [] - name: vala repo: upstream:vala ref: 682eba5880fbd76402dec10118883da913a7b255 @@ -60,29 +52,24 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools ref: f4d1d2ad474e882df13418239aa3050673a844d7 unpetrify-ref: baserock/morph - build-depends: [] - name: device-tree-compiler morph: strata/tools/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: sudo repo: upstream:sudo ref: a4769dc7999b53260325fb89945bef85714fb338 unpetrify-ref: baserock/morph - build-depends: [] - name: procps-ng repo: upstream:procps-ng ref: 85fff468fa263cdd2ff1c0144579527c32333695 unpetrify-ref: v3.3.9 - build-depends: [] prefix: / - name: ipmitool morph: strata/tools/ipmitool.morph diff --git a/strata/trove.morph b/strata/trove.morph index 665f7d9a..40588c05 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: lace morph: strata/trove/lace.morph repo: upstream:gitano/lace @@ -69,13 +68,11 @@ chunks: repo: upstream:cgit ref: acbf4a15e260c711094455dbef7c024f2553fd32 unpetrify-ref: baserock/morph - build-depends: [] - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master - build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph index 7ac14158..fadcec92 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph @@ -13,7 +13,6 @@ chunks: repo: upstream:yasm ref: fefefe262eb29081f0bcb4d48f2d476ce5730562 unpetrify-ref: baserock/morph - build-depends: [] - name: vboxguest morph: strata/virtualbox-guest-x86_64/vboxguest.morph repo: upstream:VirtualBox diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 1cd447af..84eefdaf 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -14,30 +14,25 @@ chunks: repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph - build-depends: [] - name: xml-catalog morph: strata/virtualization/xml-catalog.morph repo: baserock:baserock/xml-catalog ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b unpetrify-ref: master - build-depends: [] - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954 unpetrify-ref: baserock/morph - build-depends: [] - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 - build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros ref: c98b41de5596c675c603ef43ae9570133f1a9921 unpetrify-ref: baserock/morph - build-depends: [] - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -49,7 +44,6 @@ chunks: repo: upstream:dmidecode ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 unpetrify-ref: master - build-depends: [] - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt @@ -66,7 +60,6 @@ chunks: repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e unpetrify-ref: baserock/morph - build-depends: [] - name: urlgrabber repo: upstream:urlgrabber ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04 @@ -77,7 +70,6 @@ chunks: repo: upstream:cython ref: 005d38d5921a603d5f4d413aae72f98a6d33192f unpetrify-ref: master - build-depends: [] - name: python-lxml repo: upstream:python-lxml ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92 @@ -96,7 +88,6 @@ chunks: repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph repo: upstream:pygobject @@ -131,10 +122,8 @@ chunks: repo: upstream:ebtables ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 unpetrify-ref: master - build-depends: [] - name: openvswitch morph: strata/virtualization/openvswitch.morph repo: upstream:openvswitch ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f unpretrify-ref: master - build-depends: [] diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 58eefbbd..f65fa63e 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 unpetrify-ref: xkbcommon-0.5.0 - build-depends: [] - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland diff --git a/strata/webtools.morph b/strata/webtools.morph index 39175747..68ce80d5 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -10,21 +10,17 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb unpetrify-ref: master - build-depends: [] - name: tar morph: strata/webtools/tar.morph repo: upstream:tar ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 - build-depends: [] diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 13106ea5..2925d72c 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -12,4 +12,3 @@ chunks: repo: upstream:weston ref: 322383ed469d69401b502618718a97a4e85c97d8 unpetrify-ref: baserock/weston-1.7.0/tegra - build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ce403b6b..ea619821 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index 8191b30f..9836961f 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -7,125 +7,100 @@ chunks: repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-damageproto repo: upstream:xorg-proto-damageproto ref: 015b980e5091492dbe681af59569768ba89fbfe0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dmxproto repo: upstream:xorg-proto-dmxproto ref: 395f6fcc0a5635907b5e45829e86b29431316184 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fixesproto repo: upstream:xorg-proto-fixesproto ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fontsproto repo: upstream:xorg-proto-fontsproto ref: df8c05f7c0253a36589d96efa52938215eff9d4d unpetrify-ref: fontsproto-2.1.3 - build-depends: [] - name: xorg-proto-glproto repo: upstream:xorg-proto-glproto ref: f84853d97d5749308992412a215fa518b6536eb3 unpetrify-ref: glproto-1.4.17 - build-depends: [] - name: xorg-proto-inputproto repo: upstream:xorg-proto-inputproto ref: 343ff0938f592876b9d82c966f166bf45a78c3c8 unpetrify-ref: inputproto-2.3.1 - build-depends: [] - name: xorg-proto-kbproto repo: upstream:xorg-proto-kbproto ref: f7022f5775350dce3348b7151845a32390e98791 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xineramaproto repo: upstream:xorg-proto-xineramaproto ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-randrproto repo: upstream:xorg-proto-randrproto ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-recordproto repo: upstream:xorg-proto-recordproto ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-renderproto repo: upstream:xorg-proto-renderproto ref: 935f5ec95a3718c184ff685f5b79b467483b7844 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-resourceproto repo: upstream:xorg-proto-resourceproto ref: ada91f54c98b5a61d3e116fca6bf239a8604730f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-scrnsaverproto repo: upstream:xorg-proto-scrnsaverproto ref: 614532026e8ec7496216316fb584d6f2af6a7f7b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-videoproto repo: upstream:xorg-proto-videoproto ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xcmiscproto repo: upstream:xorg-proto-xcmiscproto ref: 83549077a3c2140b9862709004cd873f1c55e395 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xextproto repo: upstream:xorg-proto-xextproto ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 unpetrify-ref: xextproto-7.3.0 - build-depends: [] - name: xorg-proto-xf86bigfontproto repo: upstream:xorg-proto-xf86bigfontproto ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155 unpetrify-ref: xproto-7.0.26 - build-depends: [] - name: xorg-proto-dri2proto repo: upstream:xorg-proto-dri2proto ref: ead89ad84877551cc15d26b95cb19a3e205df71f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dri3proto repo: upstream:xorg-proto-dri3proto ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 - build-depends: [] - name: xorg-proto-presentproto repo: upstream:xorg-proto-presentproto ref: ef84007fc4a23d3897b4776906139de9d0698c2a - build-depends: [] - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 unpetrify-ref: "1.11" - build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 @@ -148,7 +123,6 @@ chunks: repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 unpetrify-ref: xtrans-1.3.5 - build-depends: [] - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 ref: cb107760df33ffc8630677e66e2e50aa37950a5c diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 644d47c2..665d4c5f 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -11,17 +11,14 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile ref: 7381c2f9013ef7784c78091fa671e652a62ca706 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-font-util repo: upstream:xorg-font-util ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 @@ -54,18 +51,15 @@ chunks: repo: upstream:xcb-util ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-wm repo: upstream:util-wm ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-keysyms morph: strata/x-generic/util-keysyms.morph repo: upstream:util-keysyms ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab unpetrify-ref: baserock/morph - build-depends: [] - name: util-image repo: upstream:util-image ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 diff --git a/strata/xfce.morph b/strata/xfce.morph index 5678c1fc..295abfe1 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libcroco ref: 611f624a6e15065792b41eb5ce14811293f3fb0a unpetrify-ref: baserock/morph - build-depends: [] - name: librsvg morph: strata/xfce/librsvg.morph repo: upstream:librsvg ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb unpetrify-ref: baserock/morph - build-depends: [] - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools ref: 9244250ac0c15ba160688758c5dccf97f3f160ef unpetrify-ref: baserock/morph - build-depends: [] - name: libxfce4util morph: strata/xfce/libxfce4util.morph repo: upstream:xfce/libxfce4util @@ -56,7 +53,6 @@ chunks: repo: upstream:libwww-perl/uri ref: 3dd72ded7f043a4f6973781fe594722e2e95f491 unpetrify-ref: baserock/morph - build-depends: [] - name: exo morph: strata/xfce/exo.morph repo: upstream:xfce/exo @@ -71,7 +67,6 @@ chunks: repo: upstream:libwnck ref: 6792abcdf27aceba1012406d51606e84b065a526 unpetrify-ref: baserock/xfce-build - build-depends: [] - name: xfce4-panel morph: strata/xfce/xfce4-panel.morph repo: upstream:xfce/xfce4-panel @@ -107,7 +102,6 @@ chunks: repo: upstream:iceauth ref: c07d443d43e53cfe21b53a9a0eafcd6189432867 unpetrify-ref: baserock/morph - build-depends: [] - name: xfce4-session morph: strata/xfce/xfce4-session.morph repo: upstream:xfce/xfce4-session @@ -168,4 +162,3 @@ chunks: repo: upstream:elementary-xfce ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph index b8e67888..909c9420 100644 --- a/strata/xorg-util-macros-common.morph +++ b/strata/xorg-util-macros-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 unpetrify-ref: util-macros-1.19.0 - build-depends: [] - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 7b40ee60..bf21a296 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -16,124 +16,99 @@ chunks: repo: upstream:xstatic ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 unpetrify-ref: 1.0.1 - build-depends: [] - name: xstatic-angular repo: upstream:xstatic-packages/xstatic-angular ref: dac047df05da5bb20de4e78876bc03820d0c6671 unpetrify-ref: 1.3.7.0 - build-depends: [] - name: xstatic-angular-animate repo: upstream:xstatic-packages/xstatic-angular-animate ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-bootstrap repo: upstream:xstatic-packages/xstatic-angular-bootstrap ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-cookies repo: upstream:xstatic-packages/xstatic-angular-cookies ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-fileupload repo: upstream:xstatic-packages/xstatic-angular-fileupload ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae unpetrify-ref: master - build-depends: [] - name: xstatic-angular-mock repo: upstream:xstatic-packages/xstatic-angular-mock ref: 20fdada109b167bcdcacec22986b43fdb42866f3 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-sanitize repo: upstream:xstatic-packages/xstatic-angular-sanitize ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-smart-table repo: upstream:xstatic-packages/xstatic-angular-smart-table ref: e0fbf69fb156b995547471d71c5c6a7f88989d47 unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-datepicker repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-scss repo: upstream:xstatic-packages/xstatic-bootstrap-scss ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e unpetrify-ref: master - build-depends: [] - name: xstatic-d3 repo: upstream:xstatic-packages/xstatic-d3 ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf unpetrify-ref: master - build-depends: [] - name: xstatic-hogan repo: upstream:xstatic-packages/xstatic-hogan ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 unpetrify-ref: master - build-depends: [] - name: xstatic-font-awesome repo: upstream:xstatic-packages/xstatic-font-awesome ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 unpetrify-ref: 4.2.0.0 - build-depends: [] - name: xstatic-jasmine repo: upstream:xstatic-packages/xstatic-jasmine ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 unpetrify-ref: 2.1.2.0 - build-depends: [] - name: xstatic-jquery repo: upstream:xstatic-packages/xstatic-jquery ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-bootstrap-wizard repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-migrate repo: upstream:xstatic-packages/xstatic-jquery-migrate ref: 989b3b31106727542dd83810c3b952f90d8cdb8f unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-quicksearch repo: upstream:xstatic-packages/xstatic-jquery-quicksearch ref: f5221c8c30507340846d97d6db41a782e7c63316 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-tablesorter repo: upstream:xstatic-packages/xstatic-jquery-tablesorter ref: eb78328391f44a9a88033e1aede1a605902c5551 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-ui repo: upstream:xstatic-packages/xstatic-jquery-ui ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 unpetrify-ref: 1.11.0.1 - build-depends: [] - name: xstatic-jsencrypt repo: upstream:xstatic-packages/xstatic-jsencrypt ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 unpetrify-ref: master - build-depends: [] - name: xstatic-qunit repo: upstream:xstatic-packages/xstatic-qunit ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f unpetrify-ref: master - build-depends: [] - name: xstatic-rickshaw repo: upstream:xstatic-packages/xstatic-rickshaw ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 unpetrify-ref: master - build-depends: [] - name: xstatic-spin repo: upstream:xstatic-packages/xstatic-spin ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f unpetrify-ref: master - build-depends: [] diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index d4502ea1..83ce2e05 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -14,4 +14,3 @@ chunks: morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 6ad4269e..97acd2ca 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -8,4 +8,3 @@ chunks: morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index 3bcd5cca..6328d327 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -8,13 +8,11 @@ chunks: - name: cppunit repo: upstream:cppunit ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf - build-depends: [] - name: java-binary morph: strata/zookeeper/java-binary.morph repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] - name: java-ant morph: strata/zookeeper/java-ant.morph repo: upstream:java/ant -- cgit v1.2.1 From 0927f7653fdb36f6dea9b8e659d1e8f8a66fb152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 6 Mar 2015 18:40:46 +0000 Subject: Revert "Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1)" Morph should have been updated first This reverts commit ced4ed5f7aa35b46d161c5efea972699826f09de. --- VERSION | 2 +- strata/NetworkManager-common.morph | 2 ++ strata/ansible.morph | 1 + strata/apache-httpd-server.morph | 2 ++ strata/armv7lhf-cross-toolchain.morph | 2 ++ strata/audio-bluetooth.morph | 8 ++++++++ strata/baserock-import.morph | 4 ++++ strata/bsp-armv7-highbank.morph | 1 + strata/bsp-armv7-versatile.morph | 1 + strata/bsp-armv7b-highbank.morph | 1 + strata/bsp-armv7b-vexpress-tc2.morph | 1 + strata/bsp-armv8l64-generic.morph | 1 + strata/bsp-jetson.morph | 4 ++++ strata/bsp-ppc64-generic.morph | 1 + strata/bsp-wandboard.morph | 1 + strata/bsp-x86_32-generic.morph | 2 ++ strata/bsp-x86_64-generic.morph | 2 ++ strata/bsp-x86_both-tools.morph | 1 + strata/build-essential.morph | 3 +++ strata/ceph-service.morph | 6 ++++++ strata/chef.morph | 29 +++++++++++++++++++++++++++++ strata/cloudinit-support.morph | 3 +++ strata/connectivity.morph | 2 ++ strata/connman-common.morph | 1 + strata/core.morph | 10 ++++++++++ strata/coreutils-common.morph | 1 + strata/cross-bootstrap.morph | 3 +++ strata/cross-tools.morph | 1 + strata/cxmanage.morph | 4 ++++ strata/databases.morph | 4 ++++ strata/devtools.morph | 4 ++++ strata/django.morph | 3 +++ strata/enlightenment.morph | 2 ++ strata/erlang.morph | 1 + strata/foundation.morph | 12 ++++++++++++ strata/genivi.morph | 6 ++++++ strata/gitlab.morph | 3 +++ strata/graphics-common.morph | 6 ++++++ strata/gtk-deps.morph | 5 +++++ strata/gtk2.morph | 1 + strata/gtk3.morph | 1 + strata/initramfs-utils.morph | 1 + strata/input-common.morph | 3 +++ strata/installer-utils.morph | 1 + strata/libdrm-common.morph | 1 + strata/lighttpd-server.morph | 1 + strata/llvm-common.morph | 1 + strata/lorry-controller.morph | 1 + strata/lorry.morph | 9 +++++++++ strata/lua.morph | 2 ++ strata/lvm.morph | 1 + strata/mesa-common.morph | 1 + strata/morph-utils.morph | 8 ++++++++ strata/multimedia-common.morph | 1 + strata/multimedia-gstreamer-0.10.morph | 1 + strata/multimedia-gstreamer.morph | 1 + strata/network-security.morph | 1 + strata/networking-utils.morph | 2 ++ strata/nfs.morph | 2 ++ strata/nodejs.morph | 1 + strata/ntpd.morph | 1 + strata/openstack-clients.morph | 5 +++++ strata/openstack-common.morph | 12 ++++++++++++ strata/patch-manager-gerrit.morph | 1 + strata/pcre-utils.morph | 1 + strata/python-common.morph | 5 +++++ strata/python-core.morph | 3 +++ strata/python-tools.morph | 1 + strata/python3-core.morph | 1 + strata/qt4-sdk.morph | 1 + strata/qt4-tools.morph | 2 ++ strata/qt5-sdk.morph | 1 + strata/qt5-tools-qtmultimedia.morph | 1 + strata/qt5-tools-qtwebkit.morph | 1 + strata/qt5-tools.morph | 1 + strata/ruby.morph | 2 ++ strata/tools.morph | 13 +++++++++++++ strata/trove.morph | 3 +++ strata/virtualbox-guest-x86_64.morph | 1 + strata/virtualization.morph | 11 +++++++++++ strata/wayland-generic.morph | 1 + strata/webtools.morph | 4 ++++ strata/weston-common.morph | 1 + strata/weston-genivi.morph | 1 + strata/x-common.morph | 26 ++++++++++++++++++++++++++ strata/x-generic.morph | 6 ++++++ strata/xfce.morph | 7 +++++++ strata/xorg-util-macros-common.morph | 1 + strata/xstatic.morph | 25 +++++++++++++++++++++++++ strata/zookeeper-client.morph | 1 + strata/zookeeper-server.morph | 1 + strata/zookeeper.morph | 2 ++ 92 files changed, 329 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b8255184..85260cb1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version: 1 +version: 0 diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 93b94dff..8115c309 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -9,10 +9,12 @@ chunks: repo: upstream:libndp ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 unpetrify-ref: v1.4 + build-depends: [] - name: readline6 repo: upstream:readline ref: 7628b745a813aac53586b640da056a975f1c443e unpetrify-ref: readline-6.3 + build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph repo: upstream:NetworkManager diff --git a/strata/ansible.morph b/strata/ansible.morph index 33a23750..5903017a 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:ansible ref: ebc8d48d34296fe010096f044e2b7591df37a622 unpetrify-ref: baserock/v1.8.4 + build-depends: [] diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 7a403535..065ec155 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,6 +11,7 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk + build-depends: [] - name: httpd morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd @@ -22,6 +23,7 @@ chunks: repo: upstream:python-packages/psutil ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 unpetrify-ref: release-2.2.0 + build-depends: [] - name: mod_wsgi-metrics repo: upstream:python-packages/mod_wsgi-metrics ref: ec715eb593255229f9f45f3f323edbb845c691d8 diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index f153e0c3..a3539d65 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -9,12 +9,14 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential + build-depends: [] - name: armv7lhf-cross-linux-api-headers morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph repo: upstream:linux ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa unpetrify-ref: baserock/v3.8 + build-depends: [] - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 00a614c9..829cf6f8 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -8,10 +8,12 @@ chunks: repo: upstream:libatomic_ops ref: 0a58f5d63969c10d2141af89cb7a53df786909ab unpetrify-ref: baserock/morph + build-depends: [] - name: alsa-lib repo: upstream:alsa-lib ref: 9cfd1faa27511edbb8bebbab85030125f33590ae unpetrify-ref: v1.0.28 + build-depends: [] - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils @@ -24,6 +26,7 @@ chunks: repo: upstream:libical ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 unpetrify-ref: baserock/morph + build-depends: [] - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez @@ -37,6 +40,7 @@ chunks: repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph + build-depends: [] - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc @@ -48,6 +52,7 @@ chunks: repo: upstream:speex ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa unpetrify-ref: baserock/morph + build-depends: [] - name: nohands morph: strata/audio-bluetooth/nohands.morph repo: upstream:nohands @@ -60,6 +65,7 @@ chunks: repo: upstream:mobile-broadband-provider-info ref: 4ed19e11c2975105b71b956440acdb25d46a347d unpetrify-ref: baserock/morph + build-depends: [] - name: ofono morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono @@ -73,11 +79,13 @@ chunks: repo: upstream:json-c ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch + build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph repo: upstream:libsndfile ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 unpetrify-ref: baserock/morph + build-depends: [] - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index a3a195db..7ca5e7ce 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -8,18 +8,22 @@ chunks: repo: upstream:python-packages/ansicolor ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef unpetrify-ref: 0.2.4 + build-depends: [] - name: python-decorator repo: upstream:python-packages/python-decorator ref: b02f7a254c3679dfac57a824e08dd02ced850636 unpetrify-ref: decorator-3.4.0 + build-depends: [] - name: networkx repo: upstream:python-packages/networkx ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c unpetrify-ref: networkx-1.9.1 + build-depends: [] - name: requests-cache repo: upstream:python-packages/requests-cache ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf unpetrify-ref: 0.4.6 + build-depends: [] - name: baserock-import repo: baserock:baserock/import ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index 2cf541a7..bdf047cf 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index f8d19b9b..529b563c 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 7b0f0fa0..97ccfe3c 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index 616d564f..f8a7ff00 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index a5edb9db..63c4ff5b 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -13,3 +13,4 @@ chunks: repo: upstream:linux ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge + build-depends: [] diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 85ab5ecf..111402a7 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -17,6 +17,7 @@ chunks: repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph + build-depends: [] - name: u-boot@jetson morph: strata/bsp-jetson/u-boot@jetson.morph repo: upstream:u-boot @@ -29,11 +30,13 @@ chunks: repo: upstream:linux ref: 682c943b0159b1a4105f31020605bf8a0f155ffd unpetrify-ref: baserock/v3.18-with-cpufreq + build-depends: [] - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 + build-depends: [] - name: nouveau-drm morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau @@ -46,3 +49,4 @@ chunks: repo: upstream:linux-firmware ref: 9322ef5b14c78ec28163baa41bff240a0e098810 unpetrify-ref: baserock/jetson + build-depends: [] diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index 58038d60..002c00be 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 2ab095df..4ffd2e0e 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -9,6 +9,7 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph + build-depends: [] - name: linux-armv7-wandboard morph: strata/bsp-wandboard/linux-armv7-wandboard.morph repo: upstream:linux diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 10c4dbe5..244745bf 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,11 +10,13 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph + build-depends: [] - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 749e3722..04be0dcd 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,11 +10,13 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 + build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph + build-depends: [] - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index f7212054..b5bee9cb 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -10,6 +10,7 @@ chunks: repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph + build-depends: [] - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 0758fee8..ac88b860 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -46,6 +46,7 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential + build-depends: [] build-mode: bootstrap prefix: /tools @@ -149,6 +150,7 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 + build-depends: [] build-mode: bootstrap prefix: /tools @@ -157,6 +159,7 @@ chunks: repo: baserock:baserock/fhs-dirs ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4 unpetrify-ref: master + build-depends: [] build-mode: bootstrap prefix: /tools diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 0fc987c4..1108ab4b 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -9,15 +9,18 @@ chunks: repo: upstream:libaio ref: 08f50baec0e7731116d3f665c6155d7829edf5d7 unpetrify-ref: libaio-0.3.110-1 + build-depends: [] - name: keyutils morph: strata/ceph-service/keyutils.morph repo: upstream:keyutils ref: 9209a0c8fd63afc59f644e078b40cec531409c30 unpetrify-ref: v1.5.9 + build-depends: [] - name: libunwind repo: upstream:libunwind ref: d7322f0f64dab715c4feb5f08edef5660d8719c0 unpetrify-ref: v1.1 + build-depends: [] - name: gperftools repo: upstream:gperftools ref: 846b775dfadb77901202ae7ddbac30ad1de7df01 @@ -28,6 +31,7 @@ chunks: repo: upstream:snappy-git ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4 unpetrify-ref: master + build-depends: [] - name: leveldb morph: strata/ceph-service/leveldb.morph repo: upstream:leveldb @@ -40,11 +44,13 @@ chunks: repo: upstream:libeditline-tarball ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph + build-depends: [] - name: boost morph: strata/ceph-service/boost.morph repo: upstream:boost-tarball ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304 unpetrify-ref: boost_1_56_0 + build-depends: [] - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph diff --git a/strata/chef.morph b/strata/chef.morph index 69b495aa..9105a2e0 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -10,6 +10,7 @@ chunks: repo: upstream:yajl ref: a0ecdde0c042b9256170f2f8890dd9451a4240aa unpetrify-ref: 2.1.0 + build-depends: [] - name: libyajl2-1.0.1 morph: strata/chef/libyajl2-1.0.1.morph repo: upstream:ruby-gems/libyajl2-gem @@ -22,26 +23,31 @@ chunks: repo: upstream:ruby-gems/chef ref: 9841bc9c6271c6d9add3aff0c2e11239cfb129ca unpetrify-ref: 12.0.3 + build-depends: [] - name: chef-zero-2.2 morph: strata/chef/chef-zero-2.2.morph repo: upstream:ruby-gems/chef-zero ref: 231c3abd052e606820297a97e4bc32bdab656a02 unpetrify-ref: v2.2 + build-depends: [] - name: coderay-1.1.0.rc1 morph: strata/chef/coderay-1.1.0.morph repo: upstream:ruby-gems/coderay ref: a48037b85a12228431b32103786456f36beb355f unpetrify-ref: v1.1.0 + build-depends: [] - name: erubis-master morph: strata/chef/erubis-master.morph repo: upstream:ruby-gems/erubis ref: 14d3eab57fbc361312c8f3af350cbf9a5bafce17 unpetrify-ref: master + build-depends: [] - name: ffi-1.9.3 morph: strata/chef/ffi-1.9.3.morph repo: upstream:ruby-gems/ffi ref: d982b7049336106c04f7721045dc5613b16d3545 unpetrify-ref: 1.9.3 + build-depends: [] - name: ffi-yajl-1.0.2 morph: strata/chef/ffi-yajl-master.morph repo: upstream:ruby-gems/ffi-yajl @@ -54,16 +60,19 @@ chunks: repo: upstream:ruby-gems/hashie ref: 95b97fbff2cac643d56ec718cb708665500682e5 unpetrify-ref: v2.1.2 + build-depends: [] - name: highline-1.6.21 morph: strata/chef/highline-master.morph repo: upstream:ruby-gems/highline ref: 51de22e436e6d45696759d673d7b9ceba16cae39 unpetrify-ref: master + build-depends: [] - name: hoe-master morph: strata/chef/hoe-master.morph repo: upstream:ruby-gems/hoe ref: d94b26b4687be0a24d04b7cb582753fbec33d7e4 unpetrify-ref: master + build-depends: [] - name: diff-lcs-1.2.5 morph: strata/chef/diff-lcs-1.2.5.morph repo: upstream:diff-lcs @@ -76,16 +85,19 @@ chunks: repo: upstream:ruby-gems/ipaddress ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845 unpetrify-ref: master + build-depends: [] - name: json-1.8.1 morph: strata/chef/json-1.8.1.morph repo: upstream:ruby-gems/json ref: 92a96dea2b24b9c68856004d69491f46aedd0925 unpetrify-ref: v1.8.1 + build-depends: [] - name: method_source-0.8.1 morph: strata/chef/method_source-0.8.2.morph repo: upstream:ruby-gems/method_source ref: 1b1f8323a7c25f29331fe32511f50697e5405dbd unpetrify-ref: v0.8.2 + build-depends: [] - name: mime-types-1.25.1 morph: strata/chef/mime-types-1.25.1.morph repo: upstream:ruby-gems/mime-types @@ -98,86 +110,103 @@ chunks: repo: upstream:ruby-gems/mixlib-authentication ref: db24a56c6f5b99114998a50942220a7023060229 unpetrify-ref: 1.3.0 + build-depends: [] - name: mixlib-cli-1.5.0 morph: strata/chef/mixlib-cli-1.5.0.morph repo: upstream:ruby-gems/mixlib-cli ref: b3b3c12141b5380ec61945770690fc1ae31d92b0 unpetrify-ref: 1.5.0 + build-depends: [] - name: mixlib-config-2.1.0 morph: strata/chef/mixlib-config-2.1.0.morph repo: upstream:ruby-gems/mixlib-config ref: c5e2dee2beb5fdd17442ff92e520f2ef01d17ee5 unpetrify-ref: v2.1.0 + build-depends: [] - name: mixlib-log-1.6.0 morph: strata/chef/mixlib-log-master.morph repo: upstream:ruby-gems/mixlib-log ref: 50ec55964ce19d3a8a14050be9a23c4b8990e2f0 unpetrify-ref: master + build-depends: [] - name: mixlib-shellout-1.4.0 morph: strata/chef/mixlib-shellout-1.4.0.morph repo: upstream:ruby-gems/mixlib-shellout ref: a04ce6db22edf0575c50e18ae2db09adced7dedc unpetrify-ref: 1.4.0 + build-depends: [] - name: net-dhcp-1.2.1 morph: strata/chef/net-dhcp-1.2.1.morph repo: upstream:net-dhcp-ruby ref: b644922a08aa09e2ce75f8f9f9fa1f0b8cecb2e9 unpetrify-ref: v1.2.1 + build-depends: [] - name: net-ssh-2.9.1 morph: strata/chef/net-ssh-2.9.1.morph repo: upstream:ruby-gems/net-ssh ref: 9f8607984d8e904f211cc5edb39ab2a2ca94008e unpetrify-ref: v2.9.1 + build-depends: [] - name: net-ssh-gateway-1.2.0 morph: strata/chef/net-ssh-gateway-1.2.0.morph repo: upstream:ruby-gems/net-ssh-gateway ref: 1de7611a7f7cedbe7a4c6cf3798c88d00637582d unpetrify-ref: v1.2.0 + build-depends: [] - name: net-ssh-multi-1.2.0 morph: strata/chef/net-ssh-multi-1.2.0.morph repo: upstream:ruby-gems/net-ssh-multi ref: b659f2884b2c9abdbe3bbf3c844937a0799ed5ac unpetrify-ref: v1.2.0 + build-depends: [] - name: ohai-7.4.0.dev morph: strata/chef/ohai-master.morph repo: upstream:ruby-gems/ohai ref: 0bf2ed32744445a253082910ee4e07b2b38023a7 unpetrify-ref: master + build-depends: [] - name: plist-master morph: strata/chef/plist-master.morph repo: upstream:ruby-gems/plist ref: 12eb82d283cab148183c37c07e3f75a309969dec unpetrify-ref: master + build-depends: [] - name: pry-0.10.1 morph: strata/chef/pry-master.morph repo: upstream:ruby-gems/pry ref: 6d5eb0831b50ec729d2dc3356255b49535535e37 unpetrify-ref: master + build-depends: [] - name: rack-1.5.2 morph: strata/chef/rack-1.5.2.morph repo: upstream:ruby-gems/rack ref: ac590d055c936bb9a618e955a690dc836c625211 unpetrify-ref: 1.5.2 + build-depends: [] - name: slop-3.6.0 morph: strata/chef/slop-3.6.0.morph repo: upstream:ruby-gems/slop ref: c3f84e7e794004f9ae6958c13ef3dd3038c2c0eb unpetrify-ref: v3.6.0 + build-depends: [] - name: systemu-2.6.4 morph: strata/chef/systemu-master.morph repo: upstream:ruby-gems/systemu ref: 35340f1e91941af47988b1b9d77705493b96d3db unpetrify-ref: master + build-depends: [] - name: wmi-lite-1.0.0 morph: strata/chef/wmi-lite-1.0.0.morph repo: upstream:ruby-gems/wmi-lite ref: 9377836dc0a5487474038ec727f02f9b33facfa6 unpetrify-ref: 1.0.0 + build-depends: [] - name: libpopt morph: strata/chef/libpopt.morph repo: upstream:libpopt ref: c224abf28f4ff9bbf292908324359cb5905addf8 unpetrify-ref: master + build-depends: [] - name: sgdisk morph: strata/chef/sgdisk.morph repo: upstream:sgdisk diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 1c752e58..5281b745 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -11,14 +11,17 @@ chunks: repo: upstream:configobj ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph + build-depends: [] - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed unpetrify-ref: baserock/morph + build-depends: [] - name: boto repo: upstream:boto ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf unpetrify-ref: baserock/morph + build-depends: [] - name: cloud-init morph: strata/cloudinit-support/cloud-init.morph repo: upstream:cloud-init diff --git a/strata/connectivity.morph b/strata/connectivity.morph index dbd4a263..2cc6bb69 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -7,6 +7,7 @@ chunks: repo: upstream:libnl ref: a2c4bd8f094a7247903578860a9c42049991860b unpetrify-ref: baserock/morph + build-depends: [] - name: wpa_supplicant morph: strata/connectivity/wpa_supplicant.morph repo: upstream:hostap @@ -18,3 +19,4 @@ chunks: repo: upstream:iptables ref: 482c6d3731e2681cb4baae835c294840300197e6 unpetrify-ref: v1.4.21 + build-depends: [] diff --git a/strata/connman-common.morph b/strata/connman-common.morph index a22b7e90..f6f7ddb0 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -8,3 +8,4 @@ chunks: repo: upstream:connman ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 unpetrify-ref: baserock/1.24 + build-depends: [] diff --git a/strata/core.morph b/strata/core.morph index b424a023..5de96bd4 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -9,31 +9,37 @@ chunks: repo: upstream:sqlite3 ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 + build-depends: [] - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake ref: 0b3781e4c497566acaa504d4106d11c02a642501 unpetrify-ref: v2.8.12.2 + build-depends: [] - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 unpetrify-ref: gdbm-1.11 + build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph repo: upstream:gettext-tarball ref: 482840e61f86ca321838a91e902c41d40c098bbb unpetrify-ref: gettext-0.19.4 + build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 unpetrify-ref: master + build-depends: [] - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 unpetrify-ref: ncurses-5.9-20150131 + build-depends: [] - name: perl morph: strata/core/perl.morph repo: upstream:perl @@ -70,6 +76,7 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 + build-depends: [] - name: flex morph: strata/core/flex.morph repo: upstream:flex @@ -90,6 +97,7 @@ chunks: repo: upstream:bzip2 ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 unpetrify-ref: baserock/morph + build-depends: [] - name: readline morph: strata/core/readline.morph repo: upstream:readline @@ -113,6 +121,7 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 + build-depends: [] - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 @@ -209,6 +218,7 @@ chunks: repo: upstream:gperf ref: 5094e4a539adf845111013f82c2c4fcaec637983 unpetrify-ref: baserock/morph + build-depends: [] - name: intltool repo: upstream:intltool ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4 diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index f226f50b..2051cf50 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -12,6 +12,7 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 + build-depends: [] - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index ffed2e66..3aa61caf 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -10,6 +10,7 @@ chunks: repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 + build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph repo: upstream:openssh-git @@ -21,8 +22,10 @@ chunks: repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph + build-depends: [] - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 + build-depends: [] diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph index 36a82808..c3e35e6d 100644 --- a/strata/cross-tools.morph +++ b/strata/cross-tools.morph @@ -8,3 +8,4 @@ chunks: repo: upstream:patchelf ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703 unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph index 326f7a59..057558b8 100644 --- a/strata/cxmanage.morph +++ b/strata/cxmanage.morph @@ -8,19 +8,23 @@ chunks: repo: upstream:ipmitool ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd unpetrify-ref: baserock/morph + build-depends: [] - name: pexpect morph: strata/cxmanage/pexpect.morph repo: upstream:pexpect ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c unpetrify-ref: baserock/morph + build-depends: [] - name: pyipmi repo: upstream:pyipmi ref: bb7dba84578c05ba87db3c4186a2989c89e4e519 unpetrify-ref: baserock/morph + build-depends: [] - name: tftpy repo: upstream:tftpy ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b unpetrify-ref: baserock/morph + build-depends: [] - name: cxmanage repo: upstream:cxmanage ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6 diff --git a/strata/databases.morph b/strata/databases.morph index 89aa996e..9171925c 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -10,16 +10,19 @@ chunks: repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 unpetrify-ref: REL9_3_4 + build-depends: [] - name: redis morph: strata/databases/redis.morph repo: upstream:redis ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 unpetrify-ref: baserock/3.0 + build-depends: [] - name: memcached morph: strata/databases/memcached.morph repo: upstream:memcached ref: c5530027c8ea28674358327ab8212ebaf014c848 unpetrify-ref: 1.4.22 + build-depends: [] - name: psycopg2 repo: upstream:python-packages/psycopg2 ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8 @@ -30,3 +33,4 @@ chunks: repo: upstream:python-packages/python-memcached ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db unpetrify-ref: master + build-depends: [] diff --git a/strata/devtools.morph b/strata/devtools.morph index 9a295db5..73ebd783 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -13,16 +13,20 @@ chunks: repo: upstream:vim ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 unpetrify-ref: baserock/morph + build-depends: [] - name: pv repo: upstream:pv ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a unpetrify-ref: baserock/morph + build-depends: [] - name: screen morph: strata/devtools/screen.morph repo: upstream:screen ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 unpetrify-ref: baserock/morph + build-depends: [] - name: less repo: upstream:less ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/django.morph b/strata/django.morph index 8ae63801..7659593c 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -9,10 +9,12 @@ chunks: repo: upstream:python-packages/django ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb unpetrify-ref: 1.6.8 + build-depends: [] - name: django-appconf repo: upstream:python-packages/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 unpetrify-ref: 0.6 + build-depends: [] - name: django-compressor repo: upstream:python-packages/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 @@ -23,6 +25,7 @@ chunks: repo: upstream:python-packages/pyscss ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 unpetrify-ref: 1.2.1 + build-depends: [] - name: django-pyscss repo: upstream:python-packages/django-pyscss ref: 665270b54eea5de5aca379a78673b411ed6b1f04 diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index d1637f48..25eafce2 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -13,11 +13,13 @@ chunks: repo: upstream:fribidi ref: c9916f2ab289126a32febcc4754efc73a011fb0c unpetrify-ref: baserock/morph/0.19.6 + build-depends: [] - name: bullet3 morph: strata/enlightenment/bullet3.morph repo: upstream:bullet3 ref: 940059ddb3c4476bb9860f79f35b0b1230857f54 unpetrify-ref: baserock/morph + build-depends: [] - name: efl morph: strata/enlightenment/efl.morph repo: upstream:enlightenment/efl diff --git a/strata/erlang.morph b/strata/erlang.morph index d31e78cd..bea09d61 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -9,6 +9,7 @@ chunks: repo: upstream:erlang ref: 9417f044ee3c291c2ea343c203aebdcc40597226 unpetrify-ref: OTP-17.3.4 + build-depends: [] - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/strata/foundation.morph b/strata/foundation.morph index 775444c9..d85ed9c4 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -9,21 +9,25 @@ chunks: repo: upstream:attr ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph + build-depends: [] - name: groff morph: strata/foundation/groff.morph repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 + build-depends: [] - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 + build-depends: [] - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz ref: a0782484f101ac55c916568bc1c490d7761fc904 unpetrify-ref: 2015a + build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -36,11 +40,13 @@ chunks: repo: upstream:libffi ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph + build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph + build-depends: [] - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -61,6 +67,7 @@ chunks: - name: libgpg-error repo: upstream:libgpg-error ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 + build-depends: [] - name: libgcrypt repo: upstream:libgcrypt ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 @@ -71,6 +78,7 @@ chunks: repo: upstream:linux-pam ref: b1521c97e73b10469f7b34c0571d51c647eca83c unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -100,11 +108,13 @@ chunks: repo: upstream:lzo ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 unpetrify-ref: lzo-2.08 + build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 unpetrify-ref: baserock/morph + build-depends: [] - name: acl morph: strata/foundation/acl.morph repo: upstream:acl @@ -117,6 +127,7 @@ chunks: repo: upstream:e2fsprogs ref: 6a3741ad293031447b95b88431eafa77401a8987 unpetrify-ref: v1.42.12 + build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs @@ -139,6 +150,7 @@ chunks: repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e unpetrify-ref: baserock/morph + build-depends: [] - name: openssh morph: strata/foundation/openssh.morph repo: upstream:openssh-git diff --git a/strata/genivi.morph b/strata/genivi.morph index 197943cc..f91bda09 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -10,11 +10,13 @@ chunks: repo: upstream:linuxquota ref: 0804c89a16736533e440771dc42a15e5d0223902 unpetrify-ref: baserock/genivi/morph + build-depends: [] - name: DLT-daemon morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon ref: 8b48e73f79b4463393916e4c6696917e3dedd026 unpetrify-ref: v2.10.0 + build-depends: [] - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller @@ -27,6 +29,7 @@ chunks: repo: upstream:googletest ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08 unpetrify-ref: baserock/morph + build-depends: [] - name: googlemock morph: strata/genivi/googlemock.morph repo: upstream:googlemock @@ -39,6 +42,7 @@ chunks: repo: upstream:genivi-common-api-runtime ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 + build-depends: [] - name: genivi-common-api-dbus-runtime morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime @@ -61,6 +65,7 @@ chunks: repo: upstream:itzam-tarball ref: 4ebcf671416927b64475da7b810b6016c847bf73 unpetrify-ref: baserock/genivi/baseline + build-depends: [] - name: persistence-common-object morph: strata/genivi/persistence-common-object.morph repo: upstream:genivi/persistence-common-object @@ -90,6 +95,7 @@ chunks: repo: git://github.com/libarchive/libarchive.git ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 + build-depends: [] - name: persistence-administrator morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator diff --git a/strata/gitlab.morph b/strata/gitlab.morph index ab77e7bb..0a1c35bb 100644 --- a/strata/gitlab.morph +++ b/strata/gitlab.morph @@ -9,13 +9,16 @@ chunks: repo: upstream:gitlab/gitlab-ce ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425 unpetrify-ref: baserock/v7.0.0 + build-depends: [] - name: gitlab-ci morph: strata/gitlab/gitlab-ci.morph repo: upstream:gitlab/gitlab-ci ref: c74044d65dec2ba8311e242c84e07a67abd52d37 unpetrify-ref: baserock/morph + build-depends: [] - name: gitlab-shell morph: strata/gitlab/gitlab-shell.morph repo: upstream:gitlab/gitlab-shell ref: 0b4106d57223c666d9360339fd3790174aa43800 unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index d885ff72..baa935f5 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -9,10 +9,12 @@ chunks: repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 + build-depends: [] - name: freetype2 repo: upstream:freetype2 ref: ec8853cd18e1a0c275372769bdad37a79550ed66 unpetrify-ref: VER-2-5-3 + build-depends: [] - name: fontconfig repo: upstream:fontconfig ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a @@ -24,18 +26,22 @@ chunks: repo: upstream:freefont-otf ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 unpetrify-ref: baserock/morph + build-depends: [] - name: libpng repo: upstream:libpng ref: 259fb7761d747655c607efcec7a12ff1f3c24561 unpetrify-ref: libpng-1.6.13-signed + build-depends: [] - name: libjpeg repo: upstream:libjpeg ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a unpetrify-ref: baserock/morph + build-depends: [] - name: libtiff repo: upstream:libtiff ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd unpetrify-ref: Release-v4-0-3 + build-depends: [] - name: cairo morph: strata/graphics-common/cairo.morph repo: upstream:cairo diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index 0493245f..f1141fcd 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -10,20 +10,24 @@ chunks: repo: upstream:pango ref: e0a21abf52a0b7588b1aa3357818948816ed9103 unpetrify-ref: 1.36.8 + build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info ref: c136fc2578aa8f7c0e098008da18d324033eb991 unpetrify-ref: Release-1-4 + build-depends: [] - name: gnome-common repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 + build-depends: [] - name: gdk-pixbuf morph: strata/gtk-deps/gdk-pixbuf.morph repo: upstream:gdk-pixbuf ref: b86959aa16e9d49ec6e286bc57d36c5249578c59 unpetrify-ref: 2.30.8 + build-depends: [] - name: atk repo: upstream:atk ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 @@ -34,6 +38,7 @@ chunks: repo: upstream:at-spi2-core ref: 96c2842088008670e72739ea7921d654487a57fb unpetrify-ref: AT_SPI2_CORE_2_14_1 + build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 4a19606a..8ac31eaa 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -9,3 +9,4 @@ chunks: morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ ref: fbf38d16bcc26630f0f721d266509f5bc292f606 + build-depends: [] diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 826555a0..8af030bb 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -9,6 +9,7 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 + build-depends: [] - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph index 35bc78cd..b6076cde 100644 --- a/strata/initramfs-utils.morph +++ b/strata/initramfs-utils.morph @@ -9,3 +9,4 @@ chunks: repo: baserock:baserock/initramfs-scripts ref: a97dea93d28ba272613029e46a8a0b1f699729d8 unpetrify-ref: master + build-depends: [] diff --git a/strata/input-common.morph b/strata/input-common.morph index e6ebad9a..dab05826 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -8,15 +8,18 @@ chunks: repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: v1.1.5 + build-depends: [] - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf unpetrify-ref: xkeyboard-config-2.13 + build-depends: [] - name: libevdev repo: upstream:libevdev ref: 7ac00d7e920c56bb8617403699030a5300bfae1c unpetrify-ref: libevdev-1.3.2 + build-depends: [] - name: libinput repo: upstream:libinput ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 diff --git a/strata/installer-utils.morph b/strata/installer-utils.morph index fe6c65fe..b97a7c09 100644 --- a/strata/installer-utils.morph +++ b/strata/installer-utils.morph @@ -9,3 +9,4 @@ chunks: repo: baserock:baserock/installer-scripts ref: master unpetrify-ref: master + build-depends: [] diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 0efac1e3..316bf483 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -7,6 +7,7 @@ chunks: repo: upstream:xorg-lib-libpciaccess ref: f99c2e4199ce37f6f94428df504427f67c3ec543 unpetrify-ref: libpciaccess-0.13.3 + build-depends: [] - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph index 9aa166fd..cf3dec19 100644 --- a/strata/lighttpd-server.morph +++ b/strata/lighttpd-server.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 1291e062..243461d6 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -8,3 +8,4 @@ chunks: repo: upstream:llvm ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f unpetrify-ref: release_33 + build-depends: [] diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 18339df2..38d90471 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -13,3 +13,4 @@ chunks: repo: baserock:baserock/lorry-controller ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd unpetrify-ref: master + build-depends: [] diff --git a/strata/lorry.morph b/strata/lorry.morph index 741bbc34..8a813d58 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -19,10 +19,12 @@ chunks: repo: upstream:bzr-tarball ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52 unpetrify-ref: baserock/morph + build-depends: [] - name: python-fastimport repo: upstream:python-fastimport ref: 6500a5e7d82651ade9002d44e3ecc71a50302616 unpetrify-ref: baserock/morph + build-depends: [] - name: bzr-fastimport repo: upstream:bzr-fastimport ref: b3cda9967f857127bd4dab5eb72223a95916f5ea @@ -35,11 +37,13 @@ chunks: repo: upstream:cvs-tarball ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph + build-depends: [] - name: libapr morph: strata/lorry/libapr.morph repo: upstream:libapr ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 unpetrify-ref: 1.5.1 + build-depends: [] - name: libapr-util morph: strata/lorry/libapr-util.morph repo: upstream:libapr-util @@ -52,6 +56,7 @@ chunks: repo: upstream:perl-dbi-tarball ref: 09e269cff811f0c1881ea0d6b7571173bab8377b unpetrify-ref: baserock/morph + build-depends: [] - name: perl-dbd-sqlite-tarball repo: upstream:perl-dbd-sqlite-tarball ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02 @@ -71,11 +76,13 @@ chunks: repo: upstream:swig-tarball ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b unpetrify-ref: baserock/morph + build-depends: [] - name: neon morph: strata/lorry/neon.morph repo: upstream:neon ref: 837374e9d797e216f1de684595cefe791f67c0e4 unpetrify-ref: baserock/morph + build-depends: [] - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball @@ -92,6 +99,7 @@ chunks: repo: upstream:mercurial-tarball ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a unpetrify-ref: baserock/morph + build-depends: [] - name: hg-fast-export morph: strata/lorry/hg-fast-export.morph repo: upstream:hg-fast-export @@ -104,6 +112,7 @@ chunks: repo: upstream:cvsps ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49 unpetrify-ref: baserock/morph + build-depends: [] - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry diff --git a/strata/lua.morph b/strata/lua.morph index dcdd8801..75ccad86 100644 --- a/strata/lua.morph +++ b/strata/lua.morph @@ -9,8 +9,10 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph + build-depends: [] - name: luajit2 morph: strata/lua/luajit2.morph repo: upstream:luajit2 ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d unpetrify-ref: v2.0.3 + build-depends: [] diff --git a/strata/lvm.morph b/strata/lvm.morph index 92a06f41..8c1c3f67 100644 --- a/strata/lvm.morph +++ b/strata/lvm.morph @@ -13,3 +13,4 @@ chunks: repo: upstream:lvm2 ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 unpetrify-ref: v2_02_115 + build-depends: [] diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 8967446c..efae2449 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:mesa ref: 1a9cc5f50db5d27530a3449743b43aac389d781f unpetrify-ref: mesa-10.3.3 + build-depends: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 7e3fdb30..05b7c149 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,25 +9,30 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph + build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph + build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph + build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph + build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph + build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -53,14 +58,17 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph + build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph + build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master + build-depends: [] - name: morph repo: baserock:baserock/morph ref: 9e105fccb12de23551c93aac6cb2b1056b858700 diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index 69f3ccad..f10dd2b3 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -8,6 +8,7 @@ chunks: repo: upstream:ogg ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f unpetrify-ref: master + build-depends: [] - name: libvorbis repo: upstream:libvorbis ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index 51230de2..e87c4050 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -11,6 +11,7 @@ chunks: repo: upstream:orc ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a unpetrify-ref: baserock/morph + build-depends: [] - name: gstreamer@0.10 repo: upstream:gstreamer ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index f91e5173..2df8a0ce 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -10,6 +10,7 @@ chunks: repo: upstream:orc ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 unpetrify-ref: orc-0.4.22 + build-depends: [] - name: gstreamer repo: upstream:gstreamer ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86 diff --git a/strata/network-security.morph b/strata/network-security.morph index d88d2f43..3d0c7814 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -8,6 +8,7 @@ chunks: repo: upstream:nspr-hg ref: a6ee84946475c1fb7624973af28163f6da247c0d unpetrify-ref: baserock/morph + build-depends: [] - name: nss morph: strata/network-security/nss.morph repo: upstream:nss diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index 689bec87..5af03abb 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -14,10 +14,12 @@ chunks: repo: upstream:iproute2 ref: 50231ad2a554fcb02462bed6405c970833c1baee unpetrify-ref: v3.17.0 + build-depends: [] - name: libmnl repo: upstream:libmnl ref: c9f19b98cd8e108617e825e071091df14f78c53a unpetrify-ref: master + build-depends: [] - name: ipset morph: strata/networking-utils/ipset.morph repo: upstream:ipset diff --git a/strata/nfs.morph b/strata/nfs.morph index 0d04812b..3dbead9d 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -8,11 +8,13 @@ chunks: repo: upstream:libevent ref: 0b49ae34594533daa82c06a506078de9e336a013 unpetrify-ref: release-2.1.5-beta + build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph repo: upstream:ti-rpc ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f unpetrify-ref: baserock/master + build-depends: [] - name: rpcbind morph: strata/nfs/rpcbind.morph repo: upstream:rpcbind diff --git a/strata/nodejs.morph b/strata/nodejs.morph index 58dbdd0b..f8955a01 100644 --- a/strata/nodejs.morph +++ b/strata/nodejs.morph @@ -8,3 +8,4 @@ chunks: repo: upstream:node ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e unpetrify-ref: v0.10.26 + build-depends: [] diff --git a/strata/ntpd.morph b/strata/ntpd.morph index e2ccc84a..e45e6424 100644 --- a/strata/ntpd.morph +++ b/strata/ntpd.morph @@ -7,3 +7,4 @@ chunks: repo: upstream:ntp ref: d4b7cd9723cce9561fa15f74b90b85a3a61b5ef8 unpetrify-ref: ntp-dev-4.2.7p482 + build-depends: [] diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 91559113..65f38855 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -8,10 +8,12 @@ chunks: repo: upstream:warlock ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 unpetrify-ref: 1.1.0 + build-depends: [] - name: python-keystoneclient repo: upstream:openstack/python-keystoneclient ref: 79d1eec35aad874a7c08ff22c39260884a5524ba unpetrify-ref: 0.11.1 + build-depends: [] - name: python-glanceclient repo: upstream:openstack/python-glanceclient ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b @@ -29,10 +31,12 @@ chunks: repo: upstream:openstack/python-swiftclient ref: bb4d2ab59c4de9389667eeed255642f51e276f1e unpetrify-ref: 2.3.1 + build-depends: [] - name: python-troveclient repo: upstream:openstack/python-troveclient ref: e010a919750f07493afd42a4db867853b925bcbf unpetrify-ref: 1.0.7 + build-depends: [] - name: python-cinderclient repo: upstream:openstack/python-cinderclient ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab @@ -44,6 +48,7 @@ chunks: repo: upstream:python-packages/pyparsing.git ref: 8062c76ab3958a570052124f17e71f3dd3ec2257 unpetrify-ref: pyparsing_2.0.3 + build-depends: [] - name: cmd2 repo: upstream:python-packages/cmd2.git ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index f59f6705..396d77c6 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -11,6 +11,7 @@ chunks: repo: upstream:python-packages/pycparser ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 unpetrify-ref: master + build-depends: [] - name: cffi repo: upstream:python-packages/cffi ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 @@ -21,6 +22,7 @@ chunks: repo: upstream:pytz-tarball ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c unpetrify-ref: pytz-2014.10 + build-depends: [] - name: babel repo: upstream:babel ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c @@ -31,10 +33,12 @@ chunks: repo: upstream:python-packages/enum34.git ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55 unpetrify-ref: enum34-1.0 + build-depends: [] - name: pyasn1 repo: upstream:python-packages/pyasn1 ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f unpetrify-ref: release_0_1_7_tag + build-depends: [] - name: cryptography repo: upstream:python-packages/cryptography ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f @@ -47,14 +51,17 @@ chunks: repo: upstream:pyiso8601 ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab unpetrify-ref: 0.1.10 + build-depends: [] - name: netaddr repo: upstream:netaddr ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b unpetrify-ref: release-0.7.12 + build-depends: [] - name: stevedore ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2 unpetrify-ref: 1.0.0.0a2 repo: upstream:openstack/stevedore + build-depends: [] - name: oslo-config repo: upstream:openstack/oslo-config ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 @@ -66,6 +73,7 @@ chunks: repo: upstream:python-packages/pyopenssl ref: 0146d447e63a737b4f05a1164d5950eff68543e7 unpetrify-ref: 0.14 + build-depends: [] - name: oslo-i18n repo: upstream:openstack/oslo-i18n ref: 040f1d6afa733527385d2309e485bf37e9843b0e @@ -84,15 +92,19 @@ chunks: repo: upstream:python-packages/futures ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597 unpetrify-ref: 2.2.0 + build-depends: [] - name: oslo-serialization repo: upstream:openstack/oslo-serialization.git ref: 80fec894a54253d9b4c80dd8a563957966ca0b88 unpetrify-ref: 0.3.0 + build-depends: [] - name: jsonschema repo: upstream:jsonschema ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 + build-depends: [] - name: simplejson repo: upstream:simplejson ref: 54d5ff15d508c51366986cc4f77f2f287f036582 unpetrify-ref: v3.6.4 + build-depends: [] diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph index 60e6d6cd..bcc03c86 100644 --- a/strata/patch-manager-gerrit.morph +++ b/strata/patch-manager-gerrit.morph @@ -8,3 +8,4 @@ chunks: repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master + build-depends: [] diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph index 8d0c2489..44d0bab2 100644 --- a/strata/pcre-utils.morph +++ b/strata/pcre-utils.morph @@ -7,3 +7,4 @@ chunks: repo: upstream:pcre ref: 2720152c58e13e7cc7403642ec33127101b9971b unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/python-common.morph b/strata/python-common.morph index 5879febd..850ad720 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -9,10 +9,12 @@ chunks: repo: upstream:python-packages/pycrypto ref: af058ee6f5da391a05275470ab4a4a96aa22b350 unpetrify-ref: v2.7a1 + build-depends: [] - name: ecdsa repo: upstream:python-packages/ecdsa ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c unpetrify-ref: python-ecdsa-0.11 + build-depends: [] - name: paramiko repo: upstream:paramiko ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22 @@ -24,6 +26,7 @@ chunks: repo: upstream:markupsafe ref: feb1d70c16df62f60dcb521d127fdad8819fc036 unpetrify-ref: 0.23 + build-depends: [] - name: jinja2 repo: upstream:jinja2 ref: 762c612e7276889aac265645da00e62e33d1573c @@ -34,6 +37,7 @@ chunks: repo: upstream:python-json-pointer ref: 34073e561261cb413b9bdff5beac31b070d98ea2 unpetrify-ref: v1.4 + build-depends: [] - name: python-json-patch repo: upstream:python-json-patch ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3 @@ -44,3 +48,4 @@ chunks: repo: upstream:python-prettytable ref: 7a48f1e84049577370cf28632a75d2fd01e4142d unpetrify-ref: master + build-depends: [] diff --git a/strata/python-core.morph b/strata/python-core.morph index 342e8c68..2daf78b0 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -9,6 +9,7 @@ chunks: repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master + build-depends: [] - name: pip repo: upstream:pip ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 @@ -25,10 +26,12 @@ chunks: repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 + build-depends: [] - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 + build-depends: [] - name: pyyaml morph: strata/python-core/pyyaml.morph repo: upstream:pyyaml diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 0acc1c0c..d1ce912d 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:python-packages/virtualenv ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c unpetrify-ref: 12.0.5 + build-depends: [] diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 192e9201..2dc41438 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:cpython ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c unpetrify-ref: v3.4.2 + build-depends: [] diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index 0533ea58..b260c9d9 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,3 +9,4 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 + build-depends: [] diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 698dc5ce..18d2cc5f 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -11,11 +11,13 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph + build-depends: [] - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 + build-depends: [] - name: ruby-1.9 morph: strata/qt4-tools/ruby-1.9.morph repo: upstream:ruby diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index d4c76ee8..066f62a0 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:qt-creator ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 unpetrify-ref: baserock/3.3.0 + build-depends: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index 92bfcde9..df36ccad 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -10,3 +10,4 @@ chunks: repo: upstream:qt5/qtmultimedia ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f unpetrify-ref: v5.3.2 + build-depends: [] diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index e5338d7a..4441e46b 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -11,6 +11,7 @@ chunks: repo: upstream:qt5/qtwebkit ref: 13f80d34ae84c3231118c8013beee55badab8929 unpetrify-ref: v5.3.2 + build-depends: [] - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index dbda3a2e..34e57bc4 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -10,6 +10,7 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph + build-depends: [] - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase diff --git a/strata/ruby.morph b/strata/ruby.morph index eba231be..c5bd9993 100644 --- a/strata/ruby.morph +++ b/strata/ruby.morph @@ -15,10 +15,12 @@ chunks: repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 + build-depends: [] - name: libyaml repo: upstream:libyaml-hg ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e unpetrify-ref: master + build-depends: [] - name: ruby morph: strata/ruby/ruby.morph repo: upstream:ruby diff --git a/strata/tools.morph b/strata/tools.morph index bdc7e8e7..9dcc2c7b 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -9,38 +9,46 @@ chunks: repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph + build-depends: [] - name: file repo: upstream:file ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 unpetrify-ref: file-5.22 + build-depends: [] - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch + build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph + build-depends: [] - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph + build-depends: [] - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 + build-depends: [] - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 unpetrify-ref: v4.8 + build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap + build-depends: [] - name: vala repo: upstream:vala ref: 682eba5880fbd76402dec10118883da913a7b255 @@ -52,24 +60,29 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph + build-depends: [] - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools ref: f4d1d2ad474e882df13418239aa3050673a844d7 unpetrify-ref: baserock/morph + build-depends: [] - name: device-tree-compiler morph: strata/tools/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph + build-depends: [] - name: sudo repo: upstream:sudo ref: a4769dc7999b53260325fb89945bef85714fb338 unpetrify-ref: baserock/morph + build-depends: [] - name: procps-ng repo: upstream:procps-ng ref: 85fff468fa263cdd2ff1c0144579527c32333695 unpetrify-ref: v3.3.9 + build-depends: [] prefix: / - name: ipmitool morph: strata/tools/ipmitool.morph diff --git a/strata/trove.morph b/strata/trove.morph index 40588c05..665f7d9a 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -12,6 +12,7 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph + build-depends: [] - name: lace morph: strata/trove/lace.morph repo: upstream:gitano/lace @@ -68,11 +69,13 @@ chunks: repo: upstream:cgit ref: acbf4a15e260c711094455dbef7c024f2553fd32 unpetrify-ref: baserock/morph + build-depends: [] - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master + build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph index fadcec92..7ac14158 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph @@ -13,6 +13,7 @@ chunks: repo: upstream:yasm ref: fefefe262eb29081f0bcb4d48f2d476ce5730562 unpetrify-ref: baserock/morph + build-depends: [] - name: vboxguest morph: strata/virtualbox-guest-x86_64/vboxguest.morph repo: upstream:VirtualBox diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 84eefdaf..1cd447af 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -14,25 +14,30 @@ chunks: repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph + build-depends: [] - name: xml-catalog morph: strata/virtualization/xml-catalog.morph repo: baserock:baserock/xml-catalog ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b unpetrify-ref: master + build-depends: [] - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954 unpetrify-ref: baserock/morph + build-depends: [] - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 + build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros ref: c98b41de5596c675c603ef43ae9570133f1a9921 unpetrify-ref: baserock/morph + build-depends: [] - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -44,6 +49,7 @@ chunks: repo: upstream:dmidecode ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 unpetrify-ref: master + build-depends: [] - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt @@ -60,6 +66,7 @@ chunks: repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e unpetrify-ref: baserock/morph + build-depends: [] - name: urlgrabber repo: upstream:urlgrabber ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04 @@ -70,6 +77,7 @@ chunks: repo: upstream:cython ref: 005d38d5921a603d5f4d413aae72f98a6d33192f unpetrify-ref: master + build-depends: [] - name: python-lxml repo: upstream:python-lxml ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92 @@ -88,6 +96,7 @@ chunks: repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 + build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph repo: upstream:pygobject @@ -122,8 +131,10 @@ chunks: repo: upstream:ebtables ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 unpetrify-ref: master + build-depends: [] - name: openvswitch morph: strata/virtualization/openvswitch.morph repo: upstream:openvswitch ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f unpretrify-ref: master + build-depends: [] diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index f65fa63e..58eefbbd 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -9,6 +9,7 @@ chunks: repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 unpetrify-ref: xkbcommon-0.5.0 + build-depends: [] - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland diff --git a/strata/webtools.morph b/strata/webtools.morph index 68ce80d5..39175747 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -10,17 +10,21 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph + build-depends: [] - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb unpetrify-ref: master + build-depends: [] - name: tar morph: strata/webtools/tar.morph repo: upstream:tar ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 + build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 + build-depends: [] diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 2925d72c..13106ea5 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -12,3 +12,4 @@ chunks: repo: upstream:weston ref: 322383ed469d69401b502618718a97a4e85c97d8 unpetrify-ref: baserock/weston-1.7.0/tegra + build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ea619821..ce403b6b 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -12,6 +12,7 @@ chunks: repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 + build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index 9836961f..8191b30f 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -7,100 +7,125 @@ chunks: repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-damageproto repo: upstream:xorg-proto-damageproto ref: 015b980e5091492dbe681af59569768ba89fbfe0 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-dmxproto repo: upstream:xorg-proto-dmxproto ref: 395f6fcc0a5635907b5e45829e86b29431316184 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-fixesproto repo: upstream:xorg-proto-fixesproto ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-fontsproto repo: upstream:xorg-proto-fontsproto ref: df8c05f7c0253a36589d96efa52938215eff9d4d unpetrify-ref: fontsproto-2.1.3 + build-depends: [] - name: xorg-proto-glproto repo: upstream:xorg-proto-glproto ref: f84853d97d5749308992412a215fa518b6536eb3 unpetrify-ref: glproto-1.4.17 + build-depends: [] - name: xorg-proto-inputproto repo: upstream:xorg-proto-inputproto ref: 343ff0938f592876b9d82c966f166bf45a78c3c8 unpetrify-ref: inputproto-2.3.1 + build-depends: [] - name: xorg-proto-kbproto repo: upstream:xorg-proto-kbproto ref: f7022f5775350dce3348b7151845a32390e98791 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-xineramaproto repo: upstream:xorg-proto-xineramaproto ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-randrproto repo: upstream:xorg-proto-randrproto ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-recordproto repo: upstream:xorg-proto-recordproto ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-renderproto repo: upstream:xorg-proto-renderproto ref: 935f5ec95a3718c184ff685f5b79b467483b7844 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-resourceproto repo: upstream:xorg-proto-resourceproto ref: ada91f54c98b5a61d3e116fca6bf239a8604730f unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-scrnsaverproto repo: upstream:xorg-proto-scrnsaverproto ref: 614532026e8ec7496216316fb584d6f2af6a7f7b unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-videoproto repo: upstream:xorg-proto-videoproto ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-xcmiscproto repo: upstream:xorg-proto-xcmiscproto ref: 83549077a3c2140b9862709004cd873f1c55e395 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-xextproto repo: upstream:xorg-proto-xextproto ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 unpetrify-ref: xextproto-7.3.0 + build-depends: [] - name: xorg-proto-xf86bigfontproto repo: upstream:xorg-proto-xf86bigfontproto ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155 unpetrify-ref: xproto-7.0.26 + build-depends: [] - name: xorg-proto-dri2proto repo: upstream:xorg-proto-dri2proto ref: ead89ad84877551cc15d26b95cb19a3e205df71f unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-proto-dri3proto repo: upstream:xorg-proto-dri3proto ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 + build-depends: [] - name: xorg-proto-presentproto repo: upstream:xorg-proto-presentproto ref: ef84007fc4a23d3897b4776906139de9d0698c2a + build-depends: [] - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 unpetrify-ref: "1.11" + build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 @@ -123,6 +148,7 @@ chunks: repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 unpetrify-ref: xtrans-1.3.5 + build-depends: [] - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 ref: cb107760df33ffc8630677e66e2e50aa37950a5c diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 665d4c5f..644d47c2 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -11,14 +11,17 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 + build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile ref: 7381c2f9013ef7784c78091fa671e652a62ca706 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-font-util repo: upstream:xorg-font-util ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87 unpetrify-ref: baserock/morph + build-depends: [] - name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 @@ -51,15 +54,18 @@ chunks: repo: upstream:xcb-util ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 unpetrify-ref: baserock/morph + build-depends: [] - name: util-wm repo: upstream:util-wm ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 unpetrify-ref: baserock/morph + build-depends: [] - name: util-keysyms morph: strata/x-generic/util-keysyms.morph repo: upstream:util-keysyms ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab unpetrify-ref: baserock/morph + build-depends: [] - name: util-image repo: upstream:util-image ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 diff --git a/strata/xfce.morph b/strata/xfce.morph index 295abfe1..5678c1fc 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -9,15 +9,18 @@ chunks: repo: upstream:libcroco ref: 611f624a6e15065792b41eb5ce14811293f3fb0a unpetrify-ref: baserock/morph + build-depends: [] - name: librsvg morph: strata/xfce/librsvg.morph repo: upstream:librsvg ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb unpetrify-ref: baserock/morph + build-depends: [] - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools ref: 9244250ac0c15ba160688758c5dccf97f3f160ef unpetrify-ref: baserock/morph + build-depends: [] - name: libxfce4util morph: strata/xfce/libxfce4util.morph repo: upstream:xfce/libxfce4util @@ -53,6 +56,7 @@ chunks: repo: upstream:libwww-perl/uri ref: 3dd72ded7f043a4f6973781fe594722e2e95f491 unpetrify-ref: baserock/morph + build-depends: [] - name: exo morph: strata/xfce/exo.morph repo: upstream:xfce/exo @@ -67,6 +71,7 @@ chunks: repo: upstream:libwnck ref: 6792abcdf27aceba1012406d51606e84b065a526 unpetrify-ref: baserock/xfce-build + build-depends: [] - name: xfce4-panel morph: strata/xfce/xfce4-panel.morph repo: upstream:xfce/xfce4-panel @@ -102,6 +107,7 @@ chunks: repo: upstream:iceauth ref: c07d443d43e53cfe21b53a9a0eafcd6189432867 unpetrify-ref: baserock/morph + build-depends: [] - name: xfce4-session morph: strata/xfce/xfce4-session.morph repo: upstream:xfce/xfce4-session @@ -162,3 +168,4 @@ chunks: repo: upstream:elementary-xfce ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779 unpetrify-ref: baserock/morph + build-depends: [] diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph index 909c9420..b8e67888 100644 --- a/strata/xorg-util-macros-common.morph +++ b/strata/xorg-util-macros-common.morph @@ -7,6 +7,7 @@ chunks: repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 unpetrify-ref: util-macros-1.19.0 + build-depends: [] - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b diff --git a/strata/xstatic.morph b/strata/xstatic.morph index bf21a296..7b40ee60 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -16,99 +16,124 @@ chunks: repo: upstream:xstatic ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 unpetrify-ref: 1.0.1 + build-depends: [] - name: xstatic-angular repo: upstream:xstatic-packages/xstatic-angular ref: dac047df05da5bb20de4e78876bc03820d0c6671 unpetrify-ref: 1.3.7.0 + build-depends: [] - name: xstatic-angular-animate repo: upstream:xstatic-packages/xstatic-angular-animate ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7 unpetrify-ref: master + build-depends: [] - name: xstatic-angular-bootstrap repo: upstream:xstatic-packages/xstatic-angular-bootstrap ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483 unpetrify-ref: master + build-depends: [] - name: xstatic-angular-cookies repo: upstream:xstatic-packages/xstatic-angular-cookies ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 unpetrify-ref: 1.2.1.1 + build-depends: [] - name: xstatic-angular-fileupload repo: upstream:xstatic-packages/xstatic-angular-fileupload ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae unpetrify-ref: master + build-depends: [] - name: xstatic-angular-mock repo: upstream:xstatic-packages/xstatic-angular-mock ref: 20fdada109b167bcdcacec22986b43fdb42866f3 unpetrify-ref: 1.2.1.1 + build-depends: [] - name: xstatic-angular-sanitize repo: upstream:xstatic-packages/xstatic-angular-sanitize ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999 unpetrify-ref: master + build-depends: [] - name: xstatic-angular-smart-table repo: upstream:xstatic-packages/xstatic-angular-smart-table ref: e0fbf69fb156b995547471d71c5c6a7f88989d47 unpetrify-ref: master + build-depends: [] - name: xstatic-bootstrap-datepicker repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a unpetrify-ref: master + build-depends: [] - name: xstatic-bootstrap-scss repo: upstream:xstatic-packages/xstatic-bootstrap-scss ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e unpetrify-ref: master + build-depends: [] - name: xstatic-d3 repo: upstream:xstatic-packages/xstatic-d3 ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf unpetrify-ref: master + build-depends: [] - name: xstatic-hogan repo: upstream:xstatic-packages/xstatic-hogan ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 unpetrify-ref: master + build-depends: [] - name: xstatic-font-awesome repo: upstream:xstatic-packages/xstatic-font-awesome ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 unpetrify-ref: 4.2.0.0 + build-depends: [] - name: xstatic-jasmine repo: upstream:xstatic-packages/xstatic-jasmine ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 unpetrify-ref: 2.1.2.0 + build-depends: [] - name: xstatic-jquery repo: upstream:xstatic-packages/xstatic-jquery ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 unpetrify-ref: master + build-depends: [] - name: xstatic-jquery-bootstrap-wizard repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142 unpetrify-ref: master + build-depends: [] - name: xstatic-jquery-migrate repo: upstream:xstatic-packages/xstatic-jquery-migrate ref: 989b3b31106727542dd83810c3b952f90d8cdb8f unpetrify-ref: master + build-depends: [] - name: xstatic-jquery-quicksearch repo: upstream:xstatic-packages/xstatic-jquery-quicksearch ref: f5221c8c30507340846d97d6db41a782e7c63316 unpetrify-ref: master + build-depends: [] - name: xstatic-jquery-tablesorter repo: upstream:xstatic-packages/xstatic-jquery-tablesorter ref: eb78328391f44a9a88033e1aede1a605902c5551 unpetrify-ref: master + build-depends: [] - name: xstatic-jquery-ui repo: upstream:xstatic-packages/xstatic-jquery-ui ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 unpetrify-ref: 1.11.0.1 + build-depends: [] - name: xstatic-jsencrypt repo: upstream:xstatic-packages/xstatic-jsencrypt ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 unpetrify-ref: master + build-depends: [] - name: xstatic-qunit repo: upstream:xstatic-packages/xstatic-qunit ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f unpetrify-ref: master + build-depends: [] - name: xstatic-rickshaw repo: upstream:xstatic-packages/xstatic-rickshaw ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 unpetrify-ref: master + build-depends: [] - name: xstatic-spin repo: upstream:xstatic-packages/xstatic-spin ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f unpetrify-ref: master + build-depends: [] diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index 83ce2e05..d4502ea1 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -14,3 +14,4 @@ chunks: morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master + build-depends: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 97acd2ca..6ad4269e 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -8,3 +8,4 @@ chunks: morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master + build-depends: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index 6328d327..3bcd5cca 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -8,11 +8,13 @@ chunks: - name: cppunit repo: upstream:cppunit ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf + build-depends: [] - name: java-binary morph: strata/zookeeper/java-binary.morph repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master + build-depends: [] - name: java-ant morph: strata/zookeeper/java-ant.morph repo: upstream:java/ant -- cgit v1.2.1 From c3586f5c01937e19ed1b4a4ea7f195b5045e9201 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 6 Mar 2015 18:42:24 +0000 Subject: Update morph to support version 1 definitions format --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 05b7c149..679e86eb 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -71,7 +71,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: 9e105fccb12de23551c93aac6cb2b1056b858700 + ref: be2370b14f08d1d1e147aca382d56a830a1b4094 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 9fa6cb41f584670cf5ca43b963d47ee62a8f6e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 4 Mar 2015 18:35:21 +0000 Subject: Do not use 'build-depends' chunk parameter when it's empthy (and change to version: 1) --- VERSION | 2 +- strata/NetworkManager-common.morph | 2 -- strata/ansible.morph | 1 - strata/apache-httpd-server.morph | 2 -- strata/armv7lhf-cross-toolchain.morph | 2 -- strata/audio-bluetooth.morph | 8 -------- strata/baserock-import.morph | 4 ---- strata/bsp-armv7-highbank.morph | 1 - strata/bsp-armv7-versatile.morph | 1 - strata/bsp-armv7b-highbank.morph | 1 - strata/bsp-armv7b-vexpress-tc2.morph | 1 - strata/bsp-armv8l64-generic.morph | 1 - strata/bsp-jetson.morph | 4 ---- strata/bsp-ppc64-generic.morph | 1 - strata/bsp-wandboard.morph | 1 - strata/bsp-x86_32-generic.morph | 2 -- strata/bsp-x86_64-generic.morph | 2 -- strata/bsp-x86_both-tools.morph | 1 - strata/build-essential.morph | 3 --- strata/ceph-service.morph | 6 ------ strata/chef.morph | 29 ----------------------------- strata/cloudinit-support.morph | 3 --- strata/connectivity.morph | 2 -- strata/connman-common.morph | 1 - strata/core.morph | 10 ---------- strata/coreutils-common.morph | 1 - strata/cross-bootstrap.morph | 3 --- strata/cross-tools.morph | 1 - strata/cxmanage.morph | 4 ---- strata/databases.morph | 4 ---- strata/devtools.morph | 4 ---- strata/django.morph | 3 --- strata/enlightenment.morph | 2 -- strata/erlang.morph | 1 - strata/foundation.morph | 12 ------------ strata/genivi.morph | 6 ------ strata/gitlab.morph | 3 --- strata/graphics-common.morph | 6 ------ strata/gtk-deps.morph | 5 ----- strata/gtk2.morph | 1 - strata/gtk3.morph | 1 - strata/initramfs-utils.morph | 1 - strata/input-common.morph | 3 --- strata/installer-utils.morph | 1 - strata/libdrm-common.morph | 1 - strata/lighttpd-server.morph | 1 - strata/llvm-common.morph | 1 - strata/lorry-controller.morph | 1 - strata/lorry.morph | 9 --------- strata/lua.morph | 2 -- strata/lvm.morph | 1 - strata/mesa-common.morph | 1 - strata/morph-utils.morph | 8 -------- strata/multimedia-common.morph | 1 - strata/multimedia-gstreamer-0.10.morph | 1 - strata/multimedia-gstreamer.morph | 1 - strata/network-security.morph | 1 - strata/networking-utils.morph | 2 -- strata/nfs.morph | 2 -- strata/nodejs.morph | 1 - strata/ntpd.morph | 1 - strata/openstack-clients.morph | 5 ----- strata/openstack-common.morph | 12 ------------ strata/patch-manager-gerrit.morph | 1 - strata/pcre-utils.morph | 1 - strata/python-common.morph | 5 ----- strata/python-core.morph | 3 --- strata/python-tools.morph | 1 - strata/python3-core.morph | 1 - strata/qt4-sdk.morph | 1 - strata/qt4-tools.morph | 2 -- strata/qt5-sdk.morph | 1 - strata/qt5-tools-qtmultimedia.morph | 1 - strata/qt5-tools-qtwebkit.morph | 1 - strata/qt5-tools.morph | 1 - strata/ruby.morph | 2 -- strata/tools.morph | 13 ------------- strata/trove.morph | 3 --- strata/virtualbox-guest-x86_64.morph | 1 - strata/virtualization.morph | 11 ----------- strata/wayland-generic.morph | 1 - strata/webtools.morph | 4 ---- strata/weston-common.morph | 1 - strata/weston-genivi.morph | 1 - strata/x-common.morph | 26 -------------------------- strata/x-generic.morph | 6 ------ strata/xfce.morph | 7 ------- strata/xorg-util-macros-common.morph | 1 - strata/xstatic.morph | 25 ------------------------- strata/zookeeper-client.morph | 1 - strata/zookeeper-server.morph | 1 - strata/zookeeper.morph | 2 -- 92 files changed, 1 insertion(+), 329 deletions(-) diff --git a/VERSION b/VERSION index 85260cb1..b8255184 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version: 0 +version: 1 diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 8115c309..93b94dff 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:libndp ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 unpetrify-ref: v1.4 - build-depends: [] - name: readline6 repo: upstream:readline ref: 7628b745a813aac53586b640da056a975f1c443e unpetrify-ref: readline-6.3 - build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph repo: upstream:NetworkManager diff --git a/strata/ansible.morph b/strata/ansible.morph index 5903017a..33a23750 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:ansible ref: ebc8d48d34296fe010096f044e2b7591df37a622 unpetrify-ref: baserock/v1.8.4 - build-depends: [] diff --git a/strata/apache-httpd-server.morph b/strata/apache-httpd-server.morph index 065ec155..7a403535 100644 --- a/strata/apache-httpd-server.morph +++ b/strata/apache-httpd-server.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:apache/apr ref: 3c818c6d7351f0130282d212a69035642f5fecad unpetrify-ref: trunk - build-depends: [] - name: httpd morph: strata/apache-httpd-server/httpd-server.morph repo: upstream:apache/httpd @@ -23,7 +22,6 @@ chunks: repo: upstream:python-packages/psutil ref: 2bc8555f0428af81c2d067aa76168ed7bc5e0179 unpetrify-ref: release-2.2.0 - build-depends: [] - name: mod_wsgi-metrics repo: upstream:python-packages/mod_wsgi-metrics ref: ec715eb593255229f9f45f3f323edbb845c691d8 diff --git a/strata/armv7lhf-cross-toolchain.morph b/strata/armv7lhf-cross-toolchain.morph index a3539d65..f153e0c3 100644 --- a/strata/armv7lhf-cross-toolchain.morph +++ b/strata/armv7lhf-cross-toolchain.morph @@ -9,14 +9,12 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] - name: armv7lhf-cross-linux-api-headers morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-linux-api-headers.morph repo: upstream:linux ref: df2e1b9168a7ab5dd8149e38b5ac70cdef86d1fa unpetrify-ref: baserock/v3.8 - build-depends: [] - name: armv7lhf-cross-gcc-nolibc morph: strata/armv7lhf-cross-toolchain/armv7lhf-cross-gcc-nolibc.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 829cf6f8..00a614c9 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -8,12 +8,10 @@ chunks: repo: upstream:libatomic_ops ref: 0a58f5d63969c10d2141af89cb7a53df786909ab unpetrify-ref: baserock/morph - build-depends: [] - name: alsa-lib repo: upstream:alsa-lib ref: 9cfd1faa27511edbb8bebbab85030125f33590ae unpetrify-ref: v1.0.28 - build-depends: [] - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils @@ -26,7 +24,6 @@ chunks: repo: upstream:libical ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 unpetrify-ref: baserock/morph - build-depends: [] - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez @@ -40,7 +37,6 @@ chunks: repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph - build-depends: [] - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc @@ -52,7 +48,6 @@ chunks: repo: upstream:speex ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa unpetrify-ref: baserock/morph - build-depends: [] - name: nohands morph: strata/audio-bluetooth/nohands.morph repo: upstream:nohands @@ -65,7 +60,6 @@ chunks: repo: upstream:mobile-broadband-provider-info ref: 4ed19e11c2975105b71b956440acdb25d46a347d unpetrify-ref: baserock/morph - build-depends: [] - name: ofono morph: strata/audio-bluetooth/ofono.morph repo: upstream:ofono @@ -79,13 +73,11 @@ chunks: repo: upstream:json-c ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch - build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph repo: upstream:libsndfile ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 unpetrify-ref: baserock/morph - build-depends: [] - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index 7ca5e7ce..a3a195db 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -8,22 +8,18 @@ chunks: repo: upstream:python-packages/ansicolor ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef unpetrify-ref: 0.2.4 - build-depends: [] - name: python-decorator repo: upstream:python-packages/python-decorator ref: b02f7a254c3679dfac57a824e08dd02ced850636 unpetrify-ref: decorator-3.4.0 - build-depends: [] - name: networkx repo: upstream:python-packages/networkx ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c unpetrify-ref: networkx-1.9.1 - build-depends: [] - name: requests-cache repo: upstream:python-packages/requests-cache ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf unpetrify-ref: 0.4.6 - build-depends: [] - name: baserock-import repo: baserock:baserock/import ref: 461979515ca30cd8e5acdec4cdb5ca3adeb6a9e7 diff --git a/strata/bsp-armv7-highbank.morph b/strata/bsp-armv7-highbank.morph index bdf047cf..2cf541a7 100644 --- a/strata/bsp-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7-versatile.morph b/strata/bsp-armv7-versatile.morph index 529b563c..f8d19b9b 100644 --- a/strata/bsp-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-highbank.morph b/strata/bsp-armv7b-highbank.morph index 97ccfe3c..7b0f0fa0 100644 --- a/strata/bsp-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2.morph index f8a7ff00..616d564f 100644 --- a/strata/bsp-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-armv8l64-generic.morph b/strata/bsp-armv8l64-generic.morph index 63c4ff5b..a5edb9db 100644 --- a/strata/bsp-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic.morph @@ -13,4 +13,3 @@ chunks: repo: upstream:linux ref: 5f06398ae6a04f414932243de38b5cf3d264ff84 unpetrify-ref: baserock/apm-xgene-m400-moonshot-cartridge - build-depends: [] diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 111402a7..85ab5ecf 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -17,7 +17,6 @@ chunks: repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: u-boot@jetson morph: strata/bsp-jetson/u-boot@jetson.morph repo: upstream:u-boot @@ -30,13 +29,11 @@ chunks: repo: upstream:linux ref: 682c943b0159b1a4105f31020605bf8a0f155ffd unpetrify-ref: baserock/v3.18-with-cpufreq - build-depends: [] - name: bsp-support morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: [] - name: nouveau-drm morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau @@ -49,4 +46,3 @@ chunks: repo: upstream:linux-firmware ref: 9322ef5b14c78ec28163baa41bff240a0e098810 unpetrify-ref: baserock/jetson - build-depends: [] diff --git a/strata/bsp-ppc64-generic.morph b/strata/bsp-ppc64-generic.morph index 002c00be..58038d60 100644 --- a/strata/bsp-ppc64-generic.morph +++ b/strata/bsp-ppc64-generic.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] diff --git a/strata/bsp-wandboard.morph b/strata/bsp-wandboard.morph index 4ffd2e0e..2ab095df 100644 --- a/strata/bsp-wandboard.morph +++ b/strata/bsp-wandboard.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: linux-armv7-wandboard morph: strata/bsp-wandboard/linux-armv7-wandboard.morph repo: upstream:linux diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 244745bf..10c4dbe5 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_32-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index 04be0dcd..749e3722 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linux ref: bfa76d49576599a4b9f9b7a71f23d73d6dcff735 unpetrify-ref: v3.19 - build-depends: [] - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_64-generic/syslinux.morph repo: upstream:syslinux diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph index b5bee9cb..f7212054 100644 --- a/strata/bsp-x86_both-tools.morph +++ b/strata/bsp-x86_both-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:nasm ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 unpetrify-ref: baserock/morph - build-depends: [] - name: syslinux morph: strata/bsp-x86_both-tools/syslinux.morph repo: upstream:syslinux diff --git a/strata/build-essential.morph b/strata/build-essential.morph index ac88b860..0758fee8 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -46,7 +46,6 @@ chunks: repo: upstream:binutils-redhat ref: b1d3b01332ae49a60ff5d6bf53d3a5b1805769c8 unpetrify-ref: baserock/build-essential - build-depends: [] build-mode: bootstrap prefix: /tools @@ -150,7 +149,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] build-mode: bootstrap prefix: /tools @@ -159,7 +157,6 @@ chunks: repo: baserock:baserock/fhs-dirs ref: 41bbb474cd4647ee715bc94c21c161d12a20deb4 unpetrify-ref: master - build-depends: [] build-mode: bootstrap prefix: /tools diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 1108ab4b..0fc987c4 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libaio ref: 08f50baec0e7731116d3f665c6155d7829edf5d7 unpetrify-ref: libaio-0.3.110-1 - build-depends: [] - name: keyutils morph: strata/ceph-service/keyutils.morph repo: upstream:keyutils ref: 9209a0c8fd63afc59f644e078b40cec531409c30 unpetrify-ref: v1.5.9 - build-depends: [] - name: libunwind repo: upstream:libunwind ref: d7322f0f64dab715c4feb5f08edef5660d8719c0 unpetrify-ref: v1.1 - build-depends: [] - name: gperftools repo: upstream:gperftools ref: 846b775dfadb77901202ae7ddbac30ad1de7df01 @@ -31,7 +28,6 @@ chunks: repo: upstream:snappy-git ref: 1ff9be9b8fafc8528ca9e055646f5932aa5db9c4 unpetrify-ref: master - build-depends: [] - name: leveldb morph: strata/ceph-service/leveldb.morph repo: upstream:leveldb @@ -44,13 +40,11 @@ chunks: repo: upstream:libeditline-tarball ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph - build-depends: [] - name: boost morph: strata/ceph-service/boost.morph repo: upstream:boost-tarball ref: 1c3648bf5b7d17fcd4fe9bc95802b16fd9eee304 unpetrify-ref: boost_1_56_0 - build-depends: [] - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph diff --git a/strata/chef.morph b/strata/chef.morph index 9105a2e0..69b495aa 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:yajl ref: a0ecdde0c042b9256170f2f8890dd9451a4240aa unpetrify-ref: 2.1.0 - build-depends: [] - name: libyajl2-1.0.1 morph: strata/chef/libyajl2-1.0.1.morph repo: upstream:ruby-gems/libyajl2-gem @@ -23,31 +22,26 @@ chunks: repo: upstream:ruby-gems/chef ref: 9841bc9c6271c6d9add3aff0c2e11239cfb129ca unpetrify-ref: 12.0.3 - build-depends: [] - name: chef-zero-2.2 morph: strata/chef/chef-zero-2.2.morph repo: upstream:ruby-gems/chef-zero ref: 231c3abd052e606820297a97e4bc32bdab656a02 unpetrify-ref: v2.2 - build-depends: [] - name: coderay-1.1.0.rc1 morph: strata/chef/coderay-1.1.0.morph repo: upstream:ruby-gems/coderay ref: a48037b85a12228431b32103786456f36beb355f unpetrify-ref: v1.1.0 - build-depends: [] - name: erubis-master morph: strata/chef/erubis-master.morph repo: upstream:ruby-gems/erubis ref: 14d3eab57fbc361312c8f3af350cbf9a5bafce17 unpetrify-ref: master - build-depends: [] - name: ffi-1.9.3 morph: strata/chef/ffi-1.9.3.morph repo: upstream:ruby-gems/ffi ref: d982b7049336106c04f7721045dc5613b16d3545 unpetrify-ref: 1.9.3 - build-depends: [] - name: ffi-yajl-1.0.2 morph: strata/chef/ffi-yajl-master.morph repo: upstream:ruby-gems/ffi-yajl @@ -60,19 +54,16 @@ chunks: repo: upstream:ruby-gems/hashie ref: 95b97fbff2cac643d56ec718cb708665500682e5 unpetrify-ref: v2.1.2 - build-depends: [] - name: highline-1.6.21 morph: strata/chef/highline-master.morph repo: upstream:ruby-gems/highline ref: 51de22e436e6d45696759d673d7b9ceba16cae39 unpetrify-ref: master - build-depends: [] - name: hoe-master morph: strata/chef/hoe-master.morph repo: upstream:ruby-gems/hoe ref: d94b26b4687be0a24d04b7cb582753fbec33d7e4 unpetrify-ref: master - build-depends: [] - name: diff-lcs-1.2.5 morph: strata/chef/diff-lcs-1.2.5.morph repo: upstream:diff-lcs @@ -85,19 +76,16 @@ chunks: repo: upstream:ruby-gems/ipaddress ref: dae93ad0e4fb9a5d547a15dae0c3f2417078c845 unpetrify-ref: master - build-depends: [] - name: json-1.8.1 morph: strata/chef/json-1.8.1.morph repo: upstream:ruby-gems/json ref: 92a96dea2b24b9c68856004d69491f46aedd0925 unpetrify-ref: v1.8.1 - build-depends: [] - name: method_source-0.8.1 morph: strata/chef/method_source-0.8.2.morph repo: upstream:ruby-gems/method_source ref: 1b1f8323a7c25f29331fe32511f50697e5405dbd unpetrify-ref: v0.8.2 - build-depends: [] - name: mime-types-1.25.1 morph: strata/chef/mime-types-1.25.1.morph repo: upstream:ruby-gems/mime-types @@ -110,103 +98,86 @@ chunks: repo: upstream:ruby-gems/mixlib-authentication ref: db24a56c6f5b99114998a50942220a7023060229 unpetrify-ref: 1.3.0 - build-depends: [] - name: mixlib-cli-1.5.0 morph: strata/chef/mixlib-cli-1.5.0.morph repo: upstream:ruby-gems/mixlib-cli ref: b3b3c12141b5380ec61945770690fc1ae31d92b0 unpetrify-ref: 1.5.0 - build-depends: [] - name: mixlib-config-2.1.0 morph: strata/chef/mixlib-config-2.1.0.morph repo: upstream:ruby-gems/mixlib-config ref: c5e2dee2beb5fdd17442ff92e520f2ef01d17ee5 unpetrify-ref: v2.1.0 - build-depends: [] - name: mixlib-log-1.6.0 morph: strata/chef/mixlib-log-master.morph repo: upstream:ruby-gems/mixlib-log ref: 50ec55964ce19d3a8a14050be9a23c4b8990e2f0 unpetrify-ref: master - build-depends: [] - name: mixlib-shellout-1.4.0 morph: strata/chef/mixlib-shellout-1.4.0.morph repo: upstream:ruby-gems/mixlib-shellout ref: a04ce6db22edf0575c50e18ae2db09adced7dedc unpetrify-ref: 1.4.0 - build-depends: [] - name: net-dhcp-1.2.1 morph: strata/chef/net-dhcp-1.2.1.morph repo: upstream:net-dhcp-ruby ref: b644922a08aa09e2ce75f8f9f9fa1f0b8cecb2e9 unpetrify-ref: v1.2.1 - build-depends: [] - name: net-ssh-2.9.1 morph: strata/chef/net-ssh-2.9.1.morph repo: upstream:ruby-gems/net-ssh ref: 9f8607984d8e904f211cc5edb39ab2a2ca94008e unpetrify-ref: v2.9.1 - build-depends: [] - name: net-ssh-gateway-1.2.0 morph: strata/chef/net-ssh-gateway-1.2.0.morph repo: upstream:ruby-gems/net-ssh-gateway ref: 1de7611a7f7cedbe7a4c6cf3798c88d00637582d unpetrify-ref: v1.2.0 - build-depends: [] - name: net-ssh-multi-1.2.0 morph: strata/chef/net-ssh-multi-1.2.0.morph repo: upstream:ruby-gems/net-ssh-multi ref: b659f2884b2c9abdbe3bbf3c844937a0799ed5ac unpetrify-ref: v1.2.0 - build-depends: [] - name: ohai-7.4.0.dev morph: strata/chef/ohai-master.morph repo: upstream:ruby-gems/ohai ref: 0bf2ed32744445a253082910ee4e07b2b38023a7 unpetrify-ref: master - build-depends: [] - name: plist-master morph: strata/chef/plist-master.morph repo: upstream:ruby-gems/plist ref: 12eb82d283cab148183c37c07e3f75a309969dec unpetrify-ref: master - build-depends: [] - name: pry-0.10.1 morph: strata/chef/pry-master.morph repo: upstream:ruby-gems/pry ref: 6d5eb0831b50ec729d2dc3356255b49535535e37 unpetrify-ref: master - build-depends: [] - name: rack-1.5.2 morph: strata/chef/rack-1.5.2.morph repo: upstream:ruby-gems/rack ref: ac590d055c936bb9a618e955a690dc836c625211 unpetrify-ref: 1.5.2 - build-depends: [] - name: slop-3.6.0 morph: strata/chef/slop-3.6.0.morph repo: upstream:ruby-gems/slop ref: c3f84e7e794004f9ae6958c13ef3dd3038c2c0eb unpetrify-ref: v3.6.0 - build-depends: [] - name: systemu-2.6.4 morph: strata/chef/systemu-master.morph repo: upstream:ruby-gems/systemu ref: 35340f1e91941af47988b1b9d77705493b96d3db unpetrify-ref: master - build-depends: [] - name: wmi-lite-1.0.0 morph: strata/chef/wmi-lite-1.0.0.morph repo: upstream:ruby-gems/wmi-lite ref: 9377836dc0a5487474038ec727f02f9b33facfa6 unpetrify-ref: 1.0.0 - build-depends: [] - name: libpopt morph: strata/chef/libpopt.morph repo: upstream:libpopt ref: c224abf28f4ff9bbf292908324359cb5905addf8 unpetrify-ref: master - build-depends: [] - name: sgdisk morph: strata/chef/sgdisk.morph repo: upstream:sgdisk diff --git a/strata/cloudinit-support.morph b/strata/cloudinit-support.morph index 5281b745..1c752e58 100644 --- a/strata/cloudinit-support.morph +++ b/strata/cloudinit-support.morph @@ -11,17 +11,14 @@ chunks: repo: upstream:configobj ref: 935a78736e4eb43b9fafae87f5e9902328673f63 unpetrify-ref: baserock/morph - build-depends: [] - name: python-cheetah repo: upstream:python-cheetah ref: 831aa6b99d9b4fb012ee644d8e80e0bc0eb6d6ed unpetrify-ref: baserock/morph - build-depends: [] - name: boto repo: upstream:boto ref: bd49c22b5a30bf58096d58efc4762f1fea3e2caf unpetrify-ref: baserock/morph - build-depends: [] - name: cloud-init morph: strata/cloudinit-support/cloud-init.morph repo: upstream:cloud-init diff --git a/strata/connectivity.morph b/strata/connectivity.morph index 2cc6bb69..dbd4a263 100644 --- a/strata/connectivity.morph +++ b/strata/connectivity.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:libnl ref: a2c4bd8f094a7247903578860a9c42049991860b unpetrify-ref: baserock/morph - build-depends: [] - name: wpa_supplicant morph: strata/connectivity/wpa_supplicant.morph repo: upstream:hostap @@ -19,4 +18,3 @@ chunks: repo: upstream:iptables ref: 482c6d3731e2681cb4baae835c294840300197e6 unpetrify-ref: v1.4.21 - build-depends: [] diff --git a/strata/connman-common.morph b/strata/connman-common.morph index f6f7ddb0..a22b7e90 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:connman ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 unpetrify-ref: baserock/1.24 - build-depends: [] diff --git a/strata/core.morph b/strata/core.morph index 5de96bd4..b424a023 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -9,37 +9,31 @@ chunks: repo: upstream:sqlite3 ref: 24adc227bc29cd17e39df097fbca389c7724cd14 unpetrify-ref: sqlite-autoconf-3080801 - build-depends: [] - name: cmake morph: strata/core/cmake.morph repo: upstream:cmake ref: 0b3781e4c497566acaa504d4106d11c02a642501 unpetrify-ref: v2.8.12.2 - build-depends: [] - name: gdbm morph: strata/core/gdbm.morph repo: upstream:gdbm-tarball ref: e5faeaaf75ecfb705a9b643b3e4cb881ebb69f48 unpetrify-ref: gdbm-1.11 - build-depends: [] - name: gettext-tarball morph: strata/core/gettext-tarball.morph repo: upstream:gettext-tarball ref: 482840e61f86ca321838a91e902c41d40c098bbb unpetrify-ref: gettext-0.19.4 - build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph repo: baserock:baserock/mini-utils ref: 5293265b29bbf468ab9d7f3302b19dbc81d0f8b8 unpetrify-ref: master - build-depends: [] - name: ncurses morph: strata/core/ncurses.morph repo: upstream:ncurses ref: f67398afa6a76fbc902cc0cea963d5151fa2a953 unpetrify-ref: ncurses-5.9-20150131 - build-depends: [] - name: perl morph: strata/core/perl.morph repo: upstream:perl @@ -76,7 +70,6 @@ chunks: repo: upstream:bash ref: 3590145af6f1c9fa321dff231f69ae696e7e740b unpetrify-ref: baserock/bash-4.3-patch-27 - build-depends: [] - name: flex morph: strata/core/flex.morph repo: upstream:flex @@ -97,7 +90,6 @@ chunks: repo: upstream:bzip2 ref: 8deafa68e52b230018c0318dc7959ff9af3ad2a5 unpetrify-ref: baserock/morph - build-depends: [] - name: readline morph: strata/core/readline.morph repo: upstream:readline @@ -121,7 +113,6 @@ chunks: repo: upstream:libtool-tarball ref: c026ca36e37d2643623a75d0d3e9e451023139f3 unpetrify-ref: libtool-2.4.6 - build-depends: [] - name: gtk-doc-stub repo: upstream:gtk-doc-stub ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 @@ -218,7 +209,6 @@ chunks: repo: upstream:gperf ref: 5094e4a539adf845111013f82c2c4fcaec637983 unpetrify-ref: baserock/morph - build-depends: [] - name: intltool repo: upstream:intltool ref: 12f04c88be9ff8a578d8fd6990ee2448c66dc5f4 diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2051cf50..f226f50b 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 - build-depends: [] - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed diff --git a/strata/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 3aa61caf..ffed2e66 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: openssh morph: strata/cross-bootstrap/openssh.morph repo: upstream:openssh-git @@ -22,10 +21,8 @@ chunks: repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/cross-bootstrap/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 - build-depends: [] diff --git a/strata/cross-tools.morph b/strata/cross-tools.morph index c3e35e6d..36a82808 100644 --- a/strata/cross-tools.morph +++ b/strata/cross-tools.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:patchelf ref: 21a85cc1c63cf3ef060ece59cdd82455e2884703 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/cxmanage.morph b/strata/cxmanage.morph index 057558b8..326f7a59 100644 --- a/strata/cxmanage.morph +++ b/strata/cxmanage.morph @@ -8,23 +8,19 @@ chunks: repo: upstream:ipmitool ref: 830d5a3787b265e5dde154d2f0e08b10ae9a7bcd unpetrify-ref: baserock/morph - build-depends: [] - name: pexpect morph: strata/cxmanage/pexpect.morph repo: upstream:pexpect ref: 7a8455f21bb45020f3594c59fc8c85cf738e147c unpetrify-ref: baserock/morph - build-depends: [] - name: pyipmi repo: upstream:pyipmi ref: bb7dba84578c05ba87db3c4186a2989c89e4e519 unpetrify-ref: baserock/morph - build-depends: [] - name: tftpy repo: upstream:tftpy ref: f3d2fc4c62c1e64dd49adfaf8e65097eb8ea307b unpetrify-ref: baserock/morph - build-depends: [] - name: cxmanage repo: upstream:cxmanage ref: 54116d3c486ed7aa49f284e4cad9e6e7c293bea6 diff --git a/strata/databases.morph b/strata/databases.morph index 9171925c..89aa996e 100644 --- a/strata/databases.morph +++ b/strata/databases.morph @@ -10,19 +10,16 @@ chunks: repo: upstream:postgresql ref: d4f8dde3c1c2c90c723ab550e7f449fc75599316 unpetrify-ref: REL9_3_4 - build-depends: [] - name: redis morph: strata/databases/redis.morph repo: upstream:redis ref: 9ee59fca9c5c429185d35779c2d5db64005091b0 unpetrify-ref: baserock/3.0 - build-depends: [] - name: memcached morph: strata/databases/memcached.morph repo: upstream:memcached ref: c5530027c8ea28674358327ab8212ebaf014c848 unpetrify-ref: 1.4.22 - build-depends: [] - name: psycopg2 repo: upstream:python-packages/psycopg2 ref: 00cafbe85bb82d85cbfe0f062a73c562433b5bc8 @@ -33,4 +30,3 @@ chunks: repo: upstream:python-packages/python-memcached ref: 156ee975ff6e5c69e1d6c58b09bedf03c182c5db unpetrify-ref: master - build-depends: [] diff --git a/strata/devtools.morph b/strata/devtools.morph index 73ebd783..9a295db5 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -13,20 +13,16 @@ chunks: repo: upstream:vim ref: 07c2c06799e0579e6bfb1a7d98acf38e36a98f79 unpetrify-ref: baserock/morph - build-depends: [] - name: pv repo: upstream:pv ref: d6ce7cfec684fa72d7a919d7b1aa817a0ca6102a unpetrify-ref: baserock/morph - build-depends: [] - name: screen morph: strata/devtools/screen.morph repo: upstream:screen ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 unpetrify-ref: baserock/morph - build-depends: [] - name: less repo: upstream:less ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/django.morph b/strata/django.morph index 7659593c..8ae63801 100644 --- a/strata/django.morph +++ b/strata/django.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:python-packages/django ref: 811508b0512d3fa6b2328f8647fbf9eace68eceb unpetrify-ref: 1.6.8 - build-depends: [] - name: django-appconf repo: upstream:python-packages/django-appconf ref: 0c9835f95b44db1b3eb1a9409f95a3ecd63b8ff5 unpetrify-ref: 0.6 - build-depends: [] - name: django-compressor repo: upstream:python-packages/django-compressor ref: e747dce3d7e04fe595bbfed54f9554c2725eb757 @@ -25,7 +23,6 @@ chunks: repo: upstream:python-packages/pyscss ref: 85e8806e39e840c4402ee813c3e38fefaf9212b4 unpetrify-ref: 1.2.1 - build-depends: [] - name: django-pyscss repo: upstream:python-packages/django-pyscss ref: 665270b54eea5de5aca379a78673b411ed6b1f04 diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 25eafce2..d1637f48 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -13,13 +13,11 @@ chunks: repo: upstream:fribidi ref: c9916f2ab289126a32febcc4754efc73a011fb0c unpetrify-ref: baserock/morph/0.19.6 - build-depends: [] - name: bullet3 morph: strata/enlightenment/bullet3.morph repo: upstream:bullet3 ref: 940059ddb3c4476bb9860f79f35b0b1230857f54 unpetrify-ref: baserock/morph - build-depends: [] - name: efl morph: strata/enlightenment/efl.morph repo: upstream:enlightenment/efl diff --git a/strata/erlang.morph b/strata/erlang.morph index bea09d61..d31e78cd 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:erlang ref: 9417f044ee3c291c2ea343c203aebdcc40597226 unpetrify-ref: OTP-17.3.4 - build-depends: [] - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/strata/foundation.morph b/strata/foundation.morph index d85ed9c4..775444c9 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -9,25 +9,21 @@ chunks: repo: upstream:attr ref: 4b005410f865895d4dcd56e2c135278a7a315877 unpetrify-ref: baserock/morph - build-depends: [] - name: groff morph: strata/foundation/groff.morph repo: upstream:groff-git ref: 16305a24e67966ace06d55e2a0b98cc0e3127a93 unpetrify-ref: 1.22.3 - build-depends: [] - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 - build-depends: [] - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz ref: a0782484f101ac55c916568bc1c490d7761fc904 unpetrify-ref: 2015a - build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -40,13 +36,11 @@ chunks: repo: upstream:libffi ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph - build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph - build-depends: [] - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -67,7 +61,6 @@ chunks: - name: libgpg-error repo: upstream:libgpg-error ref: a498812d767c59ae2b75b0c985f5280b139e7dc4 - build-depends: [] - name: libgcrypt repo: upstream:libgcrypt ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 @@ -78,7 +71,6 @@ chunks: repo: upstream:linux-pam ref: b1521c97e73b10469f7b34c0571d51c647eca83c unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -108,13 +100,11 @@ chunks: repo: upstream:lzo ref: 5cca83e4d1b0be5825a597ab24ffa6126dc0bc95 unpetrify-ref: lzo-2.08 - build-depends: [] - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 unpetrify-ref: baserock/morph - build-depends: [] - name: acl morph: strata/foundation/acl.morph repo: upstream:acl @@ -127,7 +117,6 @@ chunks: repo: upstream:e2fsprogs ref: 6a3741ad293031447b95b88431eafa77401a8987 unpetrify-ref: v1.42.12 - build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs @@ -150,7 +139,6 @@ chunks: repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e unpetrify-ref: baserock/morph - build-depends: [] - name: openssh morph: strata/foundation/openssh.morph repo: upstream:openssh-git diff --git a/strata/genivi.morph b/strata/genivi.morph index f91bda09..197943cc 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -10,13 +10,11 @@ chunks: repo: upstream:linuxquota ref: 0804c89a16736533e440771dc42a15e5d0223902 unpetrify-ref: baserock/genivi/morph - build-depends: [] - name: DLT-daemon morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon ref: 8b48e73f79b4463393916e4c6696917e3dedd026 unpetrify-ref: v2.10.0 - build-depends: [] - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller @@ -29,7 +27,6 @@ chunks: repo: upstream:googletest ref: 5e3f7d3db4c16e2ba8b42b0bf4689f7d2abbcb08 unpetrify-ref: baserock/morph - build-depends: [] - name: googlemock morph: strata/genivi/googlemock.morph repo: upstream:googlemock @@ -42,7 +39,6 @@ chunks: repo: upstream:genivi-common-api-runtime ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c unpetrify-ref: 2.1.6 - build-depends: [] - name: genivi-common-api-dbus-runtime morph: strata/genivi/genivi-common-api-dbus-runtime.morph repo: upstream:genivi-common-api-dbus-runtime @@ -65,7 +61,6 @@ chunks: repo: upstream:itzam-tarball ref: 4ebcf671416927b64475da7b810b6016c847bf73 unpetrify-ref: baserock/genivi/baseline - build-depends: [] - name: persistence-common-object morph: strata/genivi/persistence-common-object.morph repo: upstream:genivi/persistence-common-object @@ -95,7 +90,6 @@ chunks: repo: git://github.com/libarchive/libarchive.git ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 - build-depends: [] - name: persistence-administrator morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator diff --git a/strata/gitlab.morph b/strata/gitlab.morph index 0a1c35bb..ab77e7bb 100644 --- a/strata/gitlab.morph +++ b/strata/gitlab.morph @@ -9,16 +9,13 @@ chunks: repo: upstream:gitlab/gitlab-ce ref: 53d98a77d34cbfddaef9eb25cf5f651a78550425 unpetrify-ref: baserock/v7.0.0 - build-depends: [] - name: gitlab-ci morph: strata/gitlab/gitlab-ci.morph repo: upstream:gitlab/gitlab-ci ref: c74044d65dec2ba8311e242c84e07a67abd52d37 unpetrify-ref: baserock/morph - build-depends: [] - name: gitlab-shell morph: strata/gitlab/gitlab-shell.morph repo: upstream:gitlab/gitlab-shell ref: 0b4106d57223c666d9360339fd3790174aa43800 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index baa935f5..d885ff72 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:pixman ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 unpetrify-ref: pixman-0.32.6 - build-depends: [] - name: freetype2 repo: upstream:freetype2 ref: ec8853cd18e1a0c275372769bdad37a79550ed66 unpetrify-ref: VER-2-5-3 - build-depends: [] - name: fontconfig repo: upstream:fontconfig ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a @@ -26,22 +24,18 @@ chunks: repo: upstream:freefont-otf ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 unpetrify-ref: baserock/morph - build-depends: [] - name: libpng repo: upstream:libpng ref: 259fb7761d747655c607efcec7a12ff1f3c24561 unpetrify-ref: libpng-1.6.13-signed - build-depends: [] - name: libjpeg repo: upstream:libjpeg ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a unpetrify-ref: baserock/morph - build-depends: [] - name: libtiff repo: upstream:libtiff ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd unpetrify-ref: Release-v4-0-3 - build-depends: [] - name: cairo morph: strata/graphics-common/cairo.morph repo: upstream:cairo diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index f1141fcd..0493245f 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -10,24 +10,20 @@ chunks: repo: upstream:pango ref: e0a21abf52a0b7588b1aa3357818948816ed9103 unpetrify-ref: 1.36.8 - build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info ref: c136fc2578aa8f7c0e098008da18d324033eb991 unpetrify-ref: Release-1-4 - build-depends: [] - name: gnome-common repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: gdk-pixbuf morph: strata/gtk-deps/gdk-pixbuf.morph repo: upstream:gdk-pixbuf ref: b86959aa16e9d49ec6e286bc57d36c5249578c59 unpetrify-ref: 2.30.8 - build-depends: [] - name: atk repo: upstream:atk ref: 2fb9411c3f32adb7ee421b59e36d2e0aa2f30253 @@ -38,7 +34,6 @@ chunks: repo: upstream:at-spi2-core ref: 96c2842088008670e72739ea7921d654487a57fb unpetrify-ref: AT_SPI2_CORE_2_14_1 - build-depends: [] - name: at-spi2-atk repo: upstream:at-spi2-atk ref: 2c220ff6565c4f02428a0c80267616a677e81ac9 diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 8ac31eaa..4a19606a 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -9,4 +9,3 @@ chunks: morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ ref: fbf38d16bcc26630f0f721d266509f5bc292f606 - build-depends: [] diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 8af030bb..826555a0 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: gtk3 morph: strata/gtk3/gtk3.morph repo: upstream:gtk+ diff --git a/strata/initramfs-utils.morph b/strata/initramfs-utils.morph index b6076cde..35bc78cd 100644 --- a/strata/initramfs-utils.morph +++ b/strata/initramfs-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/initramfs-scripts ref: a97dea93d28ba272613029e46a8a0b1f699729d8 unpetrify-ref: master - build-depends: [] diff --git a/strata/input-common.morph b/strata/input-common.morph index dab05826..e6ebad9a 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -8,18 +8,15 @@ chunks: repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: v1.1.5 - build-depends: [] - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config ref: 73aa90ce32967747c84a1b5fe32cee329bc3bbcf unpetrify-ref: xkeyboard-config-2.13 - build-depends: [] - name: libevdev repo: upstream:libevdev ref: 7ac00d7e920c56bb8617403699030a5300bfae1c unpetrify-ref: libevdev-1.3.2 - build-depends: [] - name: libinput repo: upstream:libinput ref: ca4e03fb11429b6a3704206124fbff2f57d121f9 diff --git a/strata/installer-utils.morph b/strata/installer-utils.morph index b97a7c09..fe6c65fe 100644 --- a/strata/installer-utils.morph +++ b/strata/installer-utils.morph @@ -9,4 +9,3 @@ chunks: repo: baserock:baserock/installer-scripts ref: master unpetrify-ref: master - build-depends: [] diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index 316bf483..0efac1e3 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-lib-libpciaccess ref: f99c2e4199ce37f6f94428df504427f67c3ec543 unpetrify-ref: libpciaccess-0.13.3 - build-depends: [] - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph diff --git a/strata/lighttpd-server.morph b/strata/lighttpd-server.morph index cf3dec19..9aa166fd 100644 --- a/strata/lighttpd-server.morph +++ b/strata/lighttpd-server.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:lighttpd ref: 12e4e21763da770034267ff0a7b660876930f789 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/llvm-common.morph b/strata/llvm-common.morph index 243461d6..1291e062 100644 --- a/strata/llvm-common.morph +++ b/strata/llvm-common.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:llvm ref: a93239b7c6f0d78cb8836768c3ffbc39fb15b79f unpetrify-ref: release_33 - build-depends: [] diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 38d90471..18339df2 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -13,4 +13,3 @@ chunks: repo: baserock:baserock/lorry-controller ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd unpetrify-ref: master - build-depends: [] diff --git a/strata/lorry.morph b/strata/lorry.morph index 8a813d58..741bbc34 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -19,12 +19,10 @@ chunks: repo: upstream:bzr-tarball ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52 unpetrify-ref: baserock/morph - build-depends: [] - name: python-fastimport repo: upstream:python-fastimport ref: 6500a5e7d82651ade9002d44e3ecc71a50302616 unpetrify-ref: baserock/morph - build-depends: [] - name: bzr-fastimport repo: upstream:bzr-fastimport ref: b3cda9967f857127bd4dab5eb72223a95916f5ea @@ -37,13 +35,11 @@ chunks: repo: upstream:cvs-tarball ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98 unpetrify-ref: baserock/morph - build-depends: [] - name: libapr morph: strata/lorry/libapr.morph repo: upstream:libapr ref: 10835ec9a2d8bb9f7b867d15f29984d29744f028 unpetrify-ref: 1.5.1 - build-depends: [] - name: libapr-util morph: strata/lorry/libapr-util.morph repo: upstream:libapr-util @@ -56,7 +52,6 @@ chunks: repo: upstream:perl-dbi-tarball ref: 09e269cff811f0c1881ea0d6b7571173bab8377b unpetrify-ref: baserock/morph - build-depends: [] - name: perl-dbd-sqlite-tarball repo: upstream:perl-dbd-sqlite-tarball ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02 @@ -76,13 +71,11 @@ chunks: repo: upstream:swig-tarball ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b unpetrify-ref: baserock/morph - build-depends: [] - name: neon morph: strata/lorry/neon.morph repo: upstream:neon ref: 837374e9d797e216f1de684595cefe791f67c0e4 unpetrify-ref: baserock/morph - build-depends: [] - name: subversion-tarball morph: strata/lorry/subversion-tarball.morph repo: upstream:subversion-tarball @@ -99,7 +92,6 @@ chunks: repo: upstream:mercurial-tarball ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a unpetrify-ref: baserock/morph - build-depends: [] - name: hg-fast-export morph: strata/lorry/hg-fast-export.morph repo: upstream:hg-fast-export @@ -112,7 +104,6 @@ chunks: repo: upstream:cvsps ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49 unpetrify-ref: baserock/morph - build-depends: [] - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry diff --git a/strata/lua.morph b/strata/lua.morph index 75ccad86..dcdd8801 100644 --- a/strata/lua.morph +++ b/strata/lua.morph @@ -9,10 +9,8 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: luajit2 morph: strata/lua/luajit2.morph repo: upstream:luajit2 ref: 880ca300e8fb7b432b9d25ed377db2102e4cb63d unpetrify-ref: v2.0.3 - build-depends: [] diff --git a/strata/lvm.morph b/strata/lvm.morph index 8c1c3f67..92a06f41 100644 --- a/strata/lvm.morph +++ b/strata/lvm.morph @@ -13,4 +13,3 @@ chunks: repo: upstream:lvm2 ref: fa01faaa4aa96de834ba7e8fbb9d9aff908571c3 unpetrify-ref: v2_02_115 - build-depends: [] diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index efae2449..8967446c 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:mesa ref: 1a9cc5f50db5d27530a3449743b43aac389d781f unpetrify-ref: mesa-10.3.3 - build-depends: [] diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 679e86eb..d8af58aa 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -9,30 +9,25 @@ chunks: repo: upstream:python-ttystatus ref: 47d871216cea6ce3b9d6efd70e9a0f38ab8604f0 unpetrify-ref: baserock/morph - build-depends: [] - name: python-markdown repo: upstream:python-markdown ref: a9ca97325e9039de90eae29fb3d8879bc9f367f6 unpetrify-ref: baserock/morph - build-depends: [] - name: git-fat morph: strata/tools/git-fat.morph repo: upstream:git-fat ref: 208f88d0f0ef04c25e8a231979eb0083f57b1610 unpetrify-ref: baserock/morph - build-depends: [] - name: pyfilesystem morph: strata/morph-utils/pyfilesystem.morph repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coveragepy morph: strata/morph-utils/python-coveragepy.morph repo: upstream:python-coveragepy ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 unpetrify-ref: baserock/morph - build-depends: [] - name: python-coverage-test-runner repo: upstream:python-coverage-test-runner ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 @@ -58,17 +53,14 @@ chunks: repo: upstream:bottle ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f unpetrify-ref: baserock/morph - build-depends: [] - name: flup repo: upstream:flup ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 unpetrify-ref: baserock/morph - build-depends: [] - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 unpetrify-ref: master - build-depends: [] - name: morph repo: baserock:baserock/morph ref: be2370b14f08d1d1e147aca382d56a830a1b4094 diff --git a/strata/multimedia-common.morph b/strata/multimedia-common.morph index f10dd2b3..69f3ccad 100644 --- a/strata/multimedia-common.morph +++ b/strata/multimedia-common.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:ogg ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f unpetrify-ref: master - build-depends: [] - name: libvorbis repo: upstream:libvorbis ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index e87c4050..51230de2 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:orc ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a unpetrify-ref: baserock/morph - build-depends: [] - name: gstreamer@0.10 repo: upstream:gstreamer ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 2df8a0ce..f91e5173 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:orc ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 unpetrify-ref: orc-0.4.22 - build-depends: [] - name: gstreamer repo: upstream:gstreamer ref: c61dea148ca3f14586d8eddf0b7e6ca47c164c86 diff --git a/strata/network-security.morph b/strata/network-security.morph index 3d0c7814..d88d2f43 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -8,7 +8,6 @@ chunks: repo: upstream:nspr-hg ref: a6ee84946475c1fb7624973af28163f6da247c0d unpetrify-ref: baserock/morph - build-depends: [] - name: nss morph: strata/network-security/nss.morph repo: upstream:nss diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph index 5af03abb..689bec87 100644 --- a/strata/networking-utils.morph +++ b/strata/networking-utils.morph @@ -14,12 +14,10 @@ chunks: repo: upstream:iproute2 ref: 50231ad2a554fcb02462bed6405c970833c1baee unpetrify-ref: v3.17.0 - build-depends: [] - name: libmnl repo: upstream:libmnl ref: c9f19b98cd8e108617e825e071091df14f78c53a unpetrify-ref: master - build-depends: [] - name: ipset morph: strata/networking-utils/ipset.morph repo: upstream:ipset diff --git a/strata/nfs.morph b/strata/nfs.morph index 3dbead9d..0d04812b 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -8,13 +8,11 @@ chunks: repo: upstream:libevent ref: 0b49ae34594533daa82c06a506078de9e336a013 unpetrify-ref: release-2.1.5-beta - build-depends: [] - name: ti-rpc morph: strata/nfs/ti-rpc.morph repo: upstream:ti-rpc ref: c5a7a19070e74115fc9c26aa6f3dfec1da220c1f unpetrify-ref: baserock/master - build-depends: [] - name: rpcbind morph: strata/nfs/rpcbind.morph repo: upstream:rpcbind diff --git a/strata/nodejs.morph b/strata/nodejs.morph index f8955a01..58dbdd0b 100644 --- a/strata/nodejs.morph +++ b/strata/nodejs.morph @@ -8,4 +8,3 @@ chunks: repo: upstream:node ref: cc56c62ed879ad4f93b1fdab3235c43e60f48b7e unpetrify-ref: v0.10.26 - build-depends: [] diff --git a/strata/ntpd.morph b/strata/ntpd.morph index e45e6424..e2ccc84a 100644 --- a/strata/ntpd.morph +++ b/strata/ntpd.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:ntp ref: d4b7cd9723cce9561fa15f74b90b85a3a61b5ef8 unpetrify-ref: ntp-dev-4.2.7p482 - build-depends: [] diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 65f38855..91559113 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -8,12 +8,10 @@ chunks: repo: upstream:warlock ref: 408ccb82347aabf3dc7cf6eccbd2ed2475cb0d60 unpetrify-ref: 1.1.0 - build-depends: [] - name: python-keystoneclient repo: upstream:openstack/python-keystoneclient ref: 79d1eec35aad874a7c08ff22c39260884a5524ba unpetrify-ref: 0.11.1 - build-depends: [] - name: python-glanceclient repo: upstream:openstack/python-glanceclient ref: 8a877b2752162d6a2db43d7d61d6311c4f42285b @@ -31,12 +29,10 @@ chunks: repo: upstream:openstack/python-swiftclient ref: bb4d2ab59c4de9389667eeed255642f51e276f1e unpetrify-ref: 2.3.1 - build-depends: [] - name: python-troveclient repo: upstream:openstack/python-troveclient ref: e010a919750f07493afd42a4db867853b925bcbf unpetrify-ref: 1.0.7 - build-depends: [] - name: python-cinderclient repo: upstream:openstack/python-cinderclient ref: ac9b0913904c43f4bf12c8164324d6e6a55dc1ab @@ -48,7 +44,6 @@ chunks: repo: upstream:python-packages/pyparsing.git ref: 8062c76ab3958a570052124f17e71f3dd3ec2257 unpetrify-ref: pyparsing_2.0.3 - build-depends: [] - name: cmd2 repo: upstream:python-packages/cmd2.git ref: 07b4dc3d6991cbdc420c246e807371c97a467d1a diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 396d77c6..f59f6705 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:python-packages/pycparser ref: c926670643ebb5f88a2bf56579fc9934c82be6d2 unpetrify-ref: master - build-depends: [] - name: cffi repo: upstream:python-packages/cffi ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 @@ -22,7 +21,6 @@ chunks: repo: upstream:pytz-tarball ref: c414cb801776e11c769fb36c0d37b8d7a7c8712c unpetrify-ref: pytz-2014.10 - build-depends: [] - name: babel repo: upstream:babel ref: 246996b0ee51e49ebcd504e234d3bcdcb178996c @@ -33,12 +31,10 @@ chunks: repo: upstream:python-packages/enum34.git ref: f1fa1787ceaac72b9934f318ea2135d28c05dd55 unpetrify-ref: enum34-1.0 - build-depends: [] - name: pyasn1 repo: upstream:python-packages/pyasn1 ref: fa8e66c5f4367a1e39b53dcddc133d084b10400f unpetrify-ref: release_0_1_7_tag - build-depends: [] - name: cryptography repo: upstream:python-packages/cryptography ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f @@ -51,17 +47,14 @@ chunks: repo: upstream:pyiso8601 ref: 9eb87a9bab114e9cc9a8d3dceb04362644d89cab unpetrify-ref: 0.1.10 - build-depends: [] - name: netaddr repo: upstream:netaddr ref: bbb31ed50a5338a7d1c0011fc4429d09954f9f0b unpetrify-ref: release-0.7.12 - build-depends: [] - name: stevedore ref: 860bd8f8ecba38fdfda5b41a3a1dbe854d6528e2 unpetrify-ref: 1.0.0.0a2 repo: upstream:openstack/stevedore - build-depends: [] - name: oslo-config repo: upstream:openstack/oslo-config ref: 059579ac2189b94bc9e9555b2e9acfb31a83ef53 @@ -73,7 +66,6 @@ chunks: repo: upstream:python-packages/pyopenssl ref: 0146d447e63a737b4f05a1164d5950eff68543e7 unpetrify-ref: 0.14 - build-depends: [] - name: oslo-i18n repo: upstream:openstack/oslo-i18n ref: 040f1d6afa733527385d2309e485bf37e9843b0e @@ -92,19 +84,15 @@ chunks: repo: upstream:python-packages/futures ref: 4f7ceedb8a7742e52b0436a4160c7c44665a2597 unpetrify-ref: 2.2.0 - build-depends: [] - name: oslo-serialization repo: upstream:openstack/oslo-serialization.git ref: 80fec894a54253d9b4c80dd8a563957966ca0b88 unpetrify-ref: 0.3.0 - build-depends: [] - name: jsonschema repo: upstream:jsonschema ref: 35b60f390098d3306c03eee27ceec8cf8a493579 unpetrify-ref: v2.3.0 - build-depends: [] - name: simplejson repo: upstream:simplejson ref: 54d5ff15d508c51366986cc4f77f2f287f036582 unpetrify-ref: v3.6.4 - build-depends: [] diff --git a/strata/patch-manager-gerrit.morph b/strata/patch-manager-gerrit.morph index bcc03c86..60e6d6cd 100644 --- a/strata/patch-manager-gerrit.morph +++ b/strata/patch-manager-gerrit.morph @@ -8,4 +8,3 @@ chunks: repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] diff --git a/strata/pcre-utils.morph b/strata/pcre-utils.morph index 44d0bab2..8d0c2489 100644 --- a/strata/pcre-utils.morph +++ b/strata/pcre-utils.morph @@ -7,4 +7,3 @@ chunks: repo: upstream:pcre ref: 2720152c58e13e7cc7403642ec33127101b9971b unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/python-common.morph b/strata/python-common.morph index 850ad720..5879febd 100644 --- a/strata/python-common.morph +++ b/strata/python-common.morph @@ -9,12 +9,10 @@ chunks: repo: upstream:python-packages/pycrypto ref: af058ee6f5da391a05275470ab4a4a96aa22b350 unpetrify-ref: v2.7a1 - build-depends: [] - name: ecdsa repo: upstream:python-packages/ecdsa ref: 36e9cfa80fcf8b53119adc787e54a5892ec1eb2c unpetrify-ref: python-ecdsa-0.11 - build-depends: [] - name: paramiko repo: upstream:paramiko ref: 424ba615c2a94d3b059e7f24db1a1093a92d8d22 @@ -26,7 +24,6 @@ chunks: repo: upstream:markupsafe ref: feb1d70c16df62f60dcb521d127fdad8819fc036 unpetrify-ref: 0.23 - build-depends: [] - name: jinja2 repo: upstream:jinja2 ref: 762c612e7276889aac265645da00e62e33d1573c @@ -37,7 +34,6 @@ chunks: repo: upstream:python-json-pointer ref: 34073e561261cb413b9bdff5beac31b070d98ea2 unpetrify-ref: v1.4 - build-depends: [] - name: python-json-patch repo: upstream:python-json-patch ref: e4da658a5dc9f68d3386017ffdcc8e07d22b51a3 @@ -48,4 +44,3 @@ chunks: repo: upstream:python-prettytable ref: 7a48f1e84049577370cf28632a75d2fd01e4142d unpetrify-ref: master - build-depends: [] diff --git a/strata/python-core.morph b/strata/python-core.morph index 2daf78b0..342e8c68 100644 --- a/strata/python-core.morph +++ b/strata/python-core.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:python-setuptools-bitbucket ref: 0aa6a4de5931d02876428388678802db2371fd37 unpetrify-ref: baserock/master - build-depends: [] - name: pip repo: upstream:pip ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 @@ -26,12 +25,10 @@ chunks: repo: upstream:python-requests ref: b83131779c701720a9ae9efae78996277d416269 unpetrify-ref: v2.5.1 - build-depends: [] - name: six repo: upstream:six ref: 8cfbff6b764af86d825086fa1637aa009e90d75a unpetrify-ref: 1.9.0 - build-depends: [] - name: pyyaml morph: strata/python-core/pyyaml.morph repo: upstream:pyyaml diff --git a/strata/python-tools.morph b/strata/python-tools.morph index d1ce912d..0acc1c0c 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:python-packages/virtualenv ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c unpetrify-ref: 12.0.5 - build-depends: [] diff --git a/strata/python3-core.morph b/strata/python3-core.morph index 2dc41438..192e9201 100644 --- a/strata/python3-core.morph +++ b/strata/python3-core.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:cpython ref: d1414cefaddc7b56caef75eea87226b1fce5ca7c unpetrify-ref: v3.4.2 - build-depends: [] diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index b260c9d9..0533ea58 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,4 +9,3 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 - build-depends: [] diff --git a/strata/qt4-tools.morph b/strata/qt4-tools.morph index 18d2cc5f..698dc5ce 100644 --- a/strata/qt4-tools.morph +++ b/strata/qt4-tools.morph @@ -11,13 +11,11 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: ruby-1.8 morph: strata/qt4-tools/ruby-1.8.morph repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: ruby-1.9 morph: strata/qt4-tools/ruby-1.9.morph repo: upstream:ruby diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 066f62a0..d4c76ee8 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt-creator ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 unpetrify-ref: baserock/3.3.0 - build-depends: [] diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index df36ccad..92bfcde9 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -10,4 +10,3 @@ chunks: repo: upstream:qt5/qtmultimedia ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f unpetrify-ref: v5.3.2 - build-depends: [] diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index 4441e46b..e5338d7a 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -11,7 +11,6 @@ chunks: repo: upstream:qt5/qtwebkit ref: 13f80d34ae84c3231118c8013beee55badab8929 unpetrify-ref: v5.3.2 - build-depends: [] - name: qtwebkit-examples morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 34e57bc4..dbda3a2e 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -10,7 +10,6 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase diff --git a/strata/ruby.morph b/strata/ruby.morph index c5bd9993..eba231be 100644 --- a/strata/ruby.morph +++ b/strata/ruby.morph @@ -15,12 +15,10 @@ chunks: repo: upstream:ruby ref: 7a24f1710028d568ad61d0aa49d5178260178d77 unpetrify-ref: baserock/morph/ruby_1_8_7 - build-depends: [] - name: libyaml repo: upstream:libyaml-hg ref: 0577078d6625a7bf06e6bc7fb26a43e27400b17e unpetrify-ref: master - build-depends: [] - name: ruby morph: strata/ruby/ruby.morph repo: upstream:ruby diff --git a/strata/tools.morph b/strata/tools.morph index 9dcc2c7b..bdc7e8e7 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -9,46 +9,38 @@ chunks: repo: upstream:distcc ref: c9691a9604fdf9d6711204999787d332b7141692 unpetrify-ref: baserock/morph - build-depends: [] - name: file repo: upstream:file ref: f69c3fd9bcb108292e7887dd889e8b49f68c4a52 unpetrify-ref: file-5.22 - build-depends: [] - name: gdb morph: strata/tools/gdb.morph repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch - build-depends: [] - name: linux-user-chroot repo: upstream:linux-user-chroot ref: d25cc110f69e6e71a95b4ac532dcfc5423d4a16b unpetrify-ref: baserock/morph - build-depends: [] - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph - build-depends: [] - name: rsync morph: strata/tools/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 - build-depends: [] - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 unpetrify-ref: v4.8 - build-depends: [] - name: vala-bootstrap morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap - build-depends: [] - name: vala repo: upstream:vala ref: 682eba5880fbd76402dec10118883da913a7b255 @@ -60,29 +52,24 @@ chunks: repo: upstream:u-boot ref: fe57382d04b46c37f34cf8d3b3ad876554fd12bf unpetrify-ref: baserock/morph - build-depends: [] - name: kexec-tools morph: strata/tools/kexec-tools.morph repo: upstream:kexec-tools ref: f4d1d2ad474e882df13418239aa3050673a844d7 unpetrify-ref: baserock/morph - build-depends: [] - name: device-tree-compiler morph: strata/tools/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph - build-depends: [] - name: sudo repo: upstream:sudo ref: a4769dc7999b53260325fb89945bef85714fb338 unpetrify-ref: baserock/morph - build-depends: [] - name: procps-ng repo: upstream:procps-ng ref: 85fff468fa263cdd2ff1c0144579527c32333695 unpetrify-ref: v3.3.9 - build-depends: [] prefix: / - name: ipmitool morph: strata/tools/ipmitool.morph diff --git a/strata/trove.morph b/strata/trove.morph index 665f7d9a..40588c05 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:lua ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642 unpetrify-ref: baserock/5.1-morph - build-depends: [] - name: lace morph: strata/trove/lace.morph repo: upstream:gitano/lace @@ -69,13 +68,11 @@ chunks: repo: upstream:cgit ref: acbf4a15e260c711094455dbef7c024f2553fd32 unpetrify-ref: baserock/morph - build-depends: [] - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 unpetrify-ref: master - build-depends: [] - name: lua-scrypt morph: strata/trove/lua-scrypt.morph repo: upstream:lua-scrypt diff --git a/strata/virtualbox-guest-x86_64.morph b/strata/virtualbox-guest-x86_64.morph index 7ac14158..fadcec92 100644 --- a/strata/virtualbox-guest-x86_64.morph +++ b/strata/virtualbox-guest-x86_64.morph @@ -13,7 +13,6 @@ chunks: repo: upstream:yasm ref: fefefe262eb29081f0bcb4d48f2d476ce5730562 unpetrify-ref: baserock/morph - build-depends: [] - name: vboxguest morph: strata/virtualbox-guest-x86_64/vboxguest.morph repo: upstream:VirtualBox diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 1cd447af..84eefdaf 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -14,30 +14,25 @@ chunks: repo: upstream:yajl ref: 52fc681857228c65c1cb439782da485554875481 unpetrify-ref: baserock/morph - build-depends: [] - name: xml-catalog morph: strata/virtualization/xml-catalog.morph repo: baserock:baserock/xml-catalog ref: 1d4a2abc875c4dda1b5eadc0a097a48a8d2ec82b unpetrify-ref: master - build-depends: [] - name: dnsmasq morph: strata/virtualization/dnsmasq.morph repo: upstream:dnsmasq ref: 8471cd938ca41fbe4fee8ae3f657625c92cfb954 unpetrify-ref: baserock/morph - build-depends: [] - name: qemu morph: strata/virtualization/qemu.morph repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 - build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros ref: c98b41de5596c675c603ef43ae9570133f1a9921 unpetrify-ref: baserock/morph - build-depends: [] - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -49,7 +44,6 @@ chunks: repo: upstream:dmidecode ref: 47a0aa5d6696a83922ee70279b7253a4e55947d5 unpetrify-ref: master - build-depends: [] - name: libvirt morph: strata/virtualization/libvirt.morph repo: upstream:libvirt @@ -66,7 +60,6 @@ chunks: repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e unpetrify-ref: baserock/morph - build-depends: [] - name: urlgrabber repo: upstream:urlgrabber ref: bf0a0be71373dec515bbb54e0613a3b9b0c00b04 @@ -77,7 +70,6 @@ chunks: repo: upstream:cython ref: 005d38d5921a603d5f4d413aae72f98a6d33192f unpetrify-ref: master - build-depends: [] - name: python-lxml repo: upstream:python-lxml ref: 8fc99f8ef3e2f12e74fb407ae62c5db50cfe7b92 @@ -96,7 +88,6 @@ chunks: repo: upstream:gnome-common ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 - build-depends: [] - name: pygobject morph: strata/virtualization/pygobject.morph repo: upstream:pygobject @@ -131,10 +122,8 @@ chunks: repo: upstream:ebtables ref: f4bdc80ae8c1a79b4ab5dcb8431ad85aea618d66 unpetrify-ref: master - build-depends: [] - name: openvswitch morph: strata/virtualization/openvswitch.morph repo: upstream:openvswitch ref: a52b0492a4d0398a24ed2a3566ff55ac53fea31f unpretrify-ref: master - build-depends: [] diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 58eefbbd..f65fa63e 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -9,7 +9,6 @@ chunks: repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 unpetrify-ref: xkbcommon-0.5.0 - build-depends: [] - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland diff --git a/strata/webtools.morph b/strata/webtools.morph index 39175747..68ce80d5 100644 --- a/strata/webtools.morph +++ b/strata/webtools.morph @@ -10,21 +10,17 @@ chunks: repo: upstream:icu ref: ba023548a3bff7277cbea4acade3042ce9d8949e unpetrify-ref: baserock/morph - build-depends: [] - name: libgit2 repo: upstream:libgit2 ref: 4b0a36e881506a02b43a4ae3c19c93c919b36eeb unpetrify-ref: master - build-depends: [] - name: tar morph: strata/webtools/tar.morph repo: upstream:tar ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 unpetrify-ref: baserock/release_1_28 - build-depends: [] - name: nginx morph: strata/webtools/nginx.morph repo: upstream:nginx ref: 37a582c9ea3e731c115e560d31b26f78535b8fca unpetrify-ref: baserock/v1.7.0 - build-depends: [] diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 13106ea5..2925d72c 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -12,4 +12,3 @@ chunks: repo: upstream:weston ref: 322383ed469d69401b502618718a97a4e85c97d8 unpetrify-ref: baserock/weston-1.7.0/tegra - build-depends: [] diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index ce403b6b..ea619821 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -12,7 +12,6 @@ chunks: repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index 8191b30f..9836961f 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -7,125 +7,100 @@ chunks: repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-damageproto repo: upstream:xorg-proto-damageproto ref: 015b980e5091492dbe681af59569768ba89fbfe0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dmxproto repo: upstream:xorg-proto-dmxproto ref: 395f6fcc0a5635907b5e45829e86b29431316184 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fixesproto repo: upstream:xorg-proto-fixesproto ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-fontsproto repo: upstream:xorg-proto-fontsproto ref: df8c05f7c0253a36589d96efa52938215eff9d4d unpetrify-ref: fontsproto-2.1.3 - build-depends: [] - name: xorg-proto-glproto repo: upstream:xorg-proto-glproto ref: f84853d97d5749308992412a215fa518b6536eb3 unpetrify-ref: glproto-1.4.17 - build-depends: [] - name: xorg-proto-inputproto repo: upstream:xorg-proto-inputproto ref: 343ff0938f592876b9d82c966f166bf45a78c3c8 unpetrify-ref: inputproto-2.3.1 - build-depends: [] - name: xorg-proto-kbproto repo: upstream:xorg-proto-kbproto ref: f7022f5775350dce3348b7151845a32390e98791 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xineramaproto repo: upstream:xorg-proto-xineramaproto ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-randrproto repo: upstream:xorg-proto-randrproto ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-recordproto repo: upstream:xorg-proto-recordproto ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-renderproto repo: upstream:xorg-proto-renderproto ref: 935f5ec95a3718c184ff685f5b79b467483b7844 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-resourceproto repo: upstream:xorg-proto-resourceproto ref: ada91f54c98b5a61d3e116fca6bf239a8604730f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-scrnsaverproto repo: upstream:xorg-proto-scrnsaverproto ref: 614532026e8ec7496216316fb584d6f2af6a7f7b unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-videoproto repo: upstream:xorg-proto-videoproto ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xcmiscproto repo: upstream:xorg-proto-xcmiscproto ref: 83549077a3c2140b9862709004cd873f1c55e395 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xextproto repo: upstream:xorg-proto-xextproto ref: 66afec3f49e8eb0d4c2e9af7088fc3116d4bafd7 unpetrify-ref: xextproto-7.3.0 - build-depends: [] - name: xorg-proto-xf86bigfontproto repo: upstream:xorg-proto-xf86bigfontproto ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155 unpetrify-ref: xproto-7.0.26 - build-depends: [] - name: xorg-proto-dri2proto repo: upstream:xorg-proto-dri2proto ref: ead89ad84877551cc15d26b95cb19a3e205df71f unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-dri3proto repo: upstream:xorg-proto-dri3proto ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 - build-depends: [] - name: xorg-proto-presentproto repo: upstream:xorg-proto-presentproto ref: ef84007fc4a23d3897b4776906139de9d0698c2a - build-depends: [] - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 unpetrify-ref: "1.11" - build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 @@ -148,7 +123,6 @@ chunks: repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 unpetrify-ref: xtrans-1.3.5 - build-depends: [] - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 ref: cb107760df33ffc8630677e66e2e50aa37950a5c diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 644d47c2..665d4c5f 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -11,17 +11,14 @@ chunks: repo: upstream:libepoxy ref: 7422de5b4be7b19d789136b3bb5f932de42db27c unpetrify-ref: v1.2 - build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile ref: 7381c2f9013ef7784c78091fa671e652a62ca706 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-font-util repo: upstream:xorg-font-util ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87 unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-lib-libfontenc repo: upstream:xorg-lib-libfontenc ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975 @@ -54,18 +51,15 @@ chunks: repo: upstream:xcb-util ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-wm repo: upstream:util-wm ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3 unpetrify-ref: baserock/morph - build-depends: [] - name: util-keysyms morph: strata/x-generic/util-keysyms.morph repo: upstream:util-keysyms ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab unpetrify-ref: baserock/morph - build-depends: [] - name: util-image repo: upstream:util-image ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816 diff --git a/strata/xfce.morph b/strata/xfce.morph index 5678c1fc..295abfe1 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -9,18 +9,15 @@ chunks: repo: upstream:libcroco ref: 611f624a6e15065792b41eb5ce14811293f3fb0a unpetrify-ref: baserock/morph - build-depends: [] - name: librsvg morph: strata/xfce/librsvg.morph repo: upstream:librsvg ref: 61171ca59d02b58b7da1697ca1d924bff93e66cb unpetrify-ref: baserock/morph - build-depends: [] - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools ref: 9244250ac0c15ba160688758c5dccf97f3f160ef unpetrify-ref: baserock/morph - build-depends: [] - name: libxfce4util morph: strata/xfce/libxfce4util.morph repo: upstream:xfce/libxfce4util @@ -56,7 +53,6 @@ chunks: repo: upstream:libwww-perl/uri ref: 3dd72ded7f043a4f6973781fe594722e2e95f491 unpetrify-ref: baserock/morph - build-depends: [] - name: exo morph: strata/xfce/exo.morph repo: upstream:xfce/exo @@ -71,7 +67,6 @@ chunks: repo: upstream:libwnck ref: 6792abcdf27aceba1012406d51606e84b065a526 unpetrify-ref: baserock/xfce-build - build-depends: [] - name: xfce4-panel morph: strata/xfce/xfce4-panel.morph repo: upstream:xfce/xfce4-panel @@ -107,7 +102,6 @@ chunks: repo: upstream:iceauth ref: c07d443d43e53cfe21b53a9a0eafcd6189432867 unpetrify-ref: baserock/morph - build-depends: [] - name: xfce4-session morph: strata/xfce/xfce4-session.morph repo: upstream:xfce/xfce4-session @@ -168,4 +162,3 @@ chunks: repo: upstream:elementary-xfce ref: 81e683bb46f8ba58c49c60ed75124951b7ba0779 unpetrify-ref: baserock/morph - build-depends: [] diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph index b8e67888..909c9420 100644 --- a/strata/xorg-util-macros-common.morph +++ b/strata/xorg-util-macros-common.morph @@ -7,7 +7,6 @@ chunks: repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 unpetrify-ref: util-macros-1.19.0 - build-depends: [] - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b diff --git a/strata/xstatic.morph b/strata/xstatic.morph index 7b40ee60..bf21a296 100644 --- a/strata/xstatic.morph +++ b/strata/xstatic.morph @@ -16,124 +16,99 @@ chunks: repo: upstream:xstatic ref: 6c8604a422ba7f176ce6b372a8e182c293d06fb2 unpetrify-ref: 1.0.1 - build-depends: [] - name: xstatic-angular repo: upstream:xstatic-packages/xstatic-angular ref: dac047df05da5bb20de4e78876bc03820d0c6671 unpetrify-ref: 1.3.7.0 - build-depends: [] - name: xstatic-angular-animate repo: upstream:xstatic-packages/xstatic-angular-animate ref: 91b9d3197f67213e4e35e9a35ba7196b898731e7 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-bootstrap repo: upstream:xstatic-packages/xstatic-angular-bootstrap ref: 2a8c157b8b0733afbfdaf7eea29cf012a8b7f483 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-cookies repo: upstream:xstatic-packages/xstatic-angular-cookies ref: 66141a33ae7ad84b82ba9384a8101ae15ccd6da5 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-fileupload repo: upstream:xstatic-packages/xstatic-angular-fileupload ref: 04bcd774dae17cfff5e826fc0874f6403b4a6cae unpetrify-ref: master - build-depends: [] - name: xstatic-angular-mock repo: upstream:xstatic-packages/xstatic-angular-mock ref: 20fdada109b167bcdcacec22986b43fdb42866f3 unpetrify-ref: 1.2.1.1 - build-depends: [] - name: xstatic-angular-sanitize repo: upstream:xstatic-packages/xstatic-angular-sanitize ref: 9e0f03ada6fc00f8583903aeb6d9fc6516784999 unpetrify-ref: master - build-depends: [] - name: xstatic-angular-smart-table repo: upstream:xstatic-packages/xstatic-angular-smart-table ref: e0fbf69fb156b995547471d71c5c6a7f88989d47 unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-datepicker repo: upstream:xstatic-packages/xstatic-bootstrap-datepicker ref: 60caf41e32d49f9bc715c39570f01449ebfbd37a unpetrify-ref: master - build-depends: [] - name: xstatic-bootstrap-scss repo: upstream:xstatic-packages/xstatic-bootstrap-scss ref: e8ca8e38e464691268faec8cd6ae59777ee7ee9e unpetrify-ref: master - build-depends: [] - name: xstatic-d3 repo: upstream:xstatic-packages/xstatic-d3 ref: 1e754e73c801fb9315995ffeb95ae51233c4fcaf unpetrify-ref: master - build-depends: [] - name: xstatic-hogan repo: upstream:xstatic-packages/xstatic-hogan ref: 9e39977f6a6744810b08fa0323147e9f31dbd363 unpetrify-ref: master - build-depends: [] - name: xstatic-font-awesome repo: upstream:xstatic-packages/xstatic-font-awesome ref: c13aad1b95b1d84e73f2565a18a5a8e2bd2194a7 unpetrify-ref: 4.2.0.0 - build-depends: [] - name: xstatic-jasmine repo: upstream:xstatic-packages/xstatic-jasmine ref: a55f5db1dbe59b23c7d6284250bf4eac1d0143c3 unpetrify-ref: 2.1.2.0 - build-depends: [] - name: xstatic-jquery repo: upstream:xstatic-packages/xstatic-jquery ref: e91c5bf82535a62c1cfac61b5efb6b5c0157c1f5 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-bootstrap-wizard repo: upstream:xstatic-packages/xstatic-jquery-bootstrap-wizard ref: 07ae7e3a15b3af3d3d378d1f2412fe503ee42142 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-migrate repo: upstream:xstatic-packages/xstatic-jquery-migrate ref: 989b3b31106727542dd83810c3b952f90d8cdb8f unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-quicksearch repo: upstream:xstatic-packages/xstatic-jquery-quicksearch ref: f5221c8c30507340846d97d6db41a782e7c63316 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-tablesorter repo: upstream:xstatic-packages/xstatic-jquery-tablesorter ref: eb78328391f44a9a88033e1aede1a605902c5551 unpetrify-ref: master - build-depends: [] - name: xstatic-jquery-ui repo: upstream:xstatic-packages/xstatic-jquery-ui ref: b494369430dafd8ac4ddbe90efb9f8ad20a6e6d1 unpetrify-ref: 1.11.0.1 - build-depends: [] - name: xstatic-jsencrypt repo: upstream:xstatic-packages/xstatic-jsencrypt ref: 5c0f088310ecd602e3aaf5e683385b0d27258409 unpetrify-ref: master - build-depends: [] - name: xstatic-qunit repo: upstream:xstatic-packages/xstatic-qunit ref: c3189eaa77c68c149a40b8c0afc8722cf394bd1f unpetrify-ref: master - build-depends: [] - name: xstatic-rickshaw repo: upstream:xstatic-packages/xstatic-rickshaw ref: 6427ca5406852bc779d6918f487bb0fe3f063e77 unpetrify-ref: master - build-depends: [] - name: xstatic-spin repo: upstream:xstatic-packages/xstatic-spin ref: 74b4c0d0ff12db1f84787246857d5e925ff6883f unpetrify-ref: master - build-depends: [] diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph index d4502ea1..83ce2e05 100644 --- a/strata/zookeeper-client.morph +++ b/strata/zookeeper-client.morph @@ -14,4 +14,3 @@ chunks: morph: strata/zookeeper/zookeeper-client.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph index 6ad4269e..97acd2ca 100644 --- a/strata/zookeeper-server.morph +++ b/strata/zookeeper-server.morph @@ -8,4 +8,3 @@ chunks: morph: strata/zookeeper/zookeeper-server.morph repo: baserock:tests/zookeeper-test ref: master - build-depends: [] diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph index 3bcd5cca..6328d327 100644 --- a/strata/zookeeper.morph +++ b/strata/zookeeper.morph @@ -8,13 +8,11 @@ chunks: - name: cppunit repo: upstream:cppunit ref: 77bb121d73c4593d6e3addacacb1bfbd21f53dcf - build-depends: [] - name: java-binary morph: strata/zookeeper/java-binary.morph repo: github:franred/gerrit-installation-binaries ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e unpetrify-ref: master - build-depends: [] - name: java-ant morph: strata/zookeeper/java-ant.morph repo: upstream:java/ant -- cgit v1.2.1 From 5e09ce28da6bddfc75661837058743447474f185 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 7 Mar 2015 03:09:59 +0000 Subject: Fix upgrade version of Morph We wanted to upgrade Morph to use latest master, and because of an human error of a Friday evening we used the sha1 of master of definitions.git instead of master of morph.git in the commit c3586f5c01937e19ed1b4a4ea7f195b5045e9201. Given that I gave a +2 for upgrading Morph to latest master, I'm merging this change without sending it for review. --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index d8af58aa..675d1101 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -63,7 +63,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: be2370b14f08d1d1e147aca382d56a830a1b4094 + ref: 11559bbbd24c218d512d503df27157668b37bdc9 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From 978777c296917ef575d2582372883b816aba5726 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 11 Mar 2015 10:26:20 +0000 Subject: Move rsync to 'foundation' stratum Our default upgrade process requires 'rsync'. So it needs to be in all systems, not just those that happen to contain the 'tools' stratum. --- strata/foundation.morph | 5 +++++ strata/foundation/rsync.morph | 9 +++++++++ strata/tools.morph | 5 ----- strata/tools/rsync.morph | 9 --------- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 strata/foundation/rsync.morph delete mode 100644 strata/tools/rsync.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index 775444c9..bbee209f 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -160,3 +160,8 @@ chunks: build-depends: - dbus - glib +- name: rsync + morph: strata/tools/rsync.morph + repo: upstream:rsync + ref: 7cb0de6326c915a72253fd103dae93308031ec3f + unpetrify-ref: v3.1.1 diff --git a/strata/foundation/rsync.morph b/strata/foundation/rsync.morph new file mode 100644 index 00000000..fb10f94e --- /dev/null +++ b/strata/foundation/rsync.morph @@ -0,0 +1,9 @@ +name: rsync +kind: chunk +build-system: autotools +build-commands: +- make proto +- make +install-commands: +- make install +- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service diff --git a/strata/tools.morph b/strata/tools.morph index bdc7e8e7..2bbf7bfa 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -27,11 +27,6 @@ chunks: repo: upstream:lsof ref: fffb8558208586338587027c265fd0eca44466be unpetrify-ref: baserock/morph -- name: rsync - morph: strata/tools/rsync.morph - repo: upstream:rsync - ref: 7cb0de6326c915a72253fd103dae93308031ec3f - unpetrify-ref: v3.1.1 - name: strace repo: upstream:strace ref: 6d8c0637e8dd0f65c667af33c612230552419db1 diff --git a/strata/tools/rsync.morph b/strata/tools/rsync.morph deleted file mode 100644 index fb10f94e..00000000 --- a/strata/tools/rsync.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: rsync -kind: chunk -build-system: autotools -build-commands: -- make proto -- make -install-commands: -- make install -- install -D -m 755 packaging/systemd/rsync.service "$DESTDIR$PREFIX"/lib/systemd/system/rsync.service -- cgit v1.2.1 From 6e2051516e5b60324138090c93abdea434e30839 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 11 Mar 2015 10:50:43 +0000 Subject: Update Morph for branch sam/distbuild-build-logs --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 675d1101..80fce027 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -63,7 +63,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: 11559bbbd24c218d512d503df27157668b37bdc9 + ref: 68395a12c79c22e266b4a06095533e38da6e29d0 unpetrify-ref: master build-depends: - cliapp -- cgit v1.2.1 From d7683a4d172ecd7a970324c21c9fb3eef51ddaa3 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 11 Mar 2015 13:00:11 +0000 Subject: Fix path of rsync.morph I moved the file but didn't update the stratum. --- strata/foundation.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index bbee209f..eea872a8 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -161,7 +161,7 @@ chunks: - dbus - glib - name: rsync - morph: strata/tools/rsync.morph + morph: strata/foundation/rsync.morph repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 -- cgit v1.2.1 From 5f162efafa4cb36e3fa05b2e65023e85bf082353 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 11 Mar 2015 13:31:20 +0000 Subject: Include rsync as GPL3 chunk --- scripts/licensecheck.sh | 1 + strip-gplv3.configure | 1 + 2 files changed, 2 insertions(+) diff --git a/scripts/licensecheck.sh b/scripts/licensecheck.sh index 7e4c4b91..a57b2f76 100755 --- a/scripts/licensecheck.sh +++ b/scripts/licensecheck.sh @@ -54,6 +54,7 @@ m4 \ make \ nano \ patch \ +rsync \ texinfo-tarball" gplv3_repos="" diff --git a/strip-gplv3.configure b/strip-gplv3.configure index 75143d08..c08061ad 100755 --- a/strip-gplv3.configure +++ b/strip-gplv3.configure @@ -47,6 +47,7 @@ class StripGPLv3ConfigureExtension(cliapp.Application): ['make', ''], ['nano', ''], ['patch', ''], + ['rsync', ''], ['texinfo-tarball', ''], ] -- cgit v1.2.1 From 0db32c56302cd8dda05372480cb3515181af65a1 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 11 Mar 2015 16:02:50 +0000 Subject: Update lorry-controller for branches: - sam/gerrit-support - sam/ignore-globs --- strata/lorry-controller.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 18339df2..74ff75af 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -11,5 +11,5 @@ chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: ce97e140f61cfc3781c3082febeacd0e5fb145cd + ref: f3f59d1415bfdb18f17bd910b829a8d128c1562a unpetrify-ref: master -- cgit v1.2.1 From f074f049c64fb45b875e6d63d560bfbed66e009d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 11 Mar 2015 15:39:13 +0000 Subject: Fix repo not pointing to git.baserock.org --- strata/genivi.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/genivi.morph b/strata/genivi.morph index 197943cc..5294dc4e 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -87,7 +87,7 @@ chunks: - persistence-client-library - name: libarchive morph: strata/genivi/libarchive.morph - repo: git://github.com/libarchive/libarchive.git + repo: upstream:libarchive ref: 19f23e191f9d3e1dd2a518735046100419965804 unpetrify-ref: v3.1.2 - name: persistence-administrator -- cgit v1.2.1 From c9afefed2d2278046ec5c0fb11c32220f3b7380d Mon Sep 17 00:00:00 2001 From: Richard Dale Date: Thu, 12 Mar 2015 10:20:01 +0000 Subject: Create /etc/ld.so.conf in glibc chunks, as it is glibc specific --- strata/build-essential/fhs-dirs.morph | 1 - strata/build-essential/glibc.morph | 8 ++++++++ strata/build-essential/stage2-fhs-dirs.morph | 1 - strata/build-essential/stage2-glibc.morph | 9 +++++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/strata/build-essential/fhs-dirs.morph b/strata/build-essential/fhs-dirs.morph index 64474872..f4a1b1e9 100644 --- a/strata/build-essential/fhs-dirs.morph +++ b/strata/build-essential/fhs-dirs.morph @@ -7,7 +7,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/glibc.morph b/strata/build-essential/glibc.morph index a4007bd4..e6f87fde 100644 --- a/strata/build-essential/glibc.morph +++ b/strata/build-essential/glibc.morph @@ -84,6 +84,14 @@ install-commands: netgroup: nis EOF - install -m 644 -o root -g root nsswitch.conf "$DESTDIR/etc/nsswitch.conf" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" # Compatibility symlink to work around the ABI break GLIBC introduced for # ARMv7 hard-float platforms in commit d3b36017d43. - case "$MORPH_ARCH" in diff --git a/strata/build-essential/stage2-fhs-dirs.morph b/strata/build-essential/stage2-fhs-dirs.morph index 14a6e253..64080217 100644 --- a/strata/build-essential/stage2-fhs-dirs.morph +++ b/strata/build-essential/stage2-fhs-dirs.morph @@ -9,7 +9,6 @@ install-commands: - install -m 600 shadow "$DESTDIR/etc/shadow" - install -m 644 interfaces "$DESTDIR/etc/network/interfaces" - install -m 644 group "$DESTDIR/etc/group" -- install -m 644 ld.so.conf "$DESTDIR/etc/ld.so.conf" - install -m 644 issue "$DESTDIR/etc/issue" - install -m 644 services "$DESTDIR/etc/services" - install -m 644 protocols "$DESTDIR/etc/protocols" diff --git a/strata/build-essential/stage2-glibc.morph b/strata/build-essential/stage2-glibc.morph index ffa0970b..48ceb767 100644 --- a/strata/build-essential/stage2-glibc.morph +++ b/strata/build-essential/stage2-glibc.morph @@ -32,6 +32,15 @@ build-commands: install-commands: - cd o && make install_root="$DESTDIR" localtime=UTC install +- mkdir -p "$DESTDIR/etc" +- | + cat < ld.so.conf + /lib + /usr/lib + /usr/local/lib + include /etc/ld.so.conf.d/*.conf + EOF +- install -m 644 -o root -g root ld.so.conf "$DESTDIR/etc/ld.so.conf" - sh stage2-glibc-fix-specs # Install a symlink for the program interpreter (ld.so) so that binaries -- cgit v1.2.1 From 2f91b8a0eeeb15469f3c5e1b104e34e88fe7df62 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 10 Mar 2015 13:48:22 +0000 Subject: Move cliapp into its own 'python-cliapp' stratum This allows us to have a system with Lorry and Lorry Controller but without Morph. Change-Id: I5164237601d0ff028834c674274f13b6e1f315c9 --- strata/baserock-import.morph | 3 ++- strata/lorry-controller.morph | 2 +- strata/lorry.morph | 6 ++---- strata/morph-utils.morph | 22 +------------------- strata/morph-utils/python-coveragepy.morph | 6 ------ strata/python-cliapp.morph | 24 ++++++++++++++++++++++ strata/python-cliapp/python-coveragepy.morph | 6 ++++++ systems/build-system-armv7lhf-highbank.morph | 2 ++ systems/build-system-armv7lhf-jetson.morph | 2 ++ systems/build-system-armv8l64.morph | 2 ++ systems/build-system-ppc64.morph | 2 ++ systems/build-system-x86_32-chroot.morph | 2 ++ systems/build-system-x86_32.morph | 2 ++ systems/build-system-x86_64-chroot.morph | 2 ++ systems/build-system-x86_64.morph | 2 ++ systems/ceph-service-x86_64-generic.morph | 2 ++ .../cross-bootstrap-system-armv7lhf-generic.morph | 2 ++ .../cross-bootstrap-system-armv8l64-generic.morph | 2 ++ systems/cross-bootstrap-system-ppc64-generic.morph | 2 ++ .../cross-bootstrap-system-x86_64-generic.morph | 2 ++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ systems/installer-system-x86_64.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/xfce-system.morph | 2 ++ 41 files changed, 104 insertions(+), 33 deletions(-) delete mode 100644 strata/morph-utils/python-coveragepy.morph create mode 100644 strata/python-cliapp.morph create mode 100644 strata/python-cliapp/python-coveragepy.morph diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index a3a195db..2b18d02d 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -2,7 +2,8 @@ name: baserock-import kind: stratum description: Tools for importing software into Baserock definitions. build-depends: -- morph: strata/morph-utils.morph +- morph: strata/python-common.morph +- morph: strata/python-cliapp.morph chunks: - name: ansicolor repo: upstream:python-packages/ansicolor diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 74ff75af..2d7076f9 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -6,7 +6,7 @@ description: | This is a component of Trove, but can also be used with other Git servers. build-depends: -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph diff --git a/strata/lorry.morph b/strata/lorry.morph index 741bbc34..b3a0c779 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -10,10 +10,8 @@ description: | The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available by this stratum. build-depends: -# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at -# build-time to generate its man page. Otherwise we could simply depend on -# the 'foundation' stratum. -- morph: strata/morph-utils.morph +- morph: strata/foundation.morph +- morph: strata/python-cliapp.morph chunks: - name: bzr-tarball repo: upstream:bzr-tarball diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 80fce027..b5ba1df5 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,7 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph -- morph: strata/python-core.morph +- morph: strata/python-cliapp.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -23,30 +23,12 @@ chunks: repo: upstream:pyfilesystem ref: 821f7db1ce3a3e1ac53fa514ddacbc2871eac0f6 unpetrify-ref: baserock/morph -- name: python-coveragepy - morph: strata/morph-utils/python-coveragepy.morph - repo: upstream:python-coveragepy - ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 - unpetrify-ref: baserock/morph -- name: python-coverage-test-runner - repo: upstream:python-coverage-test-runner - ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 - unpetrify-ref: baserock/morph - build-depends: - - python-coveragepy -- name: cliapp - repo: upstream:cliapp - ref: cec20cedd062a3aef1b04f997e77b45090c07806 - unpetrify-ref: baserock/morph - build-depends: - - python-coverage-test-runner - name: cmdtest morph: strata/morph-utils/cmdtest.morph repo: upstream:cmdtest ref: ac91791842c6e7e6eda3213916af413255999c7b unpetrify-ref: baserock/morph build-depends: - - cliapp - python-ttystatus - python-markdown - name: bottle @@ -66,9 +48,7 @@ chunks: ref: 68395a12c79c22e266b4a06095533e38da6e29d0 unpetrify-ref: master build-depends: - - cliapp - cmdtest - - python-coverage-test-runner - pyfilesystem - bottle - flup diff --git a/strata/morph-utils/python-coveragepy.morph b/strata/morph-utils/python-coveragepy.morph deleted file mode 100644 index ed5e3d87..00000000 --- a/strata/morph-utils/python-coveragepy.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: python-coveragepy -kind: chunk -build-commands: -- python setup.py build -install-commands: -- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/strata/python-cliapp.morph b/strata/python-cliapp.morph new file mode 100644 index 00000000..ff6fda3e --- /dev/null +++ b/strata/python-cliapp.morph @@ -0,0 +1,24 @@ +name: python-cliapp +kind: stratum +description: | + Cliapp command line application framework. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: python-coveragepy + morph: strata/morph-utils/python-coveragepy.morph + repo: upstream:python-coveragepy + ref: 77d2e3bfd8fb325092aaed37ba1378054d182d19 + unpetrify-ref: baserock/morph +- name: python-coverage-test-runner + repo: upstream:python-coverage-test-runner + ref: 8ea9421ac3384b2e88e0c36f2cfa52586c4798b7 + unpetrify-ref: baserock/morph + build-depends: + - python-coveragepy +- name: cliapp + repo: upstream:cliapp + ref: cec20cedd062a3aef1b04f997e77b45090c07806 + unpetrify-ref: baserock/morph + build-depends: + - python-coverage-test-runner diff --git a/strata/python-cliapp/python-coveragepy.morph b/strata/python-cliapp/python-coveragepy.morph new file mode 100644 index 00000000..ed5e3d87 --- /dev/null +++ b/strata/python-cliapp/python-coveragepy.morph @@ -0,0 +1,6 @@ +name: python-coveragepy +kind: chunk +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix=/usr --root "$DESTDIR" diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index ae67387f..4529354c 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index ccdbea1a..ac227de2 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 08802a00..3579efd4 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -18,6 +18,8 @@ strata: morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 7d3f475d..09909535 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 33a1a4c9..f93cd574 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 86d2b690..909b025c 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 24263808..37b00e43 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -13,6 +13,8 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 77f1860e..fc7164db 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 730c00d4..b58675fd 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -22,6 +22,8 @@ strata: morph: strata/ruby.morph - name: ntpd morph: strata/ntpd.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/cross-bootstrap-system-armv7lhf-generic.morph b/systems/cross-bootstrap-system-armv7lhf-generic.morph index 23817c0c..f0a2780b 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-armv8l64-generic.morph b/systems/cross-bootstrap-system-armv8l64-generic.morph index c35cff5f..2bf192d3 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-ppc64-generic.morph b/systems/cross-bootstrap-system-ppc64-generic.morph index 40c80c00..9d736f94 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-x86_64-generic.morph b/systems/cross-bootstrap-system-x86_64-generic.morph index 646a04d3..ac919d66 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 74742a85..c27dfd9d 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 69681f7b..f4720f40 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 9ed68978..bda502e2 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-armv7-versatile.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 940b7725..6cc1fd1d 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 8b754254..a2a061c3 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 54eeeee7..528c9bbf 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-armv7b-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 95212d57..325fbf3f 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 5c987497..e3c467c2 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -17,6 +17,8 @@ strata: morph: strata/bsp-armv7-highbank.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 9cdc1270..15ec4930 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index b69b3b13..661cb4c3 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -17,6 +17,8 @@ strata: morph: strata/bsp-wandboard.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index c4af1d17..0de01791 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-armv8l64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 74d7e38e..415b8291 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 50cffd69..03c8ded8 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-ppc64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 1ade237e..be494de9 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index de75a70a..bd9192f0 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-x86_32-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 23db60c1..c0fee837 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/foundation.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 46c7c4e5..c3ef57df 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index ca0c717b..19ef90b0 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -16,6 +16,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 8798182b..559be259 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -13,6 +13,8 @@ strata: morph: strata/foundation.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 1a120ef9..b3bd05c7 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -15,6 +15,8 @@ strata: morph: strata/python-core.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: pcre-utils diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 5aea4f7b..957e1400 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -33,6 +33,8 @@ strata: morph: strata/gtk2.morph - name: tools morph: strata/tools.morph +- name: python-cliapp + morph: strata/python-cliapp.morph - name: morph-utils morph: strata/morph-utils.morph - name: xfce -- cgit v1.2.1 From 2770be545cd20c26b27e28592ed601a59ad613ad Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 10 Mar 2015 17:08:38 +0000 Subject: Move 'bottle' and 'flup' into separate python-wsgi module The lorry-controller webapp uses these, as well as morph-cache-server. In order to use lorry-controller in systems that don't contain Morph, we need them to be in a separate stratum. Change-Id: Ie187c0b506d12ed5e5f8f8ce4a4b91834bf29fe5 --- strata/morph-utils.morph | 11 +---------- strata/python-wsgi.morph | 15 +++++++++++++++ systems/build-system-armv7lhf-highbank.morph | 2 ++ systems/build-system-armv7lhf-jetson.morph | 2 ++ systems/build-system-armv8l64.morph | 2 ++ systems/build-system-ppc64.morph | 2 ++ systems/build-system-x86_32-chroot.morph | 2 ++ systems/build-system-x86_32.morph | 2 ++ systems/build-system-x86_64-chroot.morph | 2 ++ systems/build-system-x86_64.morph | 2 ++ systems/ceph-service-x86_64-generic.morph | 2 ++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ systems/installer-system-x86_64.morph | 2 ++ systems/trove-system-x86_64.morph | 2 ++ systems/xfce-system.morph | 2 ++ 32 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 strata/python-wsgi.morph diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index b5ba1df5..62649723 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -3,6 +3,7 @@ kind: stratum build-depends: - morph: strata/core.morph - morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: python-ttystatus morph: strata/morph-utils/python-ttystatus.morph @@ -31,14 +32,6 @@ chunks: build-depends: - python-ttystatus - python-markdown -- name: bottle - repo: upstream:bottle - ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f - unpetrify-ref: baserock/morph -- name: flup - repo: upstream:flup - ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 - unpetrify-ref: baserock/morph - name: pylru repo: upstream:python-packages/pylru ref: 221dd259f5c34562c835611d1cf62384b9019da4 @@ -50,6 +43,4 @@ chunks: build-depends: - cmdtest - pyfilesystem - - bottle - - flup - pylru diff --git a/strata/python-wsgi.morph b/strata/python-wsgi.morph new file mode 100644 index 00000000..289d27ba --- /dev/null +++ b/strata/python-wsgi.morph @@ -0,0 +1,15 @@ +name: python-wsgi +kind: stratum +description: | + Python modules for web applications using Web Server Gateway Interface. +build-depends: +- morph: strata/python-core.morph +chunks: +- name: bottle + repo: upstream:bottle + ref: 5238c615b3ec198fedebb0fcaad4458e3d68d70f + unpetrify-ref: baserock/morph +- name: flup + repo: upstream:flup + ref: 0f97c5e0ab7d9827506120efc22af3a9c21d1d70 + unpetrify-ref: baserock/morph diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 4529354c..b9ee8e79 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index ac227de2..6c59cb28 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 3579efd4..63dcb432 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -20,6 +20,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 09909535..600eb683 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index f93cd574..61bf4eaf 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 909b025c..f485287e 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 37b00e43..e8cd7b87 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -15,6 +15,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index fc7164db..b9433409 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index b58675fd..95b17dc0 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -24,6 +24,8 @@ strata: morph: strata/ntpd.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index c27dfd9d..e32db851 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index f4720f40..9ae051d1 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index bda502e2..12a2b2b6 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 6cc1fd1d..ec6fea5e 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index a2a061c3..2023ac21 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 528c9bbf..2c7f8ed2 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 325fbf3f..1e2a8f8e 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index e3c467c2..3ef00c34 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 15ec4930..dfc28c45 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index 661cb4c3..631692e7 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -19,6 +19,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 0de01791..bad6d6a9 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 415b8291..1ec03145 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 03c8ded8..bfbf3fbb 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index be494de9..e83b1a55 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-clients diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index bd9192f0..c707125c 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index c0fee837..00e72c84 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index c3ef57df..e0bb1a21 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 19ef90b0..fc40e1f5 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: openstack-common diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 559be259..cea09c09 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -15,6 +15,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index b3bd05c7..ab50f7f6 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -17,6 +17,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: pcre-utils diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 957e1400..dad3d3dc 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -35,6 +35,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-wsgi + morph: strata/python-wsgi.morph - name: morph-utils morph: strata/morph-utils.morph - name: xfce -- cgit v1.2.1 From fe37ca6dfc32f13e89975f916abb0d95b9b4f09b Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 13 Mar 2015 15:06:40 +0000 Subject: lorry-controller needs python-uwsgi --- strata/lorry-controller.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 2d7076f9..00ae5752 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -7,6 +7,7 @@ description: | also be used with other Git servers. build-depends: - morph: strata/python-cliapp.morph +- morph: strata/python-wsgi.morph chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph -- cgit v1.2.1 From 3615cc776d0a926fc45ce280cfc6ee679d01366e Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Fri, 13 Mar 2015 15:46:09 +0000 Subject: baserock-import needs morphlib (morph-utils) to build --- strata/baserock-import.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph index 2b18d02d..c0861105 100644 --- a/strata/baserock-import.morph +++ b/strata/baserock-import.morph @@ -3,7 +3,7 @@ kind: stratum description: Tools for importing software into Baserock definitions. build-depends: - morph: strata/python-common.morph -- morph: strata/python-cliapp.morph +- morph: strata/morph-utils.morph chunks: - name: ansicolor repo: upstream:python-packages/ansicolor -- cgit v1.2.1 From be25cffb2702c5ec38cc64ba580228eda16baf84 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 13:39:46 +0000 Subject: Rename NAT kernel configuration item Replace CONFIG_NF_NAT_IPV4 by CONFIG_IP_NF_NAT which is the name for this item since the 3.17 kernel is available. --- strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index fe0721cc..ed245186 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -73,7 +73,7 @@ configure-commands: - scripts/config -e BRIDGE - scripts/config -e VHOST_NET - scripts/config -e NF_NAT -- scripts/config -e NF_NAT_IPV4 +- scripts/config -e IP_NF_NAT - scripts/config -e IP_NF_TARGET_MASQUERADE - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI -- cgit v1.2.1 From 06c8636ad4d4ad332a23e40fa3eedbe70f9ce8c7 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:03:51 +0000 Subject: Create a x86_64 openstack bsp At this point the x86_64 openstack bsp is the same as x86_64 generic bsp. --- strata/bsp-x86_64-openstack.morph | 26 ++++++ .../linux-x86-64-openstack.morph | 103 +++++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 strata/bsp-x86_64-openstack.morph create mode 100644 strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph diff --git a/strata/bsp-x86_64-openstack.morph b/strata/bsp-x86_64-openstack.morph new file mode 100644 index 00000000..3f7afacc --- /dev/null +++ b/strata/bsp-x86_64-openstack.morph @@ -0,0 +1,26 @@ +name: bsp-x86_64-openstack +kind: stratum +description: The set of platform specific components required for booting an Openstack 64-bit + x86 based system. +build-depends: +- morph: strata/core.morph +chunks: +- name: linux-x86-64-openstack + morph: strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph + repo: upstream:linux + ref: e920dce5ae83d21e25a47d340b54ca7e4486d994 + unpetrify-ref: baserock/pedroalvarez/v3.18-ovs + build-depends: [] +- name: nasm + morph: strata/bsp-x86_64-generic/nasm.morph + repo: upstream:nasm + ref: 78bdad3d14fb875d5f2062957e326ba2a9e4ccb0 + unpetrify-ref: baserock/morph + build-depends: [] +- name: syslinux + morph: strata/bsp-x86_64-generic/syslinux.morph + repo: upstream:syslinux + ref: 2aab8555987b547b617cbb887e61083fece01541 + unpetrify-ref: baserock/morph + build-depends: + - nasm diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph new file mode 100644 index 00000000..74432e3f --- /dev/null +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -0,0 +1,103 @@ +name: linux-x86-64-openstack +kind: chunk +products: +- artifact: linux-x86-64-openstack-devel + include: + - (usr/)?src/linux/.* +- artifact: linux-x86-64-openstack-bins + include: + - boot/.* +- artifact: linux-x86-64-openstack-libs + include: + - lib/.* +configure-commands: +- make defconfig +- scripts/config -e PACKET +- scripts/config -e SATA_AHCI +- scripts/config -e ATA_GENERIC +- scripts/config -e HAVE_IDE +- scripts/config -d BLK_DEV_IDE_SATA +- scripts/config -e BTRFS_FS +- scripts/config -e BTRFS_FS_POSIX_ACL +- scripts/config -e DEVTMPFS +- scripts/config -e DEVTMPFS_MOUNT +- scripts/config -e CONFIG_FHANDLE +- scripts/config -e CGROUPS +- scripts/config -e AUTOFS4_FS +- scripts/config --set-str UEVENT_HELPER_PATH '' +- scripts/config -e EXT2_FS +- scripts/config -e EXT2_FS_XATTR +- scripts/config -e EXT2_FS_POSIX_ACL +- scripts/config -e EXT2_FS_SECURITY +- scripts/config -e EXT2_FS_XIP +- scripts/config -e EXT3_FS +- scripts/config -d EXT3_DEFAULTS_TO_ORDERED +- scripts/config -e EXT3_FS_XATTR +- scripts/config -e EXT3_FS_POSIX_ACL +- scripts/config -e EXT3_FS_SECURITY +- scripts/config -e EXT4_FS +- scripts/config -e EXT4_FS_XATTR +- scripts/config -e EXT4_FS_POSIX_ACL +- scripts/config -e EXT4_FS_SECURITY +- scripts/config -d EXT4_DEBUG +- scripts/config -d JBD_DEBUG +- scripts/config -d JBD2_DEBUG +- scripts/config -e BLK_DEV_LOOP +- scripts/config -d BLK_DEV_CRYPTOLOOP +- scripts/config -e CEPH_FS +- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 +- scripts/config -e VIRTIO +- scripts/config -e VIRTIO_RING +- scripts/config -e VIRTIO_PCI +- scripts/config -e VIRTIO_BALLOON +- scripts/config -e VIRTIO_BLK +- scripts/config -e VIRTIO_NET +- scripts/config -e VIRTIO_CONSOLE +- scripts/config -e HW_RANDOM_VIRTIO +- scripts/config -e 9P_FS +- scripts/config -e 9P_FSCACHE +- scripts/config -e 9P_FS_POSIX_ACL +- scripts/config -e NET_9P +- scripts/config -e NET_9P_VIRTIO +- scripts/config -e R8169 +- scripts/config -e 8139TOO +- scripts/config -e 8139CP +- scripts/config -e IKCONFIG +- scripts/config -e IKCONFIG_PROC +- scripts/config -e SECCOMP +- scripts/config -d DEBUG_STACK_TRACE +- scripts/config -e NFSD +- scripts/config -e NFSD_V3 +- scripts/config -e KVM +- scripts/config -e TUN +- scripts/config -e BRIDGE +- scripts/config -e VHOST_NET +- scripts/config -e NF_NAT +- scripts/config -e IP_NF_NAT +- scripts/config -e IP_NF_TARGET_MASQUERADE +- scripts/config -e FB_VESA +- scripts/config -e HOTPLUG_PCI +- scripts/config -e HOTPLUG_PCI_ACPI +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING +- yes '' | make oldconfig +build-commands: +- make $MAKEFLAGS +install-commands: +- mkdir -p "$DESTDIR"/boot +- make INSTALL_PATH="$DESTDIR"/boot install +- make INSTALL_MOD_PATH="$DESTDIR" modules_install +- install -d "$DESTDIR$PREFIX/src/linux" +- | + ( + printf 'Makefile\0' + printf 'Module.symvers\0' + find arch/x86 -maxdepth 1 -name 'Makefile*' -print0 + find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0 + find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \ + \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0 + find include -name 'asm*' -prune -o -print0 + find include/asm-generic -print0 + find include/uapi -print0 + find scripts -print0 + ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" -- cgit v1.2.1 From d51381ec2cc21f25ca7fcf41976cbd7666095393 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:09:21 +0000 Subject: Add Network Block Device configuration support to openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 74432e3f..4bc2b16f 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -80,6 +80,7 @@ configure-commands: - scripts/config -e HOTPLUG_PCI_ACPI - scripts/config -e VLAN_8021Q - scripts/config -e BRIDGE_VLAN_FILTERING +- scripts/config -e BLK_DEV_NBD - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 2c437357afd02ac6cda9517de7382f1ec37aa96d Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:12:49 +0000 Subject: Add ebtables configurations to openstack bsp This modules are needed for ebtables and netfilter. --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 4bc2b16f..c561e06a 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -81,6 +81,10 @@ configure-commands: - scripts/config -e VLAN_8021Q - scripts/config -e BRIDGE_VLAN_FILTERING - scripts/config -e BLK_DEV_NBD +- scripts/config -e BRIDGE_NF_EBTABLES +- scripts/config -e NETFILTER +- scripts/config -e NETFILTER_ADVANCED +- scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From f34e6a1d56a2419aa97c9fe616231d4e628a7b77 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:20:48 +0000 Subject: Add Openvswitch kernel support for Openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index c561e06a..e561b027 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -85,6 +85,16 @@ configure-commands: - scripts/config -e NETFILTER - scripts/config -e NETFILTER_ADVANCED - scripts/config -e NETFILTER_XT_MATCH_ADDRTYPE +- scripts/config -e OPENVSWITCH +- scripts/config -e OPENVSWITCH_VXLAN +- scripts/config -e CONFIG_OPENVSWITCH_GRE +- scripts/config -e NET_CLS_BASIC +- scripts/config -e NET_SCH_INGRESS +- scripts/config -e NET_ACT_POLICE +- scripts/config -e NET_IPGRE_DEMUX +- scripts/config -e NET_SCH_HTB +- scripts/config -e NET_SCH_HFSC +- scripts/config -e VXLAN - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 05609313116016d47427024c867e242383ac5a4d Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:24:29 +0000 Subject: Enable virtual ethernet support in Openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index e561b027..8223217e 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -95,6 +95,7 @@ configure-commands: - scripts/config -e NET_SCH_HTB - scripts/config -e NET_SCH_HFSC - scripts/config -e VXLAN +- scripts/config -e VETH - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 2e19e0fe439f3cf7fd6a6be5c15016cd9bc8eac2 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:39:59 +0000 Subject: Enable all the IP_NF kernel support in Openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 8223217e..42b51350 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -96,6 +96,19 @@ configure-commands: - scripts/config -e NET_SCH_HFSC - scripts/config -e VXLAN - scripts/config -e VETH +- scripts/config -e IP_NF_MATCH_AH +- scripts/config -e IP_NF_MATCH_ECN +- scripts/config -e IP_NF_MATCH_RPFILTER +- scripts/config -e IP_NF_MATCH_TTL +- scripts/config -e IP_NF_TARGET_SYNPROXY +- scripts/config -e IP_NF_TARGET_NETMAP +- scripts/config -e IP_NF_TARGET_REDIRECT +- scripts/config -e IP_NF_TARGET_CLUSTERIP +- scripts/config -e IP_NF_TARGET_ECN +- scripts/config -e IP_NF_TARGET_TTL +- scripts/config -e IP_NF_RAW +- scripts/config -e IP_NF_SECURITY +- scripts/config -e IP_NF_ARPTABLES - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 222696912a8fd6abf4809ab44cf94d428b9a6546 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:41:51 +0000 Subject: Add KVM kernel support for intel machines in Openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 42b51350..8cd90570 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -109,6 +109,7 @@ configure-commands: - scripts/config -e IP_NF_RAW - scripts/config -e IP_NF_SECURITY - scripts/config -e IP_NF_ARPTABLES +- scripts/config -e KVM_INTEL - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 2da1eba1433e1b46157360d1487bcd8d6409d504 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:43:44 +0000 Subject: Add iproute2 support to Openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 3 +++ 1 file changed, 3 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 8cd90570..a1792fd5 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -110,6 +110,9 @@ configure-commands: - scripts/config -e IP_NF_SECURITY - scripts/config -e IP_NF_ARPTABLES - scripts/config -e KVM_INTEL +- scripts/config -e NETFILTER_NETLINK_QUEUE +- scripts/config -e SCSI_NETLINK +- scripts/config -e NETFILTER_XT_TARGET_MARK - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 70ed890c532ebbe150d750578b640fb7d679568c Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:46:09 +0000 Subject: Enable ipset kernel configuration for Openstack bsp --- .../bsp-x86_64-openstack/linux-x86-64-openstack.morph | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index a1792fd5..6e347ea3 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -113,6 +113,23 @@ configure-commands: - scripts/config -e NETFILTER_NETLINK_QUEUE - scripts/config -e SCSI_NETLINK - scripts/config -e NETFILTER_XT_TARGET_MARK +- scripts/config -e NETFILTER_XT_SET +- scripts/config -e IP_SET +- scripts/config -e IP_SET_BITMAP_IP +- scripts/config -e IP_SET_BITMAP_IPMAC +- scripts/config -e IP_SET_BITMAP_PORT +- scripts/config -e IP_SET_HASH_IP +- scripts/config -e IP_SET_HASH_IPMARK +- scripts/config -e IP_SET_HASH_IPPORT +- scripts/config -e IP_SET_HASH_IPPORTIP +- scripts/config -e IP_SET_HASH_IPPORTNET +- scripts/config -e IP_SET_HASH_MAC +- scripts/config -e IP_SET_HASH_NETPORTNET +- scripts/config -e IP_SET_HASH_NET +- scripts/config -e IP_SET_HASH_NETNET +- scripts/config -e IP_SET_HASH_NETPORT +- scripts/config -e IP_SET_HASH_NETIFACE +- scripts/config -e IP_SET_LIST_SET - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From e575f2eadf0fc71311b2239ee44498859f1556d3 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:50:14 +0000 Subject: Add netfilter configuration in Openstack bsp --- .../linux-x86-64-openstack.morph | 98 ++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 6e347ea3..b1490987 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -130,6 +130,104 @@ configure-commands: - scripts/config -e IP_SET_HASH_NETPORT - scripts/config -e IP_SET_HASH_NETIFACE - scripts/config -e IP_SET_LIST_SET +- scripts/config -e NF_CONNTRACK_TIMEOUT +- scripts/config -e NF_CONNTRACK_TIMESTAMP +- scripts/config -e NF_CONNTRACK_EVENTS +- scripts/config -e NF_CONNTRACK_LABELS +- scripts/config -e NETFILTER_NETLINK_ACCT +- scripts/config -e NETFILTER_NETLINK_QUEUE_CT +- scripts/config -e NF_CT_PROTO_DCCP +- scripts/config -e NF_CT_PROTO_GRE +- scripts/config -e NF_CT_PROTO_SCTP +- scripts/config -e NF_CT_PROTO_UDPLITE +- scripts/config -e NF_CT_NETLINK_TIMEOUT +- scripts/config -e NF_CT_NETLINK_HELPER +- scripts/config -e NF_CONNTRACK_AMANDA +- scripts/config -e NF_CONNTRACK_H323 +- scripts/config -e NF_CONNTRACK_BROADCAST +- scripts/config -e NF_CONNTRACK_NETBIOS_NS +- scripts/config -e NF_CONNTRACK_SNMP +- scripts/config -e NF_CONNTRACK_PPTP +- scripts/config -e NF_CONNTRACK_SANE +- scripts/config -e NF_CONNTRACK_TFTP +- scripts/config -e NF_LOG_COMMON +- scripts/config -e NF_NAT_PROTO_DCCP +- scripts/config -e NF_NAT_PROTO_UDPLITE +- scripts/config -e NF_NAT_PROTO_SCTP +- scripts/config -e NF_NAT_AMANDA +- scripts/config -e NF_NAT_TFTP +- scripts/config -e NF_TABLES +- scripts/config -e NF_TABLES_INET +- scripts/config -e NFT_COMPAT +- scripts/config -e NFT_EXTHDR +- scripts/config -e NFT_META +- scripts/config -e NFT_CT +- scripts/config -e NFT_LIMIT +- scripts/config -e NFT_NAT +- scripts/config -e NFT_QUEUE +- scripts/config -e NFT_REJECT +- scripts/config -e NFT_REJECT_INET +- scripts/config -e NFT_RBTREE +- scripts/config -e NFT_HASH +- scripts/config -e NFT_COUNTER +- scripts/config -e NFT_LOG +- scripts/config -e NFT_MASQ +- scripts/config -e NETFILTER_XT_CONNMARK +- scripts/config -e NETFILTER_XT_TARGET_AUDIT +- scripts/config -e NETFILTER_XT_TARGET_CHECKSUM +- scripts/config -e NETFILTER_XT_TARGET_CLASSIFY +- scripts/config -e NETFILTER_XT_TARGET_CT +- scripts/config -e NETFILTER_XT_TARGET_DSCP +- scripts/config -e NETFILTER_XT_TARGET_HMARK +- scripts/config -e NETFILTER_XT_TARGET_LED +- scripts/config -e NETFILTER_XT_TARGET_LOG +- scripts/config -e NETFILTER_XT_TARGET_NFQUEUE +- scripts/config -e NETFILTER_XT_TARGET_RATEEST +- scripts/config -e NETFILTER_XT_TARGET_TPROXY +- scripts/config -e NETFILTER_XT_TARGET_TCPOPTSTRIP +- scripts/config -e NETFILTER_XT_TARGET_TEE +- scripts/config -e NETFILTER_XT_TARGET_TRACE +- scripts/config -e NETFILTER_XT_TARGET_IDLETIMER +- scripts/config -e NETFILTER_XT_MATCH_BPF +- scripts/config -e NETFILTER_XT_MATCH_CLUSTER +- scripts/config -e NETFILTER_XT_MATCH_COMMENT +- scripts/config -e NETFILTER_XT_MATCH_CONNBYTES +- scripts/config -e NETFILTER_XT_MATCH_CONNLABEL +- scripts/config -e NETFILTER_XT_MATCH_CONNLIMIT +- scripts/config -e NETFILTER_XT_MATCH_CPU +- scripts/config -e NETFILTER_XT_MATCH_DCCP +- scripts/config -e NETFILTER_XT_MATCH_DEVGROUP +- scripts/config -e NETFILTER_XT_MATCH_DSCP +- scripts/config -e NETFILTER_XT_MATCH_ESP +- scripts/config -e NETFILTER_XT_MATCH_HASHLIMIT +- scripts/config -e NETFILTER_XT_MATCH_HELPER +- scripts/config -e NETFILTER_XT_MATCH_IPCOMP +- scripts/config -e NETFILTER_XT_MATCH_IPRANGE +- scripts/config -e NETFILTER_XT_MATCH_IPVS +- scripts/config -e NETFILTER_XT_MATCH_L2TP +- scripts/config -e NETFILTER_XT_MATCH_LENGTH +- scripts/config -e NETFILTER_XT_MATCH_LIMIT +- scripts/config -e NETFILTER_XT_MATCH_MAC +- scripts/config -e NETFILTER_XT_MATCH_MULTIPORT +- scripts/config -e NETFILTER_XT_MATCH_NFACCT +- scripts/config -e NETFILTER_XT_MATCH_OSF +- scripts/config -e NETFILTER_XT_MATCH_OWNER +- scripts/config -e NETFILTER_XT_MATCH_CGROUP +- scripts/config -e NETFILTER_XT_MATCH_PHYSDEV +- scripts/config -e NETFILTER_XT_MATCH_PKTTYPE +- scripts/config -e NETFILTER_XT_MATCH_QUOTA +- scripts/config -e NETFILTER_XT_MATCH_RATEEST +- scripts/config -e NETFILTER_XT_MATCH_REALM +- scripts/config -e NETFILTER_XT_MATCH_RECENT +- scripts/config -e NETFILTER_XT_MATCH_SCTP +- scripts/config -e NETFILTER_XT_MATCH_SOCKET +- scripts/config -e NETFILTER_XT_MATCH_STATISTIC +- scripts/config -e NETFILTER_XT_MATCH_STRING +- scripts/config -e NETFILTER_XT_MATCH_TCPMSS +- scripts/config -e NETFILTER_XT_MATCH_TIME +- scripts/config -e NETFILTER_XT_MATCH_U32 +- scripts/config -e IP_VS +- scripts/config -e BRIDGE_NETFILTER - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 3c3ee6104062133af0b40cdcacf32e63dfdd0fce Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 14:54:22 +0000 Subject: Enable E1000E ethernet driver and external USB ethernet for Openstack NOTE: This is done for testing purposes - it is not an Openstack requirement and can be dropped. --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 3 +++ 1 file changed, 3 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index b1490987..7d29d8f1 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -228,6 +228,9 @@ configure-commands: - scripts/config -e NETFILTER_XT_MATCH_U32 - scripts/config -e IP_VS - scripts/config -e BRIDGE_NETFILTER +- scripts/config -e USB_NET_DM9601 +- scripts/config -e USB_USBNET +- scripts/config -e E1000E - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From edeb456f6980896ad651d734ea3f3f2f3e034026 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Thu, 12 Feb 2015 17:26:00 +0000 Subject: SPLITME: Add all Openstack --- apache-httpd-server.configure | 23 + clusters/openstack-cluster.morph | 66 + openstack-cinder.configure | 55 + openstack-glance.configure | 49 + openstack-keystone.configure | 56 + openstack-neutron.configure | 67 + openstack-nova-compute.configure | 41 + openstack-nova.configure | 74 + openstack-rabbitmq.configure | 47 + openstack/etc/cinder/api-paste.ini | 60 + openstack/etc/cinder/cinder.conf | 2769 +++++++++++++++ openstack/etc/cinder/policy.json | 80 + openstack/etc/cinder/rootwrap.conf | 27 + openstack/etc/cinder/rootwrap.d/volume.filters | 157 + openstack/etc/glance/glance-api-paste.ini | 72 + openstack/etc/glance/glance-api.conf | 691 ++++ openstack/etc/glance/glance-cache.conf | 200 ++ openstack/etc/glance/glance-registry-paste.ini | 25 + openstack/etc/glance/glance-registry.conf | 197 ++ openstack/etc/glance/glance-scrubber.conf | 56 + openstack/etc/glance/logging.conf | 54 + openstack/etc/glance/policy.json | 32 + openstack/etc/glance/schema-image.json | 28 + openstack/etc/horizon/apache-horizon.conf | 32 + .../horizon/openstack_dashboard/local_settings.py | 549 +++ openstack/etc/hosts | 2 + openstack/etc/keystone/keystone-paste.ini | 112 + openstack/etc/keystone/keystone.conf | 1384 ++++++++ openstack/etc/keystone/logging.conf | 39 + openstack/etc/keystone/policy.json | 144 + openstack/etc/logrotate.d/openstack-glance-api | 7 + .../etc/logrotate.d/openstack-glance-registry | 7 + openstack/etc/logrotate.d/openstack-keystone | 8 + openstack/etc/neutron/api-paste.ini | 30 + openstack/etc/neutron/dhcp_agent.ini | 89 + openstack/etc/neutron/fwaas_driver.ini | 3 + openstack/etc/neutron/l3_agent.ini | 103 + openstack/etc/neutron/lbaas_agent.ini | 42 + openstack/etc/neutron/metadata_agent.ini | 60 + openstack/etc/neutron/metering_agent.ini | 18 + openstack/etc/neutron/neutron.conf | 642 ++++ .../etc/neutron/plugins/bigswitch/restproxy.ini | 114 + .../neutron/plugins/bigswitch/ssl/ca_certs/README | 3 + .../plugins/bigswitch/ssl/host_certs/README | 6 + openstack/etc/neutron/plugins/brocade/brocade.ini | 29 + .../etc/neutron/plugins/cisco/cisco_cfg_agent.ini | 15 + .../etc/neutron/plugins/cisco/cisco_plugins.ini | 107 + .../neutron/plugins/cisco/cisco_router_plugin.ini | 76 + .../etc/neutron/plugins/cisco/cisco_vpn_agent.ini | 26 + .../etc/neutron/plugins/embrane/heleos_conf.ini | 41 + .../plugins/hyperv/hyperv_neutron_plugin.ini | 63 + .../neutron/plugins/ibm/sdnve_neutron_plugin.ini | 50 + .../plugins/linuxbridge/linuxbridge_conf.ini | 78 + .../etc/neutron/plugins/metaplugin/metaplugin.ini | 31 + openstack/etc/neutron/plugins/midonet/midonet.ini | 19 + openstack/etc/neutron/plugins/ml2/ml2_conf.ini | 85 + .../etc/neutron/plugins/ml2/ml2_conf_arista.ini | 100 + .../etc/neutron/plugins/ml2/ml2_conf_brocade.ini | 15 + .../etc/neutron/plugins/ml2/ml2_conf_cisco.ini | 118 + .../etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini | 52 + .../etc/neutron/plugins/ml2/ml2_conf_mlnx.ini | 4 + openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini | 28 + openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini | 30 + openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini | 13 + .../etc/neutron/plugins/ml2/ml2_conf_sriov.ini | 31 + openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini | 79 + openstack/etc/neutron/plugins/nec/nec.ini | 63 + .../etc/neutron/plugins/nuage/nuage_plugin.ini | 41 + .../neutron/plugins/oneconvergence/nvsdplugin.ini | 35 + .../plugins/opencontrail/contrailplugin.ini | 26 + .../plugins/openvswitch/ovs_neutron_plugin.ini | 141 + .../etc/neutron/plugins/plumgrid/plumgrid.ini | 14 + openstack/etc/neutron/plugins/vmware/nsx.ini | 203 ++ openstack/etc/neutron/policy.json | 138 + openstack/etc/neutron/rootwrap.conf | 34 + .../etc/neutron/rootwrap.d/cisco-apic.filters | 16 + openstack/etc/neutron/rootwrap.d/debug.filters | 14 + openstack/etc/neutron/rootwrap.d/dhcp.filters | 35 + .../etc/neutron/rootwrap.d/ipset-firewall.filters | 12 + .../neutron/rootwrap.d/iptables-firewall.filters | 21 + openstack/etc/neutron/rootwrap.d/l3.filters | 48 + .../etc/neutron/rootwrap.d/lbaas-haproxy.filters | 26 + .../neutron/rootwrap.d/linuxbridge-plugin.filters | 19 + .../etc/neutron/rootwrap.d/nec-plugin.filters | 12 + openstack/etc/neutron/rootwrap.d/ofagent.filters | 16 + .../neutron/rootwrap.d/openvswitch-plugin.filters | 22 + openstack/etc/neutron/rootwrap.d/vpnaas.filters | 13 + openstack/etc/neutron/vpn_agent.ini | 14 + openstack/etc/nova/api-paste.ini | 118 + openstack/etc/nova/cells.json | 26 + openstack/etc/nova/logging.conf | 81 + openstack/etc/nova/nova-compute.conf | 4 + openstack/etc/nova/nova.conf | 631 ++++ openstack/etc/nova/nova.conf.example | 3698 ++++++++++++++++++++ openstack/etc/nova/policy.json | 324 ++ openstack/etc/nova/release.sample | 4 + openstack/etc/nova/rootwrap.conf | 27 + openstack/etc/nova/rootwrap.d/api-metadata.filters | 13 + .../nova/rootwrap.d/baremetal-compute-ipmi.filters | 9 + .../rootwrap.d/baremetal-deploy-helper.filters | 11 + openstack/etc/nova/rootwrap.d/compute.filters | 228 ++ openstack/etc/nova/rootwrap.d/network.filters | 94 + openstack/etc/sysctl.conf | 3 + .../system/apache-httpd-server-setup.service | 11 + openstack/etc/systemd/system/apache-httpd.service | 16 + .../systemd/system/openstack-cinder-api.service | 11 + .../systemd/system/openstack-cinder-backup.service | 11 + .../system/openstack-cinder-scheduler.service | 11 + .../systemd/system/openstack-cinder-setup.service | 11 + .../systemd/system/openstack-cinder-volume.service | 11 + .../systemd/system/openstack-glance-api.service | 12 + .../system/openstack-glance-registry.service | 12 + .../systemd/system/openstack-glance-setup.service | 11 + .../systemd/system/openstack-horizon-setup.service | 11 + .../system/openstack-keystone-setup.service | 11 + .../etc/systemd/system/openstack-keystone.service | 12 + .../system/openstack-neutron-dhcp-agent.service | 14 + .../system/openstack-neutron-l3-agent.service | 15 + .../openstack-neutron-metadata-agent.service | 14 + ...-neutron-network-configuration-one-node.service | 13 + .../system/openstack-neutron-ovs-cleanup.service | 14 + ...nstack-neutron-plugin-openvswitch-agent.service | 14 + .../system/openstack-neutron-server.service | 15 + .../systemd/system/openstack-neutron-setup.service | 12 + .../etc/systemd/system/openstack-nova-api.service | 11 + .../etc/systemd/system/openstack-nova-cert.service | 11 + .../systemd/system/openstack-nova-compute.service | 12 + .../system/openstack-nova-conductor.service | 12 + .../system/openstack-nova-consoleauth.service | 11 + .../system/openstack-nova-novncproxy.service | 11 + .../system/openstack-nova-scheduler.service | 11 + .../systemd/system/openstack-nova-setup.service | 11 + .../system/openstack-rabbitmq-server.service | 16 + .../system/openstack-rabbitmq-setup.service | 12 + .../openvswitch-create-links-one-node.service | 14 + .../systemd/system/openvswitch-db-server.service | 11 + .../system/openvswitch-initialize-db.service | 10 + .../etc/systemd/system/openvswitch-setup.service | 11 + openstack/etc/systemd/system/openvswitch.service | 10 + .../etc/systemd/system/postgres-server.service | 26 + .../etc/systemd/system/postgres-setup.service | 11 + openstack/manifest | 187 + .../usr/share/openstack/apache-httpd-server-setup | 47 + .../share/openstack/create_openvswitch_veth_pairs | 32 + .../usr/share/openstack/openstack-cinder-setup | 132 + .../usr/share/openstack/openstack-glance-setup | 89 + .../usr/share/openstack/openstack-horizon-setup | 63 + .../usr/share/openstack/openstack-keystone-setup | 92 + ...tack-neutron-network-configuration-for-one-node | 56 + .../usr/share/openstack/openstack-neutron-setup | 95 + openstack/usr/share/openstack/openstack-nova-setup | 133 + .../usr/share/openstack/openstack-rabbitmq-setup | 66 + openstack/usr/share/openstack/openvswitch-setup | 44 + openstack/usr/share/openstack/postgres-setup | 42 + openvswitch.configure | 30 + postgres.configure | 23 + strata/openstack-services.morph | 825 +++++ strata/openstack-services/ipaddr-py.morph | 6 + strata/openstack-services/librabbitmq.morph | 10 + strata/openstack-services/pies.morph | 11 + strata/openstack-services/pycrypto.morph | 3 + strata/openstack-services/qpid-python.morph | 6 + strata/openstack-services/rabbitmq-codegen.morph | 7 + strata/openstack-services/rabbitmq-server.morph | 9 + strata/openstack-services/subunit.morph | 3 + strata/openstack-services/thrift.morph | 9 + strata/openstack-services/xattr.morph | 8 + systems/openstack-server.morph | 67 + 168 files changed, 18212 insertions(+) create mode 100644 apache-httpd-server.configure create mode 100644 clusters/openstack-cluster.morph create mode 100644 openstack-cinder.configure create mode 100644 openstack-glance.configure create mode 100644 openstack-keystone.configure create mode 100644 openstack-neutron.configure create mode 100644 openstack-nova-compute.configure create mode 100644 openstack-nova.configure create mode 100644 openstack-rabbitmq.configure create mode 100644 openstack/etc/cinder/api-paste.ini create mode 100644 openstack/etc/cinder/cinder.conf create mode 100644 openstack/etc/cinder/policy.json create mode 100644 openstack/etc/cinder/rootwrap.conf create mode 100644 openstack/etc/cinder/rootwrap.d/volume.filters create mode 100644 openstack/etc/glance/glance-api-paste.ini create mode 100644 openstack/etc/glance/glance-api.conf create mode 100644 openstack/etc/glance/glance-cache.conf create mode 100644 openstack/etc/glance/glance-registry-paste.ini create mode 100644 openstack/etc/glance/glance-registry.conf create mode 100644 openstack/etc/glance/glance-scrubber.conf create mode 100644 openstack/etc/glance/logging.conf create mode 100644 openstack/etc/glance/policy.json create mode 100644 openstack/etc/glance/schema-image.json create mode 100644 openstack/etc/horizon/apache-horizon.conf create mode 100644 openstack/etc/horizon/openstack_dashboard/local_settings.py create mode 100644 openstack/etc/hosts create mode 100644 openstack/etc/keystone/keystone-paste.ini create mode 100644 openstack/etc/keystone/keystone.conf create mode 100644 openstack/etc/keystone/logging.conf create mode 100644 openstack/etc/keystone/policy.json create mode 100644 openstack/etc/logrotate.d/openstack-glance-api create mode 100644 openstack/etc/logrotate.d/openstack-glance-registry create mode 100644 openstack/etc/logrotate.d/openstack-keystone create mode 100644 openstack/etc/neutron/api-paste.ini create mode 100644 openstack/etc/neutron/dhcp_agent.ini create mode 100644 openstack/etc/neutron/fwaas_driver.ini create mode 100644 openstack/etc/neutron/l3_agent.ini create mode 100644 openstack/etc/neutron/lbaas_agent.ini create mode 100644 openstack/etc/neutron/metadata_agent.ini create mode 100644 openstack/etc/neutron/metering_agent.ini create mode 100644 openstack/etc/neutron/neutron.conf create mode 100644 openstack/etc/neutron/plugins/bigswitch/restproxy.ini create mode 100644 openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README create mode 100644 openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README create mode 100644 openstack/etc/neutron/plugins/brocade/brocade.ini create mode 100644 openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini create mode 100644 openstack/etc/neutron/plugins/cisco/cisco_plugins.ini create mode 100644 openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini create mode 100644 openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini create mode 100644 openstack/etc/neutron/plugins/embrane/heleos_conf.ini create mode 100644 openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini create mode 100644 openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini create mode 100644 openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini create mode 100644 openstack/etc/neutron/plugins/metaplugin/metaplugin.ini create mode 100644 openstack/etc/neutron/plugins/midonet/midonet.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini create mode 100644 openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini create mode 100644 openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini create mode 100644 openstack/etc/neutron/plugins/nec/nec.ini create mode 100644 openstack/etc/neutron/plugins/nuage/nuage_plugin.ini create mode 100644 openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini create mode 100644 openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini create mode 100644 openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini create mode 100644 openstack/etc/neutron/plugins/plumgrid/plumgrid.ini create mode 100644 openstack/etc/neutron/plugins/vmware/nsx.ini create mode 100644 openstack/etc/neutron/policy.json create mode 100644 openstack/etc/neutron/rootwrap.conf create mode 100644 openstack/etc/neutron/rootwrap.d/cisco-apic.filters create mode 100644 openstack/etc/neutron/rootwrap.d/debug.filters create mode 100644 openstack/etc/neutron/rootwrap.d/dhcp.filters create mode 100644 openstack/etc/neutron/rootwrap.d/ipset-firewall.filters create mode 100644 openstack/etc/neutron/rootwrap.d/iptables-firewall.filters create mode 100644 openstack/etc/neutron/rootwrap.d/l3.filters create mode 100644 openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters create mode 100644 openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters create mode 100644 openstack/etc/neutron/rootwrap.d/nec-plugin.filters create mode 100644 openstack/etc/neutron/rootwrap.d/ofagent.filters create mode 100644 openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters create mode 100644 openstack/etc/neutron/rootwrap.d/vpnaas.filters create mode 100644 openstack/etc/neutron/vpn_agent.ini create mode 100644 openstack/etc/nova/api-paste.ini create mode 100644 openstack/etc/nova/cells.json create mode 100644 openstack/etc/nova/logging.conf create mode 100644 openstack/etc/nova/nova-compute.conf create mode 100644 openstack/etc/nova/nova.conf create mode 100644 openstack/etc/nova/nova.conf.example create mode 100644 openstack/etc/nova/policy.json create mode 100644 openstack/etc/nova/release.sample create mode 100644 openstack/etc/nova/rootwrap.conf create mode 100644 openstack/etc/nova/rootwrap.d/api-metadata.filters create mode 100644 openstack/etc/nova/rootwrap.d/baremetal-compute-ipmi.filters create mode 100644 openstack/etc/nova/rootwrap.d/baremetal-deploy-helper.filters create mode 100644 openstack/etc/nova/rootwrap.d/compute.filters create mode 100644 openstack/etc/nova/rootwrap.d/network.filters create mode 100644 openstack/etc/sysctl.conf create mode 100644 openstack/etc/systemd/system/apache-httpd-server-setup.service create mode 100644 openstack/etc/systemd/system/apache-httpd.service create mode 100644 openstack/etc/systemd/system/openstack-cinder-api.service create mode 100644 openstack/etc/systemd/system/openstack-cinder-backup.service create mode 100644 openstack/etc/systemd/system/openstack-cinder-scheduler.service create mode 100644 openstack/etc/systemd/system/openstack-cinder-setup.service create mode 100644 openstack/etc/systemd/system/openstack-cinder-volume.service create mode 100644 openstack/etc/systemd/system/openstack-glance-api.service create mode 100644 openstack/etc/systemd/system/openstack-glance-registry.service create mode 100644 openstack/etc/systemd/system/openstack-glance-setup.service create mode 100644 openstack/etc/systemd/system/openstack-horizon-setup.service create mode 100644 openstack/etc/systemd/system/openstack-keystone-setup.service create mode 100644 openstack/etc/systemd/system/openstack-keystone.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-l3-agent.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-metadata-agent.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-server.service create mode 100644 openstack/etc/systemd/system/openstack-neutron-setup.service create mode 100644 openstack/etc/systemd/system/openstack-nova-api.service create mode 100644 openstack/etc/systemd/system/openstack-nova-cert.service create mode 100644 openstack/etc/systemd/system/openstack-nova-compute.service create mode 100644 openstack/etc/systemd/system/openstack-nova-conductor.service create mode 100644 openstack/etc/systemd/system/openstack-nova-consoleauth.service create mode 100644 openstack/etc/systemd/system/openstack-nova-novncproxy.service create mode 100644 openstack/etc/systemd/system/openstack-nova-scheduler.service create mode 100644 openstack/etc/systemd/system/openstack-nova-setup.service create mode 100644 openstack/etc/systemd/system/openstack-rabbitmq-server.service create mode 100644 openstack/etc/systemd/system/openstack-rabbitmq-setup.service create mode 100644 openstack/etc/systemd/system/openvswitch-create-links-one-node.service create mode 100644 openstack/etc/systemd/system/openvswitch-db-server.service create mode 100644 openstack/etc/systemd/system/openvswitch-initialize-db.service create mode 100644 openstack/etc/systemd/system/openvswitch-setup.service create mode 100644 openstack/etc/systemd/system/openvswitch.service create mode 100644 openstack/etc/systemd/system/postgres-server.service create mode 100644 openstack/etc/systemd/system/postgres-setup.service create mode 100644 openstack/manifest create mode 100755 openstack/usr/share/openstack/apache-httpd-server-setup create mode 100644 openstack/usr/share/openstack/create_openvswitch_veth_pairs create mode 100644 openstack/usr/share/openstack/openstack-cinder-setup create mode 100644 openstack/usr/share/openstack/openstack-glance-setup create mode 100644 openstack/usr/share/openstack/openstack-horizon-setup create mode 100644 openstack/usr/share/openstack/openstack-keystone-setup create mode 100644 openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node create mode 100644 openstack/usr/share/openstack/openstack-neutron-setup create mode 100644 openstack/usr/share/openstack/openstack-nova-setup create mode 100644 openstack/usr/share/openstack/openstack-rabbitmq-setup create mode 100644 openstack/usr/share/openstack/openvswitch-setup create mode 100644 openstack/usr/share/openstack/postgres-setup create mode 100644 openvswitch.configure create mode 100644 postgres.configure create mode 100644 strata/openstack-services.morph create mode 100644 strata/openstack-services/ipaddr-py.morph create mode 100644 strata/openstack-services/librabbitmq.morph create mode 100644 strata/openstack-services/pies.morph create mode 100644 strata/openstack-services/pycrypto.morph create mode 100644 strata/openstack-services/qpid-python.morph create mode 100644 strata/openstack-services/rabbitmq-codegen.morph create mode 100644 strata/openstack-services/rabbitmq-server.morph create mode 100644 strata/openstack-services/subunit.morph create mode 100644 strata/openstack-services/thrift.morph create mode 100644 strata/openstack-services/xattr.morph create mode 100644 systems/openstack-server.morph diff --git a/apache-httpd-server.configure b/apache-httpd-server.configure new file mode 100644 index 00000000..a2a5e2f9 --- /dev/null +++ b/apache-httpd-server.configure @@ -0,0 +1,23 @@ +#!/bin/sh + +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +ln -sf "/etc/systemd/system/apache-httpd.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/apache-httpd.service" diff --git a/clusters/openstack-cluster.morph b/clusters/openstack-cluster.morph new file mode 100644 index 00000000..df2d9943 --- /dev/null +++ b/clusters/openstack-cluster.morph @@ -0,0 +1,66 @@ +name: openstack-one-node +kind: cluster +systems: +- morph: systems/openstack-server.morph + deploy: + release: + type: rawdisk + location: baserock-xx-openstack-system-x86_64.img + # type: kvm + # location: kvm+ssh://franred@refinery.ducie.codethink.co.uk/franred-openstack-test/home/franred/openstack.img + DISK_SIZE: 5G + RAM_SIZE: 1G + VCPUS: 1 + INSTALL_FILES: openstack/manifest + HOSTNAME: onenode + RABBITMQ_HOST: onenode + RABBITMQ_PORT: 5672 + RABBITMQ_USER: rabbitmq + RABBITMQ_PASSWORD: veryinsecure + KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 + KEYSTONE_TEMPORARY_ADMIN_PASSWORD: veryinsecure + KEYSTONE_PUBLIC_URL: http:\/\/onenode:5000\/v2.0 + KEYSTONE_INTERNAL_URL: http:\/\/onenode:5000\/v2.0 + KEYSTONE_ADMIN_URL: http:\/\/onenode:35357\/v2.0 + KEYSTONE_DB_USER: keystoneDB + KEYSTONE_DB_PASSWORD: veryinsecure + IDENTITY_URI: http:\/\/onenode:35357 + OPENSTACK_AUTH_HOST: onenode + OPENSTACK_AUTH_PORT: 35357 + GLANCE_SERVICE_USER: glance + GLANCE_SERVICE_PASSWORD: veryinsecure + GLANCE_PUBLIC_URL: http:\/\/onenode:9292 + GLANCE_INTERNAL_URL: http:\/\/onenode:9292 + GLANCE_ADMIN_URL: http:\/\/onenode:9292 + GLANCE_HOST: onenode + GLANCE_DB_USER: glanceDB + GLANCE_DB_PASSWORD: veryinsecure + NOVA_HOST: 127.0.0.1 + NOVA_SERVICE_USER: nova + NOVA_SERVICE_PASSWORD: veryinsecure + NOVA_PUBLIC_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\" + NOVA_INTERNAL_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\" + NOVA_ADMIN_URL: \"http:\/\/onenode:8774\/v2\/\%\(tenant_id\)s\" + NOVA_NOVNCPROXY_BASE_URL: http:\/\/onenode:6080\/vnc_auto.html + NOVA_REGION: regionOne + NOVA_DB_USER: novaDB + NOVA_DB_PASSWORD: veryinsecure + CINDER_USER: cinder + CINDER_PASSWORD: veryinsecure + CINDER_PUBLIC_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\" + CINDER_INTERNAL_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\" + CINDER_ADMIN_URL: \"http:\/\/onenode:8776\/v1\/\%\(tenant_id\)s\" + CINDER_USER_V2: cinderv2 + CINDER_PUBLIC_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\" + CINDER_INTERNAL_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\" + CINDER_ADMIN_URL_V2: \"http:\/\/onenode:8776\/v2\/\%\(tenant_id\)s\" + CINDER_DB_USER: cinderDB + CINDER_DB_PASSWORD: veryinsecure + NEUTRON_SERVICE_USER: neutron + NEUTRON_SERVICE_PASSWORD: veryinsecure + NEUTRON_DB_USER: neutronDB + NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_PUBLIC_URL: http:\/\/onenode:9696 + NEUTRON_INTERNAL_URL: http:\/\/onenode:9696 + NEUTRON_ADMIN_URL: http:\/\/onenode:9696 + METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret diff --git a/openstack-cinder.configure b/openstack-cinder.configure new file mode 100644 index 00000000..335ff512 --- /dev/null +++ b/openstack-cinder.configure @@ -0,0 +1,55 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-cinder-setup.sed +s/##CINDER_USER##/$CINDER_USER/g +s/##CINDER_PASSWORD##/$CINDER_PASSWORD/g +s/##CINDER_PUBLIC_URL##/$CINDER_PUBLIC_URL/g +s/##CINDER_INTERNAL_URL##/$CINDER_INTERNAL_URL/g +s/##CINDER_ADMIN_URL##/$CINDER_ADMIN_URL/g +s/##CINDER_USER_V2##/$CINDER_USER_V2/g +s/##CINDER_PUBLIC_URL_V2##/$CINDER_PUBLIC_URL_V2/g +s/##CINDER_INTERNAL_URL_V2##/$CINDER_INTERNAL_URL_V2/g +s/##CINDER_ADMIN_URL_V2##/$CINDER_ADMIN_URL_V2/g +s/##CINDER_DB_USER##/$CINDER_DB_USER/g +s/##CINDER_DB_PASSWORD##/$CINDER_DB_PASSWORD/g +EOF + +sed -f "$ROOT"/etc/openstack-cinder-setup.sed -i \ + "$ROOT"/etc/cinder/cinder.conf \ + "$ROOT"/usr/share/openstack/openstack-cinder-setup + +########################################################################## + +ln -sf "/etc/systemd/system/openstack-cinder-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service" + +########################################################################## +# Add cinder to sudoers controlling which commands is running as a root +# using the openstack rootwrap. +########################################################################## +install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/cinder-rootwrap +cinder ALL=(root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * +EOF diff --git a/openstack-glance.configure b/openstack-glance.configure new file mode 100644 index 00000000..6780a64a --- /dev/null +++ b/openstack-glance.configure @@ -0,0 +1,49 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-glance-setup.sed +s/##GLANCE_SERVICE_USER##/$GLANCE_SERVICE_USER/g +s/##GLANCE_SERVICE_PASSWORD##/$GLANCE_SERVICE_PASSWORD/g +s/##GLANCE_PUBLIC_URL##/$GLANCE_PUBLIC_URL/g +s/##GLANCE_INTERNAL_URL##/$GLANCE_INTERNAL_URL/g +s/##GLANCE_ADMIN_URL##/$GLANCE_ADMIN_URL/g +s/##GLANCE_HOST##/$GLANCE_HOST/g +s/##GLANCE_DB_USER##/$GLANCE_DB_USER/g +s/##GLANCE_DB_PASSWORD##/$GLANCE_DB_PASSWORD/g +EOF + +sed -f "$ROOT"/etc/openstack-glance-setup.sed -i \ + "$ROOT"/etc/glance/glance-api.conf \ + "$ROOT"/etc/glance/glance-registry.conf \ + "$ROOT"/etc/glance/glance-scrubber.conf \ + "$ROOT"/etc/glance/glance-cache.conf \ + "$ROOT"/etc/cinder/cinder.conf \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/usr/share/openstack/openstack-glance-setup + +########################################################################## + +ln -s "/etc/systemd/system/openstack-glance-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-glance-setup.service" diff --git a/openstack-keystone.configure b/openstack-keystone.configure new file mode 100644 index 00000000..d2d1171e --- /dev/null +++ b/openstack-keystone.configure @@ -0,0 +1,56 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-keystone-setup.sed +s/##KEYSTONE_TEMPORARY_ADMIN_TOKEN##/$KEYSTONE_TEMPORARY_ADMIN_TOKEN/g +s/##KEYSTONE_TEMPORARY_ADMIN_PASSWORD##/$KEYSTONE_TEMPORARY_ADMIN_PASSWORD/g +s/##KEYSTONE_PUBLIC_URL##/$KEYSTONE_PUBLIC_URL/g +s/##KEYSTONE_INTERNAL_URL##/$KEYSTONE_INTERNAL_URL/g +s/##KEYSTONE_ADMIN_URL##/$KEYSTONE_ADMIN_URL/g +s/##OPENSTACK_AUTH_HOST##/$OPENSTACK_AUTH_HOST/g +s/##OPENSTACK_AUTH_PORT##/$OPENSTACK_AUTH_PORT/g +s/##IDENTITY_URI##/$IDENTITY_URI/g +s/##KEYSTONE_DB_USER##/$KEYSTONE_DB_USER/g +s/##KEYSTONE_DB_PASSWORD##/$KEYSTONE_DB_PASSWORD/g +EOF + +sed -f "$ROOT"/etc/openstack-keystone-setup.sed -i \ + "$ROOT"/etc/keystone/keystone.conf \ + "$ROOT"/etc/glance/glance-api.conf \ + "$ROOT"/etc/glance/glance-registry.conf \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/etc/cinder/cinder.conf \ + "$ROOT"/etc/neutron/neutron.conf \ + "$ROOT"/etc/neutron/metadata_agent.ini \ + "$ROOT"/usr/share/openstack/openstack-keystone-setup \ + "$ROOT"/usr/share/openstack/openstack-glance-setup \ + "$ROOT"/usr/share/openstack/openstack-nova-setup \ + "$ROOT"/usr/share/openstack/openstack-neutron-setup \ + "$ROOT"/usr/share/openstack/openstack-cinder-setup + +########################################################################## + +ln -s "/etc/systemd/system/openstack-keystone-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-keystone-setup.service" diff --git a/openstack-neutron.configure b/openstack-neutron.configure new file mode 100644 index 00000000..5f5754a9 --- /dev/null +++ b/openstack-neutron.configure @@ -0,0 +1,67 @@ +#!/bin/bash + +# Copyright (C) 2014-2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files # +########################################################################## + +cat < "$ROOT"/etc/openstack-neutron-setup.sed +s/##NEUTRON_SERVICE_USER##/$NEUTRON_SERVICE_USER/g +s/##NEUTRON_SERVICE_PASSWORD##/$NEUTRON_SERVICE_PASSWORD/g +s/##NEUTRON_DB_USER##/$NEUTRON_DB_USER/g +s/##NEUTRON_DB_PASSWORD##/$NEUTRON_DB_PASSWORD/g +s/##NEUTRON_PUBLIC_URL##/$NEUTRON_PUBLIC_URL/g +s/##NEUTRON_INTERNAL_URL##/$NEUTRON_INTERNAL_URL/g +s/##NEUTRON_ADMIN_URL##/$NEUTRON_ADMIN_URL/g +s/##METADATA_PROXY_SHARED_SECRET##/$METADATA_PROXY_SHARED_SECRET/g +EOF + +sed -f "$ROOT"/etc/openstack-neutron-setup.sed -i \ + "$ROOT"/etc/neutron/neutron.conf \ + "$ROOT"/etc/neutron/metadata_agent.ini \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/usr/share/openstack/openstack-neutron-setup + +########################################################################## +# Create the links to enable the neutron systemd services # +########################################################################## +services=("openstack-neutron-network-configuration-one-node.service" \ + "openvswitch-create-links-one-node.service" \ + "openstack-neutron-dhcp-agent.service" \ + "openstack-neutron-l3-agent.service" \ + "openstack-neutron-metadata-agent.service" \ + "openstack-neutron-ovs-cleanup.service" \ + "openstack-neutron-plugin-openvswitch-agent.service" \ + "openstack-neutron-server.service" \ + "openstack-neutron-setup.service") + +for service in ${services[@]}; do + ln -sf "/etc/systemd/system/$service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/$service" +done + +########################################################################## +# Add neutron to sudoers controlling which commands is running as a root # +# using the openstack rootwrap. # +########################################################################## +install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/neutron-rootwrap +neutron ALL=(root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * +EOF diff --git a/openstack-nova-compute.configure b/openstack-nova-compute.configure new file mode 100644 index 00000000..9487c759 --- /dev/null +++ b/openstack-nova-compute.configure @@ -0,0 +1,41 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-nova-compute-setup.sed +s/##NOVA_SERVICE_USER##/$NOVA_SERVICE_USER/g +s/##NOVA_SERVICE_PASSWORD##/$NOVA_SERVICE_PASSWORD/g +s/##NOVA_PUBLIC_URL##/$NOVA_PUBLIC_URL/g +s/##NOVA_INTERNAL_URL##/$NOVA_INTERNAL_URL/g +s/##NOVA_ADMIN_URL##/$NOVA_ADMIN_URL/g +EOF + +sed -f "$ROOT"/etc/openstack-nova-compute-setup.sed -i \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/usr/share/openstack/openstack-nova-compute-setup + +########################################################################## + +ln -s "/etc/systemd/system/openstack-nova-compute-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-nova-compute-setup.service" diff --git a/openstack-nova.configure b/openstack-nova.configure new file mode 100644 index 00000000..efa6eb11 --- /dev/null +++ b/openstack-nova.configure @@ -0,0 +1,74 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-nova-setup.sed +s/##NOVA_SERVICE_USER##/$NOVA_SERVICE_USER/g +s/##NOVA_SERVICE_PASSWORD##/$NOVA_SERVICE_PASSWORD/g +s/##NOVA_PUBLIC_URL##/$NOVA_PUBLIC_URL/g +s/##NOVA_INTERNAL_URL##/$NOVA_INTERNAL_URL/g +s/##NOVA_ADMIN_URL##/$NOVA_ADMIN_URL/g +s/##NOVA_HOST##/$NOVA_HOST/g +s/##NOVA_REGION##/$NOVA_REGION/g +s/##NOVA_NOVNCPROXY_BASE_URL##/$NOVA_NOVNCPROXY_BASE_URL/g +s/##NOVA_DB_USER##/$NOVA_DB_USER/g +s/##NOVA_DB_PASSWORD##/$NOVA_DB_PASSWORD/g +EOF + +sed -f "$ROOT"/etc/openstack-nova-setup.sed -i \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/etc/neutron/neutron.conf \ + "$ROOT"/etc/neutron/metadata_agent.ini \ + "$ROOT"/usr/share/openstack/openstack-nova-setup + +########################################################################## + +ln -sf "/etc/systemd/system/openstack-nova-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-nova-setup.service" + +########################################################################## +# Enable libvirtd and libvirt-guests services +########################################################################## + +wants_dir="$ROOT"/usr/lib/systemd/system/multi-user.target.wants +mkdir -p "$wants_dir" +mkdir -p "$ROOT"/var/lock/subsys +ln -sf ../libvirtd.service "$wants_dir/libvirtd.service" +ln -sf ../libvirt-guests.service "$wants_dir/libvirt-guests.service" + +########################################################################## +# Change iprange for the interal libvirt to avoid clashes +# with eth0 ip range +########################################################################## + +sed -i "s/192\.168\.122\./192\.168\.1\./g" \ + "$ROOT"/etc/libvirt/qemu/networks/default.xml + +########################################################################## +# Add nova to sudoers controlling which commands is running as a root +# using the openstack rootwrap. +########################################################################## +install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/nova-rootwrap +nova ALL=(root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * +EOF diff --git a/openstack-rabbitmq.configure b/openstack-rabbitmq.configure new file mode 100644 index 00000000..40c37698 --- /dev/null +++ b/openstack-rabbitmq.configure @@ -0,0 +1,47 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +########################################################################## +# Substitutions in configuration files +########################################################################## + +cat < "$ROOT"/etc/openstack-rabbitmq-setup.sed +s/##RABBITMQ_HOST##/$RABBITMQ_HOST/g +s/##RABBITMQ_PORT##/$RABBITMQ_PORT/g +s/##RABBITMQ_USER##/$RABBITMQ_USER/g +s/##RABBITMQ_PASSWORD##/$RABBITMQ_PASSWORD/g +EOF + +sed -f "$ROOT"/etc/openstack-rabbitmq-setup.sed -i \ + "$ROOT"/etc/keystone/keystone.conf \ + "$ROOT"/etc/nova/nova.conf \ + "$ROOT"/etc/cinder/cinder.conf \ + "$ROOT"/etc/neutron/neutron.conf \ + "$ROOT"/etc/glance/glance-api.conf \ + "$ROOT"/usr/share/openstack/openstack-rabbitmq-setup + +########################################################################## + +ln -s "/etc/systemd/system/openstack-rabbitmq-setup.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-rabbitmq-setup.service" + +ln -s "/etc/systemd/system/openstack-rabbitmq-server.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-rabbitmq-server.service" diff --git a/openstack/etc/cinder/api-paste.ini b/openstack/etc/cinder/api-paste.ini new file mode 100644 index 00000000..31619fc8 --- /dev/null +++ b/openstack/etc/cinder/api-paste.ini @@ -0,0 +1,60 @@ +############# +# OpenStack # +############# + +[composite:osapi_volume] +use = call:cinder.api:root_app_factory +/: apiversions +/v1: openstack_volume_api_v1 +/v2: openstack_volume_api_v2 + +[composite:openstack_volume_api_v1] +use = call:cinder.api.middleware.auth:pipeline_factory +noauth = request_id faultwrap sizelimit osprofiler noauth apiv1 +keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1 +keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1 + +[composite:openstack_volume_api_v2] +use = call:cinder.api.middleware.auth:pipeline_factory +noauth = request_id faultwrap sizelimit osprofiler noauth apiv2 +keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 +keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2 + +[filter:request_id] +paste.filter_factory = cinder.openstack.common.middleware.request_id:RequestIdMiddleware.factory + +[filter:faultwrap] +paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory + +[filter:osprofiler] +paste.filter_factory = osprofiler.web:WsgiMiddleware.factory +hmac_keys = SECRET_KEY +enabled = yes + +[filter:noauth] +paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory + +[filter:sizelimit] +paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory + +[app:apiv1] +paste.app_factory = cinder.api.v1.router:APIRouter.factory + +[app:apiv2] +paste.app_factory = cinder.api.v2.router:APIRouter.factory + +[pipeline:apiversions] +pipeline = faultwrap osvolumeversionapp + +[app:osvolumeversionapp] +paste.app_factory = cinder.api.versions:Versions.factory + +########## +# Shared # +########## + +[filter:keystonecontext] +paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/openstack/etc/cinder/cinder.conf b/openstack/etc/cinder/cinder.conf new file mode 100644 index 00000000..764c08bc --- /dev/null +++ b/openstack/etc/cinder/cinder.conf @@ -0,0 +1,2769 @@ +[DEFAULT] + +state_path = /var/lib/cinder +# +# Options defined in oslo.messaging +# + +# Use durable queues in amqp. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_durable_queues +#amqp_durable_queues=false + +# Auto-delete queues in amqp. (boolean value) +#amqp_auto_delete=false + +# Size of RPC connection pool. (integer value) +#rpc_conn_pool_size=30 + +# Qpid broker hostname. (string value) +#qpid_hostname=localhost + +# Qpid broker port. (integer value) +#qpid_port=5672 + +# Qpid HA cluster host:port pairs. (list value) +#qpid_hosts=$qpid_hostname:$qpid_port + +# Username for Qpid connection. (string value) +#qpid_username= + +# Password for Qpid connection. (string value) +#qpid_password= + +# Space separated list of SASL mechanisms to use for auth. +# (string value) +#qpid_sasl_mechanisms= + +# Seconds between connection keepalive heartbeats. (integer +# value) +#qpid_heartbeat=60 + +# Transport to use, either 'tcp' or 'ssl'. (string value) +#qpid_protocol=tcp + +# Whether to disable the Nagle algorithm. (boolean value) +#qpid_tcp_nodelay=true + +# The number of prefetched messages held by receiver. (integer +# value) +#qpid_receiver_capacity=1 + +# The qpid topology version to use. Version 1 is what was +# originally used by impl_qpid. Version 2 includes some +# backwards-incompatible changes that allow broker federation +# to work. Users should update to version 2 when they are +# able to take everything down, as it requires a clean break. +# (integer value) +#qpid_topology_version=1 + +# SSL version to use (valid only if SSL enabled). valid values +# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some +# distributions. (string value) +#kombu_ssl_version= + +# SSL key file (valid only if SSL enabled). (string value) +#kombu_ssl_keyfile= + +# SSL cert file (valid only if SSL enabled). (string value) +#kombu_ssl_certfile= + +# SSL certification authority file (valid only if SSL +# enabled). (string value) +#kombu_ssl_ca_certs= + +# How long to wait before reconnecting in response to an AMQP +# consumer cancel notification. (floating point value) +#kombu_reconnect_delay=1.0 + +# The RabbitMQ broker address where a single node is used. +# (string value) +rabbit_host=##RABBITMQ_HOST## + +# The RabbitMQ broker port where a single node is used. +# (integer value) +rabbit_port=##RABBITMQ_PORT## + +# RabbitMQ HA cluster host:port pairs. (list value) +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +rabbit_userid=##RABBITMQ_USER## + +# The RabbitMQ password. (string value) +rabbit_password=##RABBITMQ_PASSWORD## + +# the RabbitMQ login method (string value) +#rabbit_login_method=AMQPLAIN + +# The RabbitMQ virtual host. (string value) +#rabbit_virtual_host=/ + +# How frequently to retry connecting with RabbitMQ. (integer +# value) +#rabbit_retry_interval=1 + +# How long to backoff for between retries when connecting to +# RabbitMQ. (integer value) +#rabbit_retry_backoff=2 + +# Maximum number of RabbitMQ connection retries. Default is 0 +# (infinite retry count). (integer value) +#rabbit_max_retries=0 + +# Use HA queues in RabbitMQ (x-ha-policy: all). If you change +# this option, you must wipe the RabbitMQ database. (boolean +# value) +#rabbit_ha_queues=false + +# If passed, use a fake RabbitMQ provider. (boolean value) +#fake_rabbit=false + +# ZeroMQ bind address. Should be a wildcard (*), an ethernet +# interface, or IP. The "host" option should point or resolve +# to this address. (string value) +#rpc_zmq_bind_address=* + +# MatchMaker driver. (string value) +#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + +# ZeroMQ receiver listening port. (integer value) +#rpc_zmq_port=9501 + +# Number of ZeroMQ contexts, defaults to 1. (integer value) +#rpc_zmq_contexts=1 + +# Maximum number of ingress messages to locally buffer per +# topic. Default is unlimited. (integer value) +#rpc_zmq_topic_backlog= + +# Directory for holding IPC sockets. (string value) +#rpc_zmq_ipc_dir=/var/run/openstack + +# Name of this node. Must be a valid hostname, FQDN, or IP +# address. Must match "host" option, if running Nova. (string +# value) +#rpc_zmq_host=cinder + +# Seconds to wait before a cast expires (TTL). Only supported +# by impl_zmq. (integer value) +#rpc_cast_timeout=30 + +# Heartbeat frequency. (integer value) +#matchmaker_heartbeat_freq=300 + +# Heartbeat time-to-live. (integer value) +#matchmaker_heartbeat_ttl=600 + +# Size of RPC greenthread pool. (integer value) +#rpc_thread_pool_size=64 + +# Driver or drivers to handle sending notifications. (multi +# valued) +#notification_driver= + +# AMQP topic used for OpenStack notifications. (list value) +# Deprecated group/name - [rpc_notifier2]/topics +#notification_topics=notifications + +# Seconds to wait for a response from a call. (integer value) +#rpc_response_timeout=60 + +# A URL representing the messaging driver to use and its full +# configuration. If not set, we fall back to the rpc_backend +# option and driver specific configuration. (string value) +#transport_url= + +# The messaging driver to use, defaults to rabbit. Other +# drivers include qpid and zmq. (string value) +rpc_backend=rabbit + +# The default exchange under which topics are scoped. May be +# overridden by an exchange name specified in the +# transport_url option. (string value) +#control_exchange=openstack + + +# +# Options defined in cinder.exception +# + +# Make exception message format errors fatal. (boolean value) +#fatal_exception_format_errors=false + + +# +# Options defined in cinder.quota +# + +# Number of volumes allowed per project (integer value) +#quota_volumes=10 + +# Number of volume snapshots allowed per project (integer +# value) +#quota_snapshots=10 + +# Number of consistencygroups allowed per project (integer +# value) +#quota_consistencygroups=10 + +# Total amount of storage, in gigabytes, allowed for volumes +# and snapshots per project (integer value) +#quota_gigabytes=1000 + +# Number of volume backups allowed per project (integer value) +#quota_backups=10 + +# Total amount of storage, in gigabytes, allowed for backups +# per project (integer value) +#quota_backup_gigabytes=1000 + +# Number of seconds until a reservation expires (integer +# value) +#reservation_expire=86400 + +# Count of reservations until usage is refreshed (integer +# value) +#until_refresh=0 + +# Number of seconds between subsequent usage refreshes +# (integer value) +#max_age=0 + +# Default driver to use for quota checks (string value) +#quota_driver=cinder.quota.DbQuotaDriver + +# Enables or disables use of default quota class with default +# quota. (boolean value) +#use_default_quota_class=true + + +# +# Options defined in cinder.service +# + +# Interval, in seconds, between nodes reporting state to +# datastore (integer value) +#report_interval=10 + +# Interval, in seconds, between running periodic tasks +# (integer value) +#periodic_interval=60 + +# Range, in seconds, to randomly delay when starting the +# periodic task scheduler to reduce stampeding. (Disable by +# setting to 0) (integer value) +#periodic_fuzzy_delay=60 + +# IP address on which OpenStack Volume API listens (string +# value) +#osapi_volume_listen=0.0.0.0 + +# Port on which OpenStack Volume API listens (integer value) +#osapi_volume_listen_port=8776 + +# Number of workers for OpenStack Volume API service. The +# default is equal to the number of CPUs available. (integer +# value) +#osapi_volume_workers= + + +# +# Options defined in cinder.ssh_utils +# + +# Option to enable strict host key checking. When set to +# "True" Cinder will only connect to systems with a host key +# present in the configured "ssh_hosts_key_file". When set to +# "False" the host key will be saved upon first connection and +# used for subsequent connections. Default=False (boolean +# value) +#strict_ssh_host_key_policy=false + +# File containing SSH host keys for the systems with which +# Cinder needs to communicate. OPTIONAL: +# Default=$state_path/ssh_known_hosts (string value) +#ssh_hosts_key_file=$state_path/ssh_known_hosts + + +# +# Options defined in cinder.test +# + +# File name of clean sqlite db (string value) +#sqlite_clean_db=clean.sqlite + + +# +# Options defined in cinder.wsgi +# + +# Maximum line size of message headers to be accepted. +# max_header_line may need to be increased when using large +# tokens (typically those generated by the Keystone v3 API +# with big service catalogs). (integer value) +#max_header_line=16384 + +# Sets the value of TCP_KEEPALIVE (True/False) for each server +# socket. (boolean value) +#tcp_keepalive=true + +# Sets the value of TCP_KEEPIDLE in seconds for each server +# socket. Not supported on OS X. (integer value) +#tcp_keepidle=600 + +# Sets the value of TCP_KEEPINTVL in seconds for each server +# socket. Not supported on OS X. (integer value) +#tcp_keepalive_interval= + +# Sets the value of TCP_KEEPCNT for each server socket. Not +# supported on OS X. (integer value) +#tcp_keepalive_count= + +# CA certificate file to use to verify connecting clients +# (string value) +#ssl_ca_file= + +# Certificate file to use when starting the server securely +# (string value) +#ssl_cert_file= + +# Private key file to use when starting the server securely +# (string value) +#ssl_key_file= + + +# +# Options defined in cinder.api.common +# + +# The maximum number of items that a collection resource +# returns in a single response (integer value) +#osapi_max_limit=1000 + +# Base URL that will be presented to users in links to the +# OpenStack Volume API (string value) +# Deprecated group/name - [DEFAULT]/osapi_compute_link_prefix +#osapi_volume_base_URL= + + +# +# Options defined in cinder.api.middleware.auth +# + +# Treat X-Forwarded-For as the canonical remote address. Only +# enable this if you have a sanitizing proxy. (boolean value) +#use_forwarded_for=false + + +# +# Options defined in cinder.api.middleware.sizelimit +# + +# Max size for body of a request (integer value) +#osapi_max_request_body_size=114688 + + +# +# Options defined in cinder.backup.driver +# + +# Backup metadata version to be used when backing up volume +# metadata. If this number is bumped, make sure the service +# doing the restore supports the new version. (integer value) +#backup_metadata_version=1 + + +# +# Options defined in cinder.backup.drivers.ceph +# + +# Ceph configuration file to use. (string value) +#backup_ceph_conf=/etc/ceph/ceph.conf + +# The Ceph user to connect with. Default here is to use the +# same user as for Cinder volumes. If not using cephx this +# should be set to None. (string value) +#backup_ceph_user=cinder + +# The chunk size, in bytes, that a backup is broken into +# before transfer to the Ceph object store. (integer value) +#backup_ceph_chunk_size=134217728 + +# The Ceph pool where volume backups are stored. (string +# value) +#backup_ceph_pool=backups + +# RBD stripe unit to use when creating a backup image. +# (integer value) +#backup_ceph_stripe_unit=0 + +# RBD stripe count to use when creating a backup image. +# (integer value) +#backup_ceph_stripe_count=0 + +# If True, always discard excess bytes when restoring volumes +# i.e. pad with zeroes. (boolean value) +#restore_discard_excess_bytes=true + + +# +# Options defined in cinder.backup.drivers.swift +# + +# The URL of the Swift endpoint (string value) +#backup_swift_url= + +# Info to match when looking for swift in the service catalog. +# Format is: separated values of the form: +# :: - Only used if +# backup_swift_url is unset (string value) +#swift_catalog_info=object-store:swift:publicURL + +# Swift authentication mechanism (string value) +#backup_swift_auth=per_user + +# Swift authentication version. Specify "1" for auth 1.0, or +# "2" for auth 2.0 (string value) +#backup_swift_auth_version=1 + +# Swift tenant/account name. Required when connecting to an +# auth 2.0 system (string value) +#backup_swift_tenant= + +# Swift user name (string value) +#backup_swift_user= + +# Swift key for authentication (string value) +#backup_swift_key= + +# The default Swift container to use (string value) +#backup_swift_container=volumebackups + +# The size in bytes of Swift backup objects (integer value) +#backup_swift_object_size=52428800 + +# The number of retries to make for Swift operations (integer +# value) +#backup_swift_retry_attempts=3 + +# The backoff time in seconds between Swift retries (integer +# value) +#backup_swift_retry_backoff=2 + +# Compression algorithm (None to disable) (string value) +#backup_compression_algorithm=zlib + + +# +# Options defined in cinder.backup.drivers.tsm +# + +# Volume prefix for the backup id when backing up to TSM +# (string value) +#backup_tsm_volume_prefix=backup + +# TSM password for the running username (string value) +#backup_tsm_password=password + +# Enable or Disable compression for backups (boolean value) +#backup_tsm_compression=true + + +# +# Options defined in cinder.backup.manager +# + +# Driver to use for backups. (string value) +# Deprecated group/name - [DEFAULT]/backup_service +#backup_driver=cinder.backup.drivers.swift + + +# +# Options defined in cinder.common.config +# + +# File name for the paste.deploy config for cinder-api (string +# value) +api_paste_config=api-paste.ini + +# Top-level directory for maintaining cinder's state (string +# value) +# Deprecated group/name - [DEFAULT]/pybasedir +#state_path=/var/lib/cinder + +# IP address of this host (string value) +my_ip=##GLANCE_HOST## + +# Default glance host name or IP (string value) +glance_host=$my_ip + +# Default glance port (integer value) +#glance_port=9292 + +# A list of the glance API servers available to cinder +# ([hostname|ip]:port) (list value) +#glance_api_servers=$glance_host:$glance_port + +# Version of the glance API to use (integer value) +#glance_api_version=1 + +# Number retries when downloading an image from glance +# (integer value) +#glance_num_retries=0 + +# Allow to perform insecure SSL (https) requests to glance +# (boolean value) +#glance_api_insecure=false + +# Enables or disables negotiation of SSL layer compression. In +# some cases disabling compression can improve data +# throughput, such as when high network bandwidth is available +# and you use compressed image formats like qcow2. (boolean +# value) +#glance_api_ssl_compression=false + +# Location of ca certificates file to use for glance client +# requests. (string value) +#glance_ca_certificates_file= + +# http/https timeout value for glance operations. If no value +# (None) is supplied here, the glanceclient default value is +# used. (integer value) +#glance_request_timeout= + +# The topic that scheduler nodes listen on (string value) +#scheduler_topic=cinder-scheduler + +# The topic that volume nodes listen on (string value) +#volume_topic=cinder-volume + +# The topic that volume backup nodes listen on (string value) +#backup_topic=cinder-backup + +# DEPRECATED: Deploy v1 of the Cinder API. (boolean value) +#enable_v1_api=true + +# Deploy v2 of the Cinder API. (boolean value) +#enable_v2_api=true + +# Enables or disables rate limit of the API. (boolean value) +#api_rate_limit=true + +# Specify list of extensions to load when using +# osapi_volume_extension option with +# cinder.api.contrib.select_extensions (list value) +#osapi_volume_ext_list= + +# osapi volume extension to load (multi valued) +#osapi_volume_extension=cinder.api.contrib.standard_extensions + +# Full class name for the Manager for volume (string value) +#volume_manager=cinder.volume.manager.VolumeManager + +# Full class name for the Manager for volume backup (string +# value) +#backup_manager=cinder.backup.manager.BackupManager + +# Full class name for the Manager for scheduler (string value) +#scheduler_manager=cinder.scheduler.manager.SchedulerManager + +# Name of this node. This can be an opaque identifier. It is +# not necessarily a host name, FQDN, or IP address. (string +# value) +#host=cinder + +# Availability zone of this node (string value) +#storage_availability_zone=nova + +# Default availability zone for new volumes. If not set, the +# storage_availability_zone option value is used as the +# default for new volumes. (string value) +#default_availability_zone= + +# Default volume type to use (string value) +#default_volume_type= + +# Time period for which to generate volume usages. The options +# are hour, day, month, or year. (string value) +#volume_usage_audit_period=month + +# Path to the rootwrap configuration file to use for running +# commands as root (string value) +rootwrap_config=/etc/cinder/rootwrap.conf + +# Enable monkey patching (boolean value) +#monkey_patch=false + +# List of modules/decorators to monkey patch (list value) +#monkey_patch_modules= + +# Maximum time since last check-in for a service to be +# considered up (integer value) +#service_down_time=60 + +# The full class name of the volume API class to use (string +# value) +#volume_api_class=cinder.volume.api.API + +# The full class name of the volume backup API class (string +# value) +#backup_api_class=cinder.backup.api.API + +# The strategy to use for auth. Supports noauth, keystone, and +# deprecated. (string value) +auth_strategy=keystone + +# A list of backend names to use. These backend names should +# be backed by a unique [CONFIG] group with its options (list +# value) +#enabled_backends= + +# Whether snapshots count against GigaByte quota (boolean +# value) +#no_snapshot_gb_quota=false + +# The full class name of the volume transfer API class (string +# value) +#transfer_api_class=cinder.transfer.api.API + +# The full class name of the volume replication API class +# (string value) +#replication_api_class=cinder.replication.api.API + +# The full class name of the consistencygroup API class +# (string value) +#consistencygroup_api_class=cinder.consistencygroup.api.API + + +# +# Options defined in cinder.compute +# + +# The full class name of the compute API class to use (string +# value) +#compute_api_class=cinder.compute.nova.API + + +# +# Options defined in cinder.compute.nova +# + +# Match this value when searching for nova in the service +# catalog. Format is: separated values of the form: +# :: (string value) +#nova_catalog_info=compute:nova:publicURL + +# Same as nova_catalog_info, but for admin endpoint. (string +# value) +#nova_catalog_admin_info=compute:nova:adminURL + +# Override service catalog lookup with template for nova +# endpoint e.g. http://localhost:8774/v2/%(project_id)s +# (string value) +#nova_endpoint_template= + +# Same as nova_endpoint_template, but for admin endpoint. +# (string value) +#nova_endpoint_admin_template= + +# Region name of this node (string value) +#os_region_name= + +# Location of ca certificates file to use for nova client +# requests. (string value) +#nova_ca_certificates_file= + +# Allow to perform insecure SSL requests to nova (boolean +# value) +#nova_api_insecure=false + + +# +# Options defined in cinder.db.api +# + +# The backend to use for db (string value) +#db_backend=sqlalchemy + +# Services to be added to the available pool on create +# (boolean value) +#enable_new_services=true + +# Template string to be used to generate volume names (string +# value) +volume_name_template=volume-%s + +# Template string to be used to generate snapshot names +# (string value) +#snapshot_name_template=snapshot-%s + +# Template string to be used to generate backup names (string +# value) +#backup_name_template=backup-%s + + +# +# Options defined in cinder.db.base +# + +# Driver to use for database access (string value) +#db_driver=cinder.db + + +# +# Options defined in cinder.image.glance +# + +# Default core properties of image (list value) +#glance_core_properties=checksum,container_format,disk_format,image_name,image_id,min_disk,min_ram,name,size + +# A list of url schemes that can be downloaded directly via +# the direct_url. Currently supported schemes: [file]. (list +# value) +#allowed_direct_url_schemes= + + +# +# Options defined in cinder.image.image_utils +# + +# Directory used for temporary storage during image conversion +# (string value) +#image_conversion_dir=$state_path/conversion + + +# +# Options defined in cinder.openstack.common.eventlet_backdoor +# + +# Enable eventlet backdoor. Acceptable values are 0, , +# and :, where 0 results in listening on a random +# tcp port number; results in listening on the +# specified port number (and not enabling backdoor if that +# port is in use); and : results in listening on +# the smallest unused port number within the specified range +# of port numbers. The chosen port is displayed in the +# service's log file. (string value) +#backdoor_port= + + +# +# Options defined in cinder.openstack.common.lockutils +# + +# Whether to disable inter-process locks (boolean value) +#disable_process_locking=false + +# Directory to use for lock files. Default to a temp directory +# (string value) +lock_path=/var/lock/cinder + + +# +# Options defined in cinder.openstack.common.log +# + +# Print debugging output (set logging level to DEBUG instead +# of default WARNING level). (boolean value) +#debug=false + +# Print more verbose output (set logging level to INFO instead +# of default WARNING level). (boolean value) +verbose=True + +# Log output to standard error. (boolean value) +#use_stderr=true + +# Format string to use for log messages with context. (string +# value) +#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s + +# Format string to use for log messages without context. +# (string value) +#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s + +# Data to append to log format when level is DEBUG. (string +# value) +#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d + +# Prefix each line of exception output with this format. +# (string value) +#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s + +# List of logger=LEVEL pairs. (list value) +#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN,urllib3.connectionpool=WARN,websocket=WARN,keystonemiddleware=WARN,routes.middleware=WARN,stevedore=WARN + +# Enables or disables publication of error events. (boolean +# value) +#publish_errors=false + +# Enables or disables fatal status of deprecations. (boolean +# value) +#fatal_deprecations=false + +# The format for an instance that is passed with the log +# message. (string value) +#instance_format="[instance: %(uuid)s] " + +# The format for an instance UUID that is passed with the log +# message. (string value) +#instance_uuid_format="[instance: %(uuid)s] " + +# The name of a logging configuration file. This file is +# appended to any existing logging configuration files. For +# details about logging configuration files, see the Python +# logging module documentation. (string value) +# Deprecated group/name - [DEFAULT]/log_config +#log_config_append= + +# DEPRECATED. A logging.Formatter log message format string +# which may use any of the available logging.LogRecord +# attributes. This option is deprecated. Please use +# logging_context_format_string and +# logging_default_format_string instead. (string value) +#log_format= + +# Format string for %%(asctime)s in log records. Default: +# %(default)s . (string value) +#log_date_format=%Y-%m-%d %H:%M:%S + +# (Optional) Name of log file to output to. If no default is +# set, logging will go to stdout. (string value) +# Deprecated group/name - [DEFAULT]/logfile +#log_file= + +# (Optional) The base directory used for relative --log-file +# paths. (string value) +# Deprecated group/name - [DEFAULT]/logdir +#log_dir= + +# Use syslog for logging. Existing syslog format is DEPRECATED +# during I, and will change in J to honor RFC5424. (boolean +# value) +#use_syslog=false + +# (Optional) Enables or disables syslog rfc5424 format for +# logging. If enabled, prefixes the MSG part of the syslog +# message with APP-NAME (RFC5424). The format without the APP- +# NAME is deprecated in I, and will be removed in J. (boolean +# value) +#use_syslog_rfc_format=false + +# Syslog facility to receive log lines. (string value) +#syslog_log_facility=LOG_USER + + +# +# Options defined in cinder.openstack.common.periodic_task +# + +# Some periodic tasks can be run in a separate process. Should +# we run them here? (boolean value) +#run_external_periodic_tasks=true + + +# +# Options defined in cinder.openstack.common.policy +# + +# The JSON file that defines policies. (string value) +#policy_file=policy.json + +# Default rule. Enforced when a requested rule is not found. +# (string value) +#policy_default_rule=default + + +# +# Options defined in cinder.scheduler.driver +# + +# The scheduler host manager class to use (string value) +#scheduler_host_manager=cinder.scheduler.host_manager.HostManager + +# Maximum number of attempts to schedule an volume (integer +# value) +#scheduler_max_attempts=3 + + +# +# Options defined in cinder.scheduler.host_manager +# + +# Which filter class names to use for filtering hosts when not +# specified in the request. (list value) +#scheduler_default_filters=AvailabilityZoneFilter,CapacityFilter,CapabilitiesFilter + +# Which weigher class names to use for weighing hosts. (list +# value) +#scheduler_default_weighers=CapacityWeigher + + +# +# Options defined in cinder.scheduler.manager +# + +# Default scheduler driver to use (string value) +#scheduler_driver=cinder.scheduler.filter_scheduler.FilterScheduler + + +# +# Options defined in cinder.scheduler.scheduler_options +# + +# Absolute path to scheduler configuration JSON file. (string +# value) +#scheduler_json_config_location= + + +# +# Options defined in cinder.scheduler.simple +# + +# This configure option has been deprecated along with the +# SimpleScheduler. New scheduler is able to gather capacity +# information for each host, thus setting the maximum number +# of volume gigabytes for host is no longer needed. It's safe +# to remove this configure from cinder.conf. (integer value) +#max_gigabytes=10000 + + +# +# Options defined in cinder.scheduler.weights.capacity +# + +# Multiplier used for weighing volume capacity. Negative +# numbers mean to stack vs spread. (floating point value) +#capacity_weight_multiplier=1.0 + +# Multiplier used for weighing volume capacity. Negative +# numbers mean to stack vs spread. (floating point value) +#allocated_capacity_weight_multiplier=-1.0 + + +# +# Options defined in cinder.scheduler.weights.volume_number +# + +# Multiplier used for weighing volume number. Negative numbers +# mean to spread vs stack. (floating point value) +#volume_number_multiplier=-1.0 + + +# +# Options defined in cinder.transfer.api +# + +# The number of characters in the salt. (integer value) +#volume_transfer_salt_length=8 + +# The number of characters in the autogenerated auth key. +# (integer value) +#volume_transfer_key_length=16 + + +# +# Options defined in cinder.volume.api +# + +# Cache volume availability zones in memory for the provided +# duration in seconds (integer value) +#az_cache_duration=3600 + +# Create volume from snapshot at the host where snapshot +# resides (boolean value) +#snapshot_same_host=true + +# Ensure that the new volumes are the same AZ as snapshot or +# source volume (boolean value) +#cloned_volume_same_az=true + + +# +# Options defined in cinder.volume.driver +# + +# The maximum number of times to rescan iSER targetto find +# volume (integer value) +#num_iser_scan_tries=3 + +# The maximum number of iSER target IDs per host (integer +# value) +#iser_num_targets=100 + +# Prefix for iSER volumes (string value) +#iser_target_prefix=iqn.2010-10.org.iser.openstack: + +# The IP address that the iSER daemon is listening on (string +# value) +#iser_ip_address=$my_ip + +# The port that the iSER daemon is listening on (integer +# value) +#iser_port=3260 + +# The name of the iSER target user-land tool to use (string +# value) +#iser_helper=tgtadm + +# Number of times to attempt to run flakey shell commands +# (integer value) +#num_shell_tries=3 + +# The percentage of backend capacity is reserved (integer +# value) +#reserved_percentage=0 + +# The maximum number of iSCSI target IDs per host (integer +# value) +#iscsi_num_targets=100 + +# Prefix for iSCSI volumes (string value) +#iscsi_target_prefix=iqn.2010-10.org.openstack: + +# The IP address that the iSCSI daemon is listening on (string +# value) +#iscsi_ip_address=$my_ip + +# The port that the iSCSI daemon is listening on (integer +# value) +#iscsi_port=3260 + +# The maximum number of times to rescan targets to find volume +# (integer value) +# Deprecated group/name - [DEFAULT]/num_iscsi_scan_tries +#num_volume_device_scan_tries=3 + +# The backend name for a given driver implementation (string +# value) +#volume_backend_name= + +# Do we attach/detach volumes in cinder using multipath for +# volume to image and image to volume transfers? (boolean +# value) +#use_multipath_for_image_xfer=false + +# Method used to wipe old volumes (valid options are: none, +# zero, shred) (string value) +#volume_clear=zero + +# Size in MiB to wipe at start of old volumes. 0 => all +# (integer value) +#volume_clear_size=0 + +# The flag to pass to ionice to alter the i/o priority of the +# process used to zero a volume after deletion, for example +# "-c3" for idle only priority. (string value) +#volume_clear_ionice= + +# iSCSI target user-land tool to use. tgtadm is default, use +# lioadm for LIO iSCSI support, iseradm for the ISER protocol, +# or fake for testing. (string value) +iscsi_helper=tgtadm + +# Volume configuration file storage directory (string value) +volumes_dir=$state_path/volumes + +# IET configuration file (string value) +#iet_conf=/etc/iet/ietd.conf + +# Comma-separated list of initiator IQNs allowed to connect to +# the iSCSI target. (From Nova compute nodes.) (string value) +#lio_initiator_iqns= + +# Sets the behavior of the iSCSI target to either perform +# blockio or fileio optionally, auto can be set and Cinder +# will autodetect type of backing device (string value) +#iscsi_iotype=fileio + +# The default block size used when copying/clearing volumes +# (string value) +#volume_dd_blocksize=1M + +# The blkio cgroup name to be used to limit bandwidth of +# volume copy (string value) +#volume_copy_blkio_cgroup_name=cinder-volume-copy + +# The upper limit of bandwidth of volume copy. 0 => unlimited +# (integer value) +#volume_copy_bps_limit=0 + +# Sets the behavior of the iSCSI target to either perform +# write-back(on) or write-through(off). This parameter is +# valid if iscsi_helper is set to tgtadm or iseradm. (string +# value) +#iscsi_write_cache=on + +# The path to the client certificate key for verification, if +# the driver supports it. (string value) +#driver_client_cert_key= + +# The path to the client certificate for verification, if the +# driver supports it. (string value) +#driver_client_cert= + + +# +# Options defined in cinder.volume.drivers.block_device +# + +# List of all available devices (list value) +#available_devices= + + +# +# Options defined in cinder.volume.drivers.coraid +# + +# IP address of Coraid ESM (string value) +#coraid_esm_address= + +# User name to connect to Coraid ESM (string value) +#coraid_user=admin + +# Name of group on Coraid ESM to which coraid_user belongs +# (must have admin privilege) (string value) +#coraid_group=admin + +# Password to connect to Coraid ESM (string value) +#coraid_password=password + +# Volume Type key name to store ESM Repository Name (string +# value) +#coraid_repository_key=coraid_repository + + +# +# Options defined in cinder.volume.drivers.datera +# + +# Datera API token. (string value) +#datera_api_token= + +# Datera API port. (string value) +#datera_api_port=7717 + +# Datera API version. (string value) +#datera_api_version=1 + +# Number of replicas to create of an inode. (string value) +#datera_num_replicas=3 + + +# +# Options defined in cinder.volume.drivers.emc.emc_vmax_common +# + +# use this file for cinder emc plugin config data (string +# value) +#cinder_emc_config_file=/etc/cinder/cinder_emc_config.xml + + +# +# Options defined in cinder.volume.drivers.emc.emc_vnx_cli +# + +# VNX authentication scope type. (string value) +#storage_vnx_authentication_type=global + +# Directory path that contains the VNX security file. Make +# sure the security file is generated first. (string value) +#storage_vnx_security_file_dir= + +# Naviseccli Path. (string value) +#naviseccli_path= + +# Storage pool name. (string value) +#storage_vnx_pool_name= + +# VNX secondary SP IP Address. (string value) +#san_secondary_ip= + +# Default timeout for CLI operations in minutes. For example, +# LUN migration is a typical long running operation, which +# depends on the LUN size and the load of the array. An upper +# bound in the specific deployment can be set to avoid +# unnecessary long wait. By default, it is 365 days long. +# (integer value) +#default_timeout=525600 + +# Default max number of LUNs in a storage group. By default, +# the value is 255. (integer value) +#max_luns_per_storage_group=255 + +# To destroy storage group when the last LUN is removed from +# it. By default, the value is False. (boolean value) +#destroy_empty_storage_group=false + +# Mapping between hostname and its iSCSI initiator IP +# addresses. (string value) +#iscsi_initiators= + +# Automatically register initiators. By default, the value is +# False. (boolean value) +#initiator_auto_registration=false + + +# +# Options defined in cinder.volume.drivers.eqlx +# + +# Group name to use for creating volumes (string value) +#eqlx_group_name=group-0 + +# Timeout for the Group Manager cli command execution (integer +# value) +#eqlx_cli_timeout=30 + +# Maximum retry count for reconnection (integer value) +#eqlx_cli_max_retries=5 + +# Use CHAP authentication for targets? (boolean value) +#eqlx_use_chap=false + +# Existing CHAP account name (string value) +#eqlx_chap_login=admin + +# Password for specified CHAP account name (string value) +#eqlx_chap_password=password + +# Pool in which volumes will be created (string value) +#eqlx_pool=default + + +# +# Options defined in cinder.volume.drivers.fujitsu_eternus_dx_common +# + +# The configuration file for the Cinder SMI-S driver (string +# value) +#cinder_smis_config_file=/etc/cinder/cinder_fujitsu_eternus_dx.xml + + +# +# Options defined in cinder.volume.drivers.fusionio.ioControl +# + +# amount of time wait for iSCSI target to come online (integer +# value) +#fusionio_iocontrol_targetdelay=5 + +# number of retries for GET operations (integer value) +#fusionio_iocontrol_retry=3 + +# verify the array certificate on each transaction (boolean +# value) +#fusionio_iocontrol_verify_cert=true + + +# +# Options defined in cinder.volume.drivers.glusterfs +# + +# File with the list of available gluster shares (string +# value) +#glusterfs_shares_config=/etc/cinder/glusterfs_shares + +# Create volumes as sparsed files which take no space.If set +# to False volume is created as regular file.In such case +# volume creation takes a lot of time. (boolean value) +#glusterfs_sparsed_volumes=true + +# Create volumes as QCOW2 files rather than raw files. +# (boolean value) +#glusterfs_qcow2_volumes=false + +# Base dir containing mount points for gluster shares. (string +# value) +#glusterfs_mount_point_base=$state_path/mnt + + +# +# Options defined in cinder.volume.drivers.hds.hds +# + +# The configuration file for the Cinder HDS driver for HUS +# (string value) +#hds_cinder_config_file=/opt/hds/hus/cinder_hus_conf.xml + + +# +# Options defined in cinder.volume.drivers.hds.iscsi +# + +# Configuration file for HDS iSCSI cinder plugin (string +# value) +#hds_hnas_iscsi_config_file=/opt/hds/hnas/cinder_iscsi_conf.xml + + +# +# Options defined in cinder.volume.drivers.hds.nfs +# + +# Configuration file for HDS NFS cinder plugin (string value) +#hds_hnas_nfs_config_file=/opt/hds/hnas/cinder_nfs_conf.xml + + +# +# Options defined in cinder.volume.drivers.hitachi.hbsd_common +# + +# Serial number of storage system (string value) +#hitachi_serial_number= + +# Name of an array unit (string value) +#hitachi_unit_name= + +# Pool ID of storage system (integer value) +#hitachi_pool_id= + +# Thin pool ID of storage system (integer value) +#hitachi_thin_pool_id= + +# Range of logical device of storage system (string value) +#hitachi_ldev_range= + +# Default copy method of storage system (string value) +#hitachi_default_copy_method=FULL + +# Copy speed of storage system (integer value) +#hitachi_copy_speed=3 + +# Interval to check copy (integer value) +#hitachi_copy_check_interval=3 + +# Interval to check copy asynchronously (integer value) +#hitachi_async_copy_check_interval=10 + +# Control port names for HostGroup or iSCSI Target (string +# value) +#hitachi_target_ports= + +# Range of group number (string value) +#hitachi_group_range= + +# Request for creating HostGroup or iSCSI Target (boolean +# value) +#hitachi_group_request=false + + +# +# Options defined in cinder.volume.drivers.hitachi.hbsd_fc +# + +# Request for FC Zone creating HostGroup (boolean value) +#hitachi_zoning_request=false + + +# +# Options defined in cinder.volume.drivers.hitachi.hbsd_horcm +# + +# Instance numbers for HORCM (string value) +#hitachi_horcm_numbers=200,201 + +# Username of storage system for HORCM (string value) +#hitachi_horcm_user= + +# Password of storage system for HORCM (string value) +#hitachi_horcm_password= + +# Add to HORCM configuration (boolean value) +#hitachi_horcm_add_conf=true + + +# +# Options defined in cinder.volume.drivers.hitachi.hbsd_iscsi +# + +# Add CHAP user (boolean value) +#hitachi_add_chap_user=false + +# iSCSI authentication method (string value) +#hitachi_auth_method= + +# iSCSI authentication username (string value) +#hitachi_auth_user=HBSD-CHAP-user + +# iSCSI authentication password (string value) +#hitachi_auth_password=HBSD-CHAP-password + + +# +# Options defined in cinder.volume.drivers.huawei +# + +# The configuration file for the Cinder Huawei driver (string +# value) +#cinder_huawei_conf_file=/etc/cinder/cinder_huawei_conf.xml + + +# +# Options defined in cinder.volume.drivers.ibm.gpfs +# + +# Specifies the path of the GPFS directory where Block Storage +# volume and snapshot files are stored. (string value) +#gpfs_mount_point_base= + +# Specifies the path of the Image service repository in GPFS. +# Leave undefined if not storing images in GPFS. (string +# value) +#gpfs_images_dir= + +# Specifies the type of image copy to be used. Set this when +# the Image service repository also uses GPFS so that image +# files can be transferred efficiently from the Image service +# to the Block Storage service. There are two valid values: +# "copy" specifies that a full copy of the image is made; +# "copy_on_write" specifies that copy-on-write optimization +# strategy is used and unmodified blocks of the image file are +# shared efficiently. (string value) +#gpfs_images_share_mode= + +# Specifies an upper limit on the number of indirections +# required to reach a specific block due to snapshots or +# clones. A lengthy chain of copy-on-write snapshots or +# clones can have a negative impact on performance, but +# improves space utilization. 0 indicates unlimited clone +# depth. (integer value) +#gpfs_max_clone_depth=0 + +# Specifies that volumes are created as sparse files which +# initially consume no space. If set to False, the volume is +# created as a fully allocated file, in which case, creation +# may take a significantly longer time. (boolean value) +#gpfs_sparse_volumes=true + +# Specifies the storage pool that volumes are assigned to. By +# default, the system storage pool is used. (string value) +#gpfs_storage_pool=system + + +# +# Options defined in cinder.volume.drivers.ibm.ibmnas +# + +# IP address or Hostname of NAS system. (string value) +#nas_ip= + +# User name to connect to NAS system. (string value) +#nas_login=admin + +# Password to connect to NAS system. (string value) +#nas_password= + +# SSH port to use to connect to NAS system. (integer value) +#nas_ssh_port=22 + +# Filename of private key to use for SSH authentication. +# (string value) +#nas_private_key= + +# IBMNAS platform type to be used as backend storage; valid +# values are - v7ku : for using IBM Storwize V7000 Unified, +# sonas : for using IBM Scale Out NAS, gpfs-nas : for using +# NFS based IBM GPFS deployments. (string value) +#ibmnas_platform_type=v7ku + + +# +# Options defined in cinder.volume.drivers.ibm.storwize_svc +# + +# Storage system storage pool for volumes (string value) +#storwize_svc_volpool_name=volpool + +# Storage system space-efficiency parameter for volumes +# (percentage) (integer value) +#storwize_svc_vol_rsize=2 + +# Storage system threshold for volume capacity warnings +# (percentage) (integer value) +#storwize_svc_vol_warning=0 + +# Storage system autoexpand parameter for volumes (True/False) +# (boolean value) +#storwize_svc_vol_autoexpand=true + +# Storage system grain size parameter for volumes +# (32/64/128/256) (integer value) +#storwize_svc_vol_grainsize=256 + +# Storage system compression option for volumes (boolean +# value) +#storwize_svc_vol_compression=false + +# Enable Easy Tier for volumes (boolean value) +#storwize_svc_vol_easytier=true + +# The I/O group in which to allocate volumes (integer value) +#storwize_svc_vol_iogrp=0 + +# Maximum number of seconds to wait for FlashCopy to be +# prepared. Maximum value is 600 seconds (10 minutes) (integer +# value) +#storwize_svc_flashcopy_timeout=120 + +# Connection protocol (iSCSI/FC) (string value) +#storwize_svc_connection_protocol=iSCSI + +# Configure CHAP authentication for iSCSI connections +# (Default: Enabled) (boolean value) +#storwize_svc_iscsi_chap_enabled=true + +# Connect with multipath (FC only; iSCSI multipath is +# controlled by Nova) (boolean value) +#storwize_svc_multipath_enabled=false + +# Allows vdisk to multi host mapping (boolean value) +#storwize_svc_multihostmap_enabled=true + +# Indicate whether svc driver is compatible for NPIV setup. If +# it is compatible, it will allow no wwpns being returned on +# get_conn_fc_wwpns during initialize_connection (boolean +# value) +#storwize_svc_npiv_compatibility_mode=false + +# Allow tenants to specify QOS on create (boolean value) +#storwize_svc_allow_tenant_qos=false + +# If operating in stretched cluster mode, specify the name of +# the pool in which mirrored copies are stored.Example: +# "pool2" (string value) +#storwize_svc_stretched_cluster_partner= + + +# +# Options defined in cinder.volume.drivers.ibm.xiv_ds8k +# + +# Proxy driver that connects to the IBM Storage Array (string +# value) +#xiv_ds8k_proxy=xiv_ds8k_openstack.nova_proxy.XIVDS8KNovaProxy + +# Connection type to the IBM Storage Array +# (fibre_channel|iscsi) (string value) +#xiv_ds8k_connection_type=iscsi + +# CHAP authentication mode, effective only for iscsi +# (disabled|enabled) (string value) +#xiv_chap=disabled + + +# +# Options defined in cinder.volume.drivers.lvm +# + +# Name for the VG that will contain exported volumes (string +# value) +volume_group=cinder-volumes + +# If >0, create LVs with multiple mirrors. Note that this +# requires lvm_mirrors + 2 PVs with available space (integer +# value) +#lvm_mirrors=0 + +# Type of LVM volumes to deploy; (default or thin) (string +# value) +#lvm_type=default + + +# +# Options defined in cinder.volume.drivers.netapp.options +# + +# The vFiler unit on which provisioning of block storage +# volumes will be done. This option is only used by the driver +# when connecting to an instance with a storage family of Data +# ONTAP operating in 7-Mode and the storage protocol selected +# is iSCSI. Only use this option when utilizing the MultiStore +# feature on the NetApp storage system. (string value) +#netapp_vfiler= + +# Administrative user account name used to access the storage +# system or proxy server. (string value) +#netapp_login= + +# Password for the administrative user account specified in +# the netapp_login option. (string value) +#netapp_password= + +# This option specifies the virtual storage server (Vserver) +# name on the storage cluster on which provisioning of block +# storage volumes should occur. If using the NFS storage +# protocol, this parameter is mandatory for storage service +# catalog support (utilized by Cinder volume type extra_specs +# support). If this option is specified, the exports belonging +# to the Vserver will only be used for provisioning in the +# future. Block storage volumes on exports not belonging to +# the Vserver specified by this option will continue to +# function normally. (string value) +#netapp_vserver= + +# The hostname (or IP address) for the storage system or proxy +# server. (string value) +#netapp_server_hostname= + +# The TCP port to use for communication with the storage +# system or proxy server. Traditionally, port 80 is used for +# HTTP and port 443 is used for HTTPS; however, this value +# should be changed if an alternate port has been configured +# on the storage system or proxy server. (integer value) +#netapp_server_port=80 + +# This option is used to specify the path to the E-Series +# proxy application on a proxy server. The value is combined +# with the value of the netapp_transport_type, +# netapp_server_hostname, and netapp_server_port options to +# create the URL used by the driver to connect to the proxy +# application. (string value) +#netapp_webservice_path=/devmgr/v2 + +# This option is only utilized when the storage family is +# configured to eseries. This option is used to restrict +# provisioning to the specified controllers. Specify the value +# of this option to be a comma separated list of controller +# hostnames or IP addresses to be used for provisioning. +# (string value) +#netapp_controller_ips= + +# Password for the NetApp E-Series storage array. (string +# value) +#netapp_sa_password= + +# This option is used to restrict provisioning to the +# specified storage pools. Only dynamic disk pools are +# currently supported. Specify the value of this option to be +# a comma separated list of disk pool names to be used for +# provisioning. (string value) +#netapp_storage_pools= + +# This option is used to define how the controllers in the +# E-Series storage array will work with the particular +# operating system on the hosts that are connected to it. +# (string value) +#netapp_eseries_host_type=linux_dm_mp + +# If the percentage of available space for an NFS share has +# dropped below the value specified by this option, the NFS +# image cache will be cleaned. (integer value) +#thres_avl_size_perc_start=20 + +# When the percentage of available space on an NFS share has +# reached the percentage specified by this option, the driver +# will stop clearing files from the NFS image cache that have +# not been accessed in the last M minutes, where M is the +# value of the expiry_thres_minutes configuration option. +# (integer value) +#thres_avl_size_perc_stop=60 + +# This option specifies the threshold for last access time for +# images in the NFS image cache. When a cache cleaning cycle +# begins, images in the cache that have not been accessed in +# the last M minutes, where M is the value of this parameter, +# will be deleted from the cache to create free space on the +# NFS share. (integer value) +#expiry_thres_minutes=720 + +# This option specifies the path of the NetApp copy offload +# tool binary. Ensure that the binary has execute permissions +# set which allow the effective user of the cinder-volume +# process to execute the file. (string value) +#netapp_copyoffload_tool_path= + +# The quantity to be multiplied by the requested volume size +# to ensure enough space is available on the virtual storage +# server (Vserver) to fulfill the volume creation request. +# (floating point value) +#netapp_size_multiplier=1.2 + +# This option is only utilized when the storage protocol is +# configured to use iSCSI. This option is used to restrict +# provisioning to the specified controller volumes. Specify +# the value of this option to be a comma separated list of +# NetApp controller volume names to be used for provisioning. +# (string value) +#netapp_volume_list= + +# The storage family type used on the storage system; valid +# values are ontap_7mode for using Data ONTAP operating in +# 7-Mode, ontap_cluster for using clustered Data ONTAP, or +# eseries for using E-Series. (string value) +#netapp_storage_family=ontap_cluster + +# The storage protocol to be used on the data path with the +# storage system; valid values are iscsi or nfs. (string +# value) +#netapp_storage_protocol= + +# The transport protocol used when communicating with the +# storage system or proxy server. Valid values are http or +# https. (string value) +#netapp_transport_type=http + + +# +# Options defined in cinder.volume.drivers.nexenta.options +# + +# IP address of Nexenta SA (string value) +#nexenta_host= + +# HTTP port to connect to Nexenta REST API server (integer +# value) +#nexenta_rest_port=2000 + +# Use http or https for REST connection (default auto) (string +# value) +#nexenta_rest_protocol=auto + +# User name to connect to Nexenta SA (string value) +#nexenta_user=admin + +# Password to connect to Nexenta SA (string value) +#nexenta_password=nexenta + +# Nexenta target portal port (integer value) +#nexenta_iscsi_target_portal_port=3260 + +# SA Pool that holds all volumes (string value) +#nexenta_volume=cinder + +# IQN prefix for iSCSI targets (string value) +#nexenta_target_prefix=iqn.1986-03.com.sun:02:cinder- + +# Prefix for iSCSI target groups on SA (string value) +#nexenta_target_group_prefix=cinder/ + +# File with the list of available nfs shares (string value) +#nexenta_shares_config=/etc/cinder/nfs_shares + +# Base directory that contains NFS share mount points (string +# value) +#nexenta_mount_point_base=$state_path/mnt + +# Enables or disables the creation of volumes as sparsed files +# that take no space. If disabled (False), volume is created +# as a regular file, which takes a long time. (boolean value) +#nexenta_sparsed_volumes=true + +# Default compression value for new ZFS folders. (string +# value) +#nexenta_volume_compression=on + +# If set True cache NexentaStor appliance volroot option +# value. (boolean value) +#nexenta_nms_cache_volroot=true + +# Enable stream compression, level 1..9. 1 - gives best speed; +# 9 - gives best compression. (integer value) +#nexenta_rrmgr_compression=0 + +# TCP Buffer size in KiloBytes. (integer value) +#nexenta_rrmgr_tcp_buf_size=4096 + +# Number of TCP connections. (integer value) +#nexenta_rrmgr_connections=2 + +# Block size for volumes (default=blank means 8KB) (string +# value) +#nexenta_blocksize= + +# Enables or disables the creation of sparse volumes (boolean +# value) +#nexenta_sparse=false + + +# +# Options defined in cinder.volume.drivers.nfs +# + +# File with the list of available nfs shares (string value) +#nfs_shares_config=/etc/cinder/nfs_shares + +# Create volumes as sparsed files which take no space.If set +# to False volume is created as regular file.In such case +# volume creation takes a lot of time. (boolean value) +#nfs_sparsed_volumes=true + +# Percent of ACTUAL usage of the underlying volume before no +# new volumes can be allocated to the volume destination. +# (floating point value) +#nfs_used_ratio=0.95 + +# This will compare the allocated to available space on the +# volume destination. If the ratio exceeds this number, the +# destination will no longer be valid. (floating point value) +#nfs_oversub_ratio=1.0 + +# Base dir containing mount points for nfs shares. (string +# value) +#nfs_mount_point_base=$state_path/mnt + +# Mount options passed to the nfs client. See section of the +# nfs man page for details. (string value) +#nfs_mount_options= + + +# +# Options defined in cinder.volume.drivers.nimble +# + +# Nimble Controller pool name (string value) +#nimble_pool_name=default + +# Nimble Subnet Label (string value) +#nimble_subnet_label=* + + +# +# Options defined in cinder.volume.drivers.prophetstor.options +# + +# DPL pool uuid in which DPL volumes are stored. (string +# value) +#dpl_pool= + +# DPL port number. (integer value) +#dpl_port=8357 + + +# +# Options defined in cinder.volume.drivers.pure +# + +# REST API authorization token. (string value) +#pure_api_token= + + +# +# Options defined in cinder.volume.drivers.rbd +# + +# The RADOS pool where rbd volumes are stored (string value) +#rbd_pool=rbd + +# The RADOS client name for accessing rbd volumes - only set +# when using cephx authentication (string value) +#rbd_user= + +# Path to the ceph configuration file (string value) +#rbd_ceph_conf= + +# Flatten volumes created from snapshots to remove dependency +# from volume to snapshot (boolean value) +#rbd_flatten_volume_from_snapshot=false + +# The libvirt uuid of the secret for the rbd_user volumes +# (string value) +#rbd_secret_uuid= + +# Directory where temporary image files are stored when the +# volume driver does not write them directly to the volume. +# (string value) +#volume_tmp_dir= + +# Maximum number of nested volume clones that are taken before +# a flatten occurs. Set to 0 to disable cloning. (integer +# value) +#rbd_max_clone_depth=5 + +# Volumes will be chunked into objects of this size (in +# megabytes). (integer value) +#rbd_store_chunk_size=4 + +# Timeout value (in seconds) used when connecting to ceph +# cluster. If value < 0, no timeout is set and default +# librados value is used. (integer value) +#rados_connect_timeout=-1 + + +# +# Options defined in cinder.volume.drivers.remotefs +# + +# IP address or Hostname of NAS system. (string value) +#nas_ip= + +# User name to connect to NAS system. (string value) +#nas_login=admin + +# Password to connect to NAS system. (string value) +#nas_password= + +# SSH port to use to connect to NAS system. (integer value) +#nas_ssh_port=22 + +# Filename of private key to use for SSH authentication. +# (string value) +#nas_private_key= + + +# +# Options defined in cinder.volume.drivers.san.hp.hp_3par_common +# + +# 3PAR WSAPI Server Url like https://<3par ip>:8080/api/v1 +# (string value) +#hp3par_api_url= + +# 3PAR Super user username (string value) +#hp3par_username= + +# 3PAR Super user password (string value) +#hp3par_password= + +# The CPG to use for volume creation (string value) +#hp3par_cpg=OpenStack + +# The CPG to use for Snapshots for volumes. If empty +# hp3par_cpg will be used (string value) +#hp3par_cpg_snap= + +# The time in hours to retain a snapshot. You can't delete it +# before this expires. (string value) +#hp3par_snapshot_retention= + +# The time in hours when a snapshot expires and is deleted. +# This must be larger than expiration (string value) +#hp3par_snapshot_expiration= + +# Enable HTTP debugging to 3PAR (boolean value) +#hp3par_debug=false + +# List of target iSCSI addresses to use. (list value) +#hp3par_iscsi_ips= + +# Enable CHAP authentication for iSCSI connections. (boolean +# value) +#hp3par_iscsi_chap_enabled=false + + +# +# Options defined in cinder.volume.drivers.san.hp.hp_lefthand_rest_proxy +# + +# HP LeftHand WSAPI Server Url like https://:8081/lhos (string value) +#hplefthand_api_url= + +# HP LeftHand Super user username (string value) +#hplefthand_username= + +# HP LeftHand Super user password (string value) +#hplefthand_password= + +# HP LeftHand cluster name (string value) +#hplefthand_clustername= + +# Configure CHAP authentication for iSCSI connections +# (Default: Disabled) (boolean value) +#hplefthand_iscsi_chap_enabled=false + +# Enable HTTP debugging to LeftHand (boolean value) +#hplefthand_debug=false + + +# +# Options defined in cinder.volume.drivers.san.hp.hp_msa_common +# + +# The VDisk to use for volume creation. (string value) +#msa_vdisk=OpenStack + + +# +# Options defined in cinder.volume.drivers.san.san +# + +# Use thin provisioning for SAN volumes? (boolean value) +#san_thin_provision=true + +# IP address of SAN controller (string value) +#san_ip= + +# Username for SAN controller (string value) +#san_login=admin + +# Password for SAN controller (string value) +#san_password= + +# Filename of private key to use for SSH authentication +# (string value) +#san_private_key= + +# Cluster name to use for creating volumes (string value) +#san_clustername= + +# SSH port to use with SAN (integer value) +#san_ssh_port=22 + +# Execute commands locally instead of over SSH; use if the +# volume service is running on the SAN device (boolean value) +#san_is_local=false + +# SSH connection timeout in seconds (integer value) +#ssh_conn_timeout=30 + +# Minimum ssh connections in the pool (integer value) +#ssh_min_pool_conn=1 + +# Maximum ssh connections in the pool (integer value) +#ssh_max_pool_conn=5 + + +# +# Options defined in cinder.volume.drivers.san.solaris +# + +# The ZFS path under which to create zvols for volumes. +# (string value) +#san_zfs_volume_base=rpool/ + + +# +# Options defined in cinder.volume.drivers.scality +# + +# Path or URL to Scality SOFS configuration file (string +# value) +#scality_sofs_config= + +# Base dir where Scality SOFS shall be mounted (string value) +#scality_sofs_mount_point=$state_path/scality + +# Path from Scality SOFS root to volume dir (string value) +#scality_sofs_volume_dir=cinder/volumes + + +# +# Options defined in cinder.volume.drivers.smbfs +# + +# File with the list of available smbfs shares. (string value) +#smbfs_shares_config=/etc/cinder/smbfs_shares + +# Default format that will be used when creating volumes if no +# volume format is specified. Can be set to: raw, qcow2, vhd +# or vhdx. (string value) +#smbfs_default_volume_format=qcow2 + +# Create volumes as sparsed files which take no space rather +# than regular files when using raw format, in which case +# volume creation takes lot of time. (boolean value) +#smbfs_sparsed_volumes=true + +# Percent of ACTUAL usage of the underlying volume before no +# new volumes can be allocated to the volume destination. +# (floating point value) +#smbfs_used_ratio=0.95 + +# This will compare the allocated to available space on the +# volume destination. If the ratio exceeds this number, the +# destination will no longer be valid. (floating point value) +#smbfs_oversub_ratio=1.0 + +# Base dir containing mount points for smbfs shares. (string +# value) +#smbfs_mount_point_base=$state_path/mnt + +# Mount options passed to the smbfs client. See mount.cifs man +# page for details. (string value) +#smbfs_mount_options=noperm,file_mode=0775,dir_mode=0775 + + +# +# Options defined in cinder.volume.drivers.solidfire +# + +# Set 512 byte emulation on volume creation; (boolean value) +#sf_emulate_512=true + +# Allow tenants to specify QOS on create (boolean value) +#sf_allow_tenant_qos=false + +# Create SolidFire accounts with this prefix. Any string can +# be used here, but the string "hostname" is special and will +# create a prefix using the cinder node hostsname (previous +# default behavior). The default is NO prefix. (string value) +#sf_account_prefix= + +# SolidFire API port. Useful if the device api is behind a +# proxy on a different port. (integer value) +#sf_api_port=443 + + +# +# Options defined in cinder.volume.drivers.vmware.vmdk +# + +# IP address for connecting to VMware ESX/VC server. (string +# value) +#vmware_host_ip= + +# Username for authenticating with VMware ESX/VC server. +# (string value) +#vmware_host_username= + +# Password for authenticating with VMware ESX/VC server. +# (string value) +#vmware_host_password= + +# Optional VIM service WSDL Location e.g +# http:///vimService.wsdl. Optional over-ride to +# default location for bug work-arounds. (string value) +#vmware_wsdl_location= + +# Number of times VMware ESX/VC server API must be retried +# upon connection related issues. (integer value) +#vmware_api_retry_count=10 + +# The interval (in seconds) for polling remote tasks invoked +# on VMware ESX/VC server. (floating point value) +#vmware_task_poll_interval=0.5 + +# Name for the folder in the VC datacenter that will contain +# cinder volumes. (string value) +#vmware_volume_folder=cinder-volumes + +# Timeout in seconds for VMDK volume transfer between Cinder +# and Glance. (integer value) +#vmware_image_transfer_timeout_secs=7200 + +# Max number of objects to be retrieved per batch. Query +# results will be obtained in batches from the server and not +# in one shot. Server may still limit the count to something +# less than the configured value. (integer value) +#vmware_max_objects_retrieval=100 + +# Optional string specifying the VMware VC server version. The +# driver attempts to retrieve the version from VMware VC +# server. Set this configuration only if you want to override +# the VC server version. (string value) +#vmware_host_version= + +# Directory where virtual disks are stored during volume +# backup and restore. (string value) +#vmware_tmp_dir=/tmp + + +# +# Options defined in cinder.volume.drivers.windows.windows +# + +# Path to store VHD backed volumes (string value) +#windows_iscsi_lun_path=C:\iSCSIVirtualDisks + + +# +# Options defined in cinder.volume.drivers.zadara +# + +# Management IP of Zadara VPSA (string value) +#zadara_vpsa_ip= + +# Zadara VPSA port number (string value) +#zadara_vpsa_port= + +# Use SSL connection (boolean value) +#zadara_vpsa_use_ssl=false + +# User name for the VPSA (string value) +#zadara_user= + +# Password for the VPSA (string value) +#zadara_password= + +# Name of VPSA storage pool for volumes (string value) +#zadara_vpsa_poolname= + +# Default thin provisioning policy for volumes (boolean value) +#zadara_vol_thin=true + +# Default encryption policy for volumes (boolean value) +#zadara_vol_encrypt=false + +# Default template for VPSA volume names (string value) +#zadara_vol_name_template=OS_%s + +# Automatically detach from servers on volume delete (boolean +# value) +#zadara_vpsa_auto_detach_on_delete=true + +# Don't halt on deletion of non-existing volumes (boolean +# value) +#zadara_vpsa_allow_nonexistent_delete=true + + +# +# Options defined in cinder.volume.drivers.zfssa.zfssaiscsi +# + +# Storage pool name. (string value) +#zfssa_pool= + +# Project name. (string value) +#zfssa_project= + +# Block size: 512, 1k, 2k, 4k, 8k, 16k, 32k, 64k, 128k. +# (string value) +#zfssa_lun_volblocksize=8k + +# Flag to enable sparse (thin-provisioned): True, False. +# (boolean value) +#zfssa_lun_sparse=false + +# Data compression-off, lzjb, gzip-2, gzip, gzip-9. (string +# value) +#zfssa_lun_compression= + +# Synchronous write bias-latency, throughput. (string value) +#zfssa_lun_logbias= + +# iSCSI initiator group. (string value) +#zfssa_initiator_group= + +# iSCSI initiator IQNs. (comma separated) (string value) +#zfssa_initiator= + +# iSCSI initiator CHAP user. (string value) +#zfssa_initiator_user= + +# iSCSI initiator CHAP password. (string value) +#zfssa_initiator_password= + +# iSCSI target group name. (string value) +#zfssa_target_group=tgt-grp + +# iSCSI target CHAP user. (string value) +#zfssa_target_user= + +# iSCSI target CHAP password. (string value) +#zfssa_target_password= + +# iSCSI target portal (Data-IP:Port, w.x.y.z:3260). (string +# value) +#zfssa_target_portal= + +# Network interfaces of iSCSI targets. (comma separated) +# (string value) +#zfssa_target_interfaces= + +# REST connection timeout. (seconds) (integer value) +#zfssa_rest_timeout= + + +# +# Options defined in cinder.volume.manager +# + +# Driver to use for volume creation (string value) +#volume_driver=cinder.volume.drivers.lvm.LVMISCSIDriver + +# Timeout for creating the volume to migrate to when +# performing volume migration (seconds) (integer value) +#migration_create_volume_timeout_secs=300 + +# Offload pending volume delete during volume service startup +# (boolean value) +#volume_service_inithost_offload=false + +# FC Zoning mode configured (string value) +#zoning_mode=none + +# User defined capabilities, a JSON formatted string +# specifying key/value pairs. (string value) +#extra_capabilities={} + + +[BRCD_FABRIC_EXAMPLE] + +# +# Options defined in cinder.zonemanager.drivers.brocade.brcd_fabric_opts +# + +# Management IP of fabric (string value) +#fc_fabric_address= + +# Fabric user ID (string value) +#fc_fabric_user= + +# Password for user (string value) +#fc_fabric_password= + +# Connecting port (integer value) +#fc_fabric_port=22 + +# overridden zoning policy (string value) +#zoning_policy=initiator-target + +# overridden zoning activation state (boolean value) +#zone_activate=true + +# overridden zone name prefix (string value) +#zone_name_prefix= + +# Principal switch WWN of the fabric (string value) +#principal_switch_wwn= + + +[CISCO_FABRIC_EXAMPLE] + +# +# Options defined in cinder.zonemanager.drivers.cisco.cisco_fabric_opts +# + +# Management IP of fabric (string value) +#cisco_fc_fabric_address= + +# Fabric user ID (string value) +#cisco_fc_fabric_user= + +# Password for user (string value) +#cisco_fc_fabric_password= + +# Connecting port (integer value) +#cisco_fc_fabric_port=22 + +# overridden zoning policy (string value) +#cisco_zoning_policy=initiator-target + +# overridden zoning activation state (boolean value) +#cisco_zone_activate=true + +# overridden zone name prefix (string value) +#cisco_zone_name_prefix= + +# VSAN of the Fabric (string value) +#cisco_zoning_vsan= + + +[database] + +# +# Options defined in oslo.db +# + +# The file name to use with SQLite. (string value) +#sqlite_db=oslo.sqlite + +# If True, SQLite uses synchronous mode. (boolean value) +#sqlite_synchronous=true + +# The back end to use for the database. (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend=sqlalchemy + +# The SQLAlchemy connection string to use to connect to the +# database. (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +# Deprecated group/name - [sql]/connection +connection=postgresql://##CINDER_DB_USER##:##CINDER_DB_PASSWORD##@onenode/cinder + +# The SQLAlchemy connection string to use to connect to the +# slave database. (string value) +#slave_connection= + +# The SQL mode to be used for MySQL sessions. This option, +# including the default, overrides any server-set SQL mode. To +# use whatever SQL mode is set by the server configuration, +# set this to no value. Example: mysql_sql_mode= (string +# value) +#mysql_sql_mode=TRADITIONAL + +# Timeout before idle SQL connections are reaped. (integer +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/sql_idle_timeout +# Deprecated group/name - [sql]/idle_timeout +#idle_timeout=3600 + +# Minimum number of SQL connections to keep open in a pool. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_min_pool_size +# Deprecated group/name - [DATABASE]/sql_min_pool_size +#min_pool_size=1 + +# Maximum number of SQL connections to keep open in a pool. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_pool_size +# Deprecated group/name - [DATABASE]/sql_max_pool_size +#max_pool_size= + +# Maximum number of database connection retries during +# startup. Set to -1 to specify an infinite retry count. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_retries +# Deprecated group/name - [DATABASE]/sql_max_retries +#max_retries=10 + +# Interval between retries of opening a SQL connection. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_retry_interval +# Deprecated group/name - [DATABASE]/reconnect_interval +#retry_interval=10 + +# If set, use this value for max_overflow with SQLAlchemy. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_overflow +# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow +#max_overflow= + +# Verbosity of SQL debugging information: 0=None, +# 100=Everything. (integer value) +# Deprecated group/name - [DEFAULT]/sql_connection_debug +#connection_debug=0 + +# Add Python stack traces to SQL as comment strings. (boolean +# value) +# Deprecated group/name - [DEFAULT]/sql_connection_trace +#connection_trace=false + +# If set, use this value for pool_timeout with SQLAlchemy. +# (integer value) +# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout +#pool_timeout= + +# Enable the experimental use of database reconnect on +# connection lost. (boolean value) +#use_db_reconnect=false + +# Seconds between database connection retries. (integer value) +#db_retry_interval=1 + +# If True, increases the interval between database connection +# retries up to db_max_retry_interval. (boolean value) +#db_inc_retry_interval=true + +# If db_inc_retry_interval is set, the maximum seconds between +# database connection retries. (integer value) +#db_max_retry_interval=10 + +# Maximum database connection retries before error is raised. +# Set to -1 to specify an infinite retry count. (integer +# value) +#db_max_retries=20 + + +# +# Options defined in oslo.db.concurrency +# + +# Enable the experimental use of thread pooling for all DB API +# calls (boolean value) +# Deprecated group/name - [DEFAULT]/dbapi_use_tpool +#use_tpool=false + + +[fc-zone-manager] + +# +# Options defined in cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver +# + +# Southbound connector for zoning operation (string value) +#brcd_sb_connector=cinder.zonemanager.drivers.brocade.brcd_fc_zone_client_cli.BrcdFCZoneClientCLI + + +# +# Options defined in cinder.zonemanager.drivers.cisco.cisco_fc_zone_driver +# + +# Southbound connector for zoning operation (string value) +#cisco_sb_connector=cinder.zonemanager.drivers.cisco.cisco_fc_zone_client_cli.CiscoFCZoneClientCLI + + +# +# Options defined in cinder.zonemanager.fc_zone_manager +# + +# FC Zone Driver responsible for zone management (string +# value) +#zone_driver=cinder.zonemanager.drivers.brocade.brcd_fc_zone_driver.BrcdFCZoneDriver + +# Zoning policy configured by user (string value) +#zoning_policy=initiator-target + +# Comma separated list of fibre channel fabric names. This +# list of names is used to retrieve other SAN credentials for +# connecting to each SAN fabric (string value) +#fc_fabric_names= + +# FC San Lookup Service (string value) +#fc_san_lookup_service=cinder.zonemanager.drivers.brocade.brcd_fc_san_lookup_service.BrcdFCSanLookupService + + +[keymgr] + +# +# Options defined in cinder.keymgr +# + +# The full class name of the key manager API class (string +# value) +#api_class=cinder.keymgr.conf_key_mgr.ConfKeyManager + + +# +# Options defined in cinder.keymgr.conf_key_mgr +# + +# Fixed key returned by key manager, specified in hex (string +# value) +#fixed_key= + + +# +# Options defined in cinder.keymgr.key_mgr +# + +# Authentication url for encryption service. (string value) +#encryption_auth_url=http://localhost:5000/v2.0 + +# Url for encryption service. (string value) +#encryption_api_url=http://localhost:9311/v1 + + +[keystone_authtoken] + +# +# Options defined in keystonemiddleware.auth_token +# + +# Prefix to prepend at the beginning of the path. Deprecated, +# use identity_uri. (string value) +#auth_admin_prefix= + +# Host providing the admin Identity API endpoint. Deprecated, +# use identity_uri. (string value) +auth_host=##OPENSTACK_AUTH_HOST## + +# Port of the admin Identity API endpoint. Deprecated, use +# identity_uri. (integer value) +auth_port=##OPENSTACK_AUTH_PORT## + +# Protocol of the admin Identity API endpoint (http or https). +# Deprecated, use identity_uri. (string value) +auth_protocol=http + +# Complete public Identity API endpoint (string value) +auth_uri=$auth_protocol://$auth_host:$auth_port + +# Complete admin Identity API endpoint. This should specify +# the unversioned root endpoint e.g. https://localhost:35357/ +# (string value) +#identity_uri= + +# API version of the admin Identity API endpoint (string +# value) +auth_version=v2.0 + +# Do not handle authorization requests within the middleware, +# but delegate the authorization decision to downstream WSGI +# components (boolean value) +#delay_auth_decision=false + +# Request timeout value for communicating with Identity API +# server. (boolean value) +#http_connect_timeout= + +# How many times are we trying to reconnect when communicating +# with Identity API Server. (integer value) +#http_request_max_retries=3 + +# This option is deprecated and may be removed in a future +# release. Single shared secret with the Keystone +# configuration used for bootstrapping a Keystone +# installation, or otherwise bypassing the normal +# authentication process. This option should not be used, use +# `admin_user` and `admin_password` instead. (string value) +#admin_token= + +# Keystone account username (string value) +admin_user=##CINDER_USER## + +# Keystone account password (string value) +admin_password=##CINDER_PASSWORD## + +# Keystone service account tenant name to validate user tokens +# (string value) +admin_tenant_name=service + +# Env key for the swift cache (string value) +#cache= + +# Required if Keystone server requires client certificate +# (string value) +#certfile= + +# Required if Keystone server requires client certificate +# (string value) +#keyfile= + +# A PEM encoded Certificate Authority to use when verifying +# HTTPs connections. Defaults to system CAs. (string value) +#cafile= + +# Verify HTTPS connections. (boolean value) +#insecure=false + +# Directory used to cache files related to PKI tokens (string +# value) +#signing_dir= + +# Optionally specify a list of memcached server(s) to use for +# caching. If left undefined, tokens will instead be cached +# in-process. (list value) +# Deprecated group/name - [DEFAULT]/memcache_servers +#memcached_servers= + +# In order to prevent excessive effort spent validating +# tokens, the middleware caches previously-seen tokens for a +# configurable duration (in seconds). Set to -1 to disable +# caching completely. (integer value) +#token_cache_time=300 + +# Determines the frequency at which the list of revoked tokens +# is retrieved from the Identity service (in seconds). A high +# number of revocation events combined with a low cache +# duration may significantly reduce performance. (integer +# value) +#revocation_cache_time=10 + +# (optional) if defined, indicate whether token data should be +# authenticated or authenticated and encrypted. Acceptable +# values are MAC or ENCRYPT. If MAC, token data is +# authenticated (with HMAC) in the cache. If ENCRYPT, token +# data is encrypted and authenticated in the cache. If the +# value is not one of these options or empty, auth_token will +# raise an exception on initialization. (string value) +#memcache_security_strategy= + +# (optional, mandatory if memcache_security_strategy is +# defined) this string is used for key derivation. (string +# value) +#memcache_secret_key= + +# (optional) number of seconds memcached server is considered +# dead before it is tried again. (integer value) +#memcache_pool_dead_retry=300 + +# (optional) max total number of open connections to every +# memcached server. (integer value) +#memcache_pool_maxsize=10 + +# (optional) socket timeout in seconds for communicating with +# a memcache server. (integer value) +#memcache_pool_socket_timeout=3 + +# (optional) number of seconds a connection to memcached is +# held unused in the pool before it is closed. (integer value) +#memcache_pool_unused_timeout=60 + +# (optional) number of seconds that an operation will wait to +# get a memcache client connection from the pool. (integer +# value) +#memcache_pool_conn_get_timeout=10 + +# (optional) use the advanced (eventlet safe) memcache client +# pool. The advanced pool will only work under python 2.x. +# (boolean value) +#memcache_use_advanced_pool=false + +# (optional) indicate whether to set the X-Service-Catalog +# header. If False, middleware will not ask for service +# catalog on token validation and will not set the X-Service- +# Catalog header. (boolean value) +#include_service_catalog=true + +# Used to control the use and type of token binding. Can be +# set to: "disabled" to not check token binding. "permissive" +# (default) to validate binding information if the bind type +# is of a form known to the server and ignore it if not. +# "strict" like "permissive" but if the bind type is unknown +# the token will be rejected. "required" any form of token +# binding is needed to be allowed. Finally the name of a +# binding method that must be present in tokens. (string +# value) +#enforce_token_bind=permissive + +# If true, the revocation list will be checked for cached +# tokens. This requires that PKI tokens are configured on the +# Keystone server. (boolean value) +#check_revocations_for_cached=false + +# Hash algorithms to use for hashing PKI tokens. This may be a +# single algorithm or multiple. The algorithms are those +# supported by Python standard hashlib.new(). The hashes will +# be tried in the order given, so put the preferred one first +# for performance. The result of the first hash will be stored +# in the cache. This will typically be set to multiple values +# only while migrating from a less secure algorithm to a more +# secure one. Once all the old tokens are expired this option +# should be set to a single value for better performance. +# (list value) +#hash_algorithms=md5 + + +[matchmaker_redis] + +# +# Options defined in oslo.messaging +# + +# Host to locate redis. (string value) +#host=localhost + +# Use this port to connect to redis host. (integer value) +#port=6379 + +# Password for Redis server (optional). (string value) +#password= + + +[matchmaker_ring] + +# +# Options defined in oslo.messaging +# + +# Matchmaker ring file (JSON). (string value) +# Deprecated group/name - [DEFAULT]/matchmaker_ringfile +#ringfile=/etc/oslo/matchmaker_ring.json + + +[profiler] + +# +# Options defined in cinder.service +# + +# If False fully disable profiling feature. (boolean value) +#profiler_enabled=false + +# If False doesn't trace SQL requests. (boolean value) +#trace_sqlalchemy=false + + +[ssl] + +# +# Options defined in cinder.openstack.common.sslutils +# + +# CA certificate file to use to verify connecting clients +# (string value) +#ca_file= + +# Certificate file to use when starting the server securely +# (string value) +#cert_file= + +# Private key file to use when starting the server securely +# (string value) +#key_file= diff --git a/openstack/etc/cinder/policy.json b/openstack/etc/cinder/policy.json new file mode 100644 index 00000000..96f0a73b --- /dev/null +++ b/openstack/etc/cinder/policy.json @@ -0,0 +1,80 @@ +{ + "context_is_admin": "role:admin", + "admin_or_owner": "is_admin:True or project_id:%(project_id)s", + "default": "rule:admin_or_owner", + + "admin_api": "is_admin:True", + + "volume:create": "", + "volume:get_all": "", + "volume:get_volume_metadata": "", + "volume:get_volume_admin_metadata": "rule:admin_api", + "volume:delete_volume_admin_metadata": "rule:admin_api", + "volume:update_volume_admin_metadata": "rule:admin_api", + "volume:get_snapshot": "", + "volume:get_all_snapshots": "", + "volume:extend": "", + "volume:update_readonly_flag": "", + "volume:retype": "", + + "volume_extension:types_manage": "rule:admin_api", + "volume_extension:types_extra_specs": "rule:admin_api", + "volume_extension:volume_type_encryption": "rule:admin_api", + "volume_extension:volume_encryption_metadata": "rule:admin_or_owner", + "volume_extension:extended_snapshot_attributes": "", + "volume_extension:volume_image_metadata": "", + + "volume_extension:quotas:show": "", + "volume_extension:quotas:update": "rule:admin_api", + "volume_extension:quota_classes": "", + + "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", + "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", + "volume_extension:backup_admin_actions:reset_status": "rule:admin_api", + "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", + "volume_extension:volume_admin_actions:force_detach": "rule:admin_api", + "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api", + "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api", + "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api", + + "volume_extension:volume_host_attribute": "rule:admin_api", + "volume_extension:volume_tenant_attribute": "rule:admin_or_owner", + "volume_extension:volume_mig_status_attribute": "rule:admin_api", + "volume_extension:hosts": "rule:admin_api", + "volume_extension:services": "rule:admin_api", + + "volume_extension:volume_manage": "rule:admin_api", + "volume_extension:volume_unmanage": "rule:admin_api", + + "volume:services": "rule:admin_api", + + "volume:create_transfer": "", + "volume:accept_transfer": "", + "volume:delete_transfer": "", + "volume:get_all_transfers": "", + + "volume_extension:replication:promote": "rule:admin_api", + "volume_extension:replication:reenable": "rule:admin_api", + + "backup:create" : "", + "backup:delete": "", + "backup:get": "", + "backup:get_all": "", + "backup:restore": "", + "backup:backup-import": "rule:admin_api", + "backup:backup-export": "rule:admin_api", + + "snapshot_extension:snapshot_actions:update_snapshot_status": "", + + "consistencygroup:create" : "group:nobody", + "consistencygroup:delete": "group:nobody", + "consistencygroup:get": "group:nobody", + "consistencygroup:get_all": "group:nobody", + + "consistencygroup:create_cgsnapshot" : "", + "consistencygroup:delete_cgsnapshot": "", + "consistencygroup:get_cgsnapshot": "", + "consistencygroup:get_all_cgsnapshots": "", + + "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api" +} diff --git a/openstack/etc/cinder/rootwrap.conf b/openstack/etc/cinder/rootwrap.conf new file mode 100644 index 00000000..001b90af --- /dev/null +++ b/openstack/etc/cinder/rootwrap.conf @@ -0,0 +1,27 @@ +# Configuration for cinder-rootwrap +# This file should be owned by (and only-writeable by) the root user + +[DEFAULT] +# List of directories to load filter definitions from (separated by ','). +# These directories MUST all be only writeable by root ! +filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap + +# List of directories to search executables in, in case filters do not +# explicitely specify a full path (separated by ',') +# If not specified, defaults to system PATH environment variable. +# These directories MUST all be only writeable by root ! +exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin + +# Enable logging to syslog +# Default value is False +use_syslog=False + +# Which syslog facility to use. +# Valid values include auth, authpriv, syslog, local0, local1... +# Default value is 'syslog' +syslog_log_facility=syslog + +# Which messages to log. +# INFO means log all usage +# ERROR means only log unsuccessful attempts +syslog_log_level=ERROR diff --git a/openstack/etc/cinder/rootwrap.d/volume.filters b/openstack/etc/cinder/rootwrap.d/volume.filters new file mode 100644 index 00000000..2d23743f --- /dev/null +++ b/openstack/etc/cinder/rootwrap.d/volume.filters @@ -0,0 +1,157 @@ +# cinder-rootwrap command filters for volume nodes +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# cinder/volume/iscsi.py: iscsi_helper '--op' ... +ietadm: CommandFilter, ietadm, root +tgtadm: CommandFilter, tgtadm, root +tgt-admin: CommandFilter, tgt-admin, root +cinder-rtstool: CommandFilter, cinder-rtstool, root + +# LVM related show commands +pvs: EnvFilter, env, root, LC_ALL=C, pvs +vgs: EnvFilter, env, root, LC_ALL=C, vgs +lvs: EnvFilter, env, root, LC_ALL=C, lvs +lvdisplay: EnvFilter, env, root, LC_ALL=C, lvdisplay + +# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,.. +# cinder/volume/driver.py: 'lvcreate', '-L', ... +lvcreate: CommandFilter, lvcreate, root + +# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,... +dd: CommandFilter, dd, root + +# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ... +lvremove: CommandFilter, lvremove, root + +# cinder/volume/driver.py: 'lvrename', '%(vg)s', '%(orig)s' '(new)s'... +lvrename: CommandFilter, lvrename, root + +# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(lv_name)s' ... +lvextend: CommandFilter, lvextend, root + +# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K ' +lvchange: CommandFilter, lvchange, root + +# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',... +# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ... +iscsiadm: CommandFilter, iscsiadm, root + +# cinder/volume/drivers/lvm.py: 'shred', '-n3' +# cinder/volume/drivers/lvm.py: 'shred', '-n0', '-z', '-s%dMiB' +shred: CommandFilter, shred, root + +# cinder/volume/utils.py: utils.temporary_chown(path, 0) +chown: CommandFilter, chown, root + +# cinder/volume/utils.py: copy_volume(..., ionice='...') +ionice_1: ChainingRegExpFilter, ionice, root, ionice, -c[0-3], -n[0-7] +ionice_2: ChainingRegExpFilter, ionice, root, ionice, -c[0-3] + +# cinder/volume/utils.py: setup_blkio_cgroup() +cgcreate: CommandFilter, cgcreate, root +cgset: CommandFilter, cgset, root +cgexec: ChainingRegExpFilter, cgexec, root, cgexec, -g, blkio:\S+ + +# cinder/volume/driver.py +dmsetup: CommandFilter, dmsetup, root +ln: CommandFilter, ln, root + +# cinder/image/image_utils.py +qemu-img: EnvFilter, env, root, LC_ALL=C, qemu-img +qemu-img_convert: CommandFilter, qemu-img, root + +udevadm: CommandFilter, udevadm, root + +# cinder/volume/driver.py: utils.read_file_as_root() +cat: CommandFilter, cat, root + +# cinder/volume/nfs.py +stat: CommandFilter, stat, root +mount: CommandFilter, mount, root +df: CommandFilter, df, root +du: CommandFilter, du, root +truncate: CommandFilter, truncate, root +chmod: CommandFilter, chmod, root +rm: CommandFilter, rm, root + +# cinder/volume/drivers/netapp/nfs.py: +netapp_nfs_find: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -name, img-cache.*, -amin, \+\d+ + +# cinder/volume/drivers/glusterfs.py +chgrp: CommandFilter, chgrp, root +umount: CommandFilter, umount, root + +# cinder/volumes/drivers/hds/hds.py: +hus-cmd: CommandFilter, hus-cmd, root +hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root + +# cinder/volumes/drivers/hds/hnas_backend.py +ssc: CommandFilter, ssc, root + +# cinder/brick/initiator/connector.py: +ls: CommandFilter, ls, root +tee: CommandFilter, tee, root +multipath: CommandFilter, multipath, root +systool: CommandFilter, systool, root + +# cinder/volume/drivers/block_device.py +blockdev: CommandFilter, blockdev, root + +# cinder/volume/drivers/ibm/gpfs.py +mv: CommandFilter, mv, root +mmgetstate: CommandFilter, /usr/lpp/mmfs/bin/mmgetstate, root +mmclone: CommandFilter, /usr/lpp/mmfs/bin/mmclone, root +mmlsattr: CommandFilter, /usr/lpp/mmfs/bin/mmlsattr, root +mmchattr: CommandFilter, /usr/lpp/mmfs/bin/mmchattr, root +mmlsconfig: CommandFilter, /usr/lpp/mmfs/bin/mmlsconfig, root +mmlsfs: CommandFilter, /usr/lpp/mmfs/bin/mmlsfs, root +mmlspool: CommandFilter, /usr/lpp/mmfs/bin/mmlspool, root +mkfs: CommandFilter, mkfs, root + +# cinder/volume/drivers/ibm/gpfs.py +# cinder/volume/drivers/ibm/ibmnas.py +find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+ + +# cinder/brick/initiator/connector.py: +aoe-revalidate: CommandFilter, aoe-revalidate, root +aoe-discover: CommandFilter, aoe-discover, root +aoe-flush: CommandFilter, aoe-flush, root + +# cinder/brick/initiator/linuxscsi.py: +sg_scan: CommandFilter, sg_scan, root + +#cinder/backup/services/tsm.py +dsmc:CommandFilter,/usr/bin/dsmc,root + +# cinder/volume/drivers/hitachi/hbsd_horcm.py +raidqry: CommandFilter, raidqry, root +raidcom: CommandFilter, raidcom, root +pairsplit: CommandFilter, pairsplit, root +paircreate: CommandFilter, paircreate, root +pairdisplay: CommandFilter, pairdisplay, root +pairevtwait: CommandFilter, pairevtwait, root +horcmstart.sh: CommandFilter, horcmstart.sh, root +horcmshutdown.sh: CommandFilter, horcmshutdown.sh, root +horcmgr: EnvFilter, env, root, HORCMINST=, /etc/horcmgr + +# cinder/volume/drivers/hitachi/hbsd_snm2.py +auman: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auman +auluref: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluref +auhgdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgdef +aufibre1: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aufibre1 +auhgwwn: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgwwn +auhgmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgmap +autargetmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetmap +aureplicationvvol: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationvvol +auluadd: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluadd +auludel: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auludel +auluchgsize: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluchgsize +auchapuser: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auchapuser +autargetdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetdef +autargetopt: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetopt +autargetini: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetini +auiscsi: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auiscsi +audppool: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/audppool +aureplicationlocal: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationlocal +aureplicationmon: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationmon diff --git a/openstack/etc/glance/glance-api-paste.ini b/openstack/etc/glance/glance-api-paste.ini new file mode 100644 index 00000000..e4baa269 --- /dev/null +++ b/openstack/etc/glance/glance-api-paste.ini @@ -0,0 +1,72 @@ +# Use this pipeline for no auth or image caching - DEFAULT +[pipeline:glance-api] +pipeline = versionnegotiation unauthenticated-context rootapp + +# Use this pipeline for image caching and no auth +[pipeline:glance-api-caching] +pipeline = versionnegotiation unauthenticated-context cache rootapp + +# Use this pipeline for caching w/ management interface but no auth +[pipeline:glance-api-cachemanagement] +pipeline = versionnegotiation unauthenticated-context cache cachemanage rootapp + +# Use this pipeline for keystone auth +[pipeline:glance-api-keystone] +pipeline = versionnegotiation authtoken context rootapp + +# Use this pipeline for keystone auth with image caching +[pipeline:glance-api-keystone+caching] +pipeline = versionnegotiation authtoken context cache rootapp + +# Use this pipeline for keystone auth with caching and cache management +[pipeline:glance-api-keystone+cachemanagement] +pipeline = versionnegotiation authtoken context cache cachemanage rootapp + +# Use this pipeline for authZ only. This means that the registry will treat a +# user as authenticated without making requests to keystone to reauthenticate +# the user. +[pipeline:glance-api-trusted-auth] +pipeline = versionnegotiation context rootapp + +# Use this pipeline for authZ only. This means that the registry will treat a +# user as authenticated without making requests to keystone to reauthenticate +# the user and uses cache management +[pipeline:glance-api-trusted-auth+cachemanagement] +pipeline = versionnegotiation context cache cachemanage rootapp + +[composite:rootapp] +paste.composite_factory = glance.api:root_app_factory +/: apiversions +/v1: apiv1app +/v2: apiv2app + +[app:apiversions] +paste.app_factory = glance.api.versions:create_resource + +[app:apiv1app] +paste.app_factory = glance.api.v1.router:API.factory + +[app:apiv2app] +paste.app_factory = glance.api.v2.router:API.factory + +[filter:versionnegotiation] +paste.filter_factory = glance.api.middleware.version_negotiation:VersionNegotiationFilter.factory + +[filter:cache] +paste.filter_factory = glance.api.middleware.cache:CacheFilter.factory + +[filter:cachemanage] +paste.filter_factory = glance.api.middleware.cache_manage:CacheManageFilter.factory + +[filter:context] +paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory + +[filter:unauthenticated-context] +paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory +delay_auth_decision = true + +[filter:gzip] +paste.filter_factory = glance.api.middleware.gzip:GzipMiddleware.factory diff --git a/openstack/etc/glance/glance-api.conf b/openstack/etc/glance/glance-api.conf new file mode 100644 index 00000000..c30ce62f --- /dev/null +++ b/openstack/etc/glance/glance-api.conf @@ -0,0 +1,691 @@ +[DEFAULT] +# Show more verbose log output (sets INFO log level output) +#verbose = False + +# Show debugging output in logs (sets DEBUG log level output) +#debug = False + +# Which backend scheme should Glance use by default is not specified +# in a request to add a new image to Glance? Known schemes are determined +# by the known_stores option below. +# Default: 'file' +default_store = file + +# List of which store classes and store class locations are +# currently known to glance at startup. +# Existing but disabled stores: +# glance.store.rbd.Store, +# glance.store.s3.Store, +# glance.store.swift.Store, +# glance.store.sheepdog.Store, +# glance.store.cinder.Store, +# glance.store.gridfs.Store, +# glance.store.vmware_datastore.Store, +#known_stores = glance.store.filesystem.Store, +# glance.store.http.Store + + +# Maximum image size (in bytes) that may be uploaded through the +# Glance API server. Defaults to 1 TB. +# WARNING: this value should only be increased after careful consideration +# and must be set to a value under 8 EB (9223372036854775808). +#image_size_cap = 1099511627776 + +# Address to bind the API server +bind_host = 0.0.0.0 + +# Port the bind the API server to +bind_port = 9292 + +# Log to this file. Make sure you do not set the same log file for both the API +# and registry servers! +# +# If `log_file` is omitted and `use_syslog` is false, then log messages are +# sent to stdout as a fallback. +log_file = /var/log/glance/api.log + +# Backlog requests when creating socket +backlog = 4096 + +# TCP_KEEPIDLE value in seconds when creating socket. +# Not supported on OS X. +#tcp_keepidle = 600 + +# API to use for accessing data. Default value points to sqlalchemy +# package, it is also possible to use: glance.db.registry.api +# data_api = glance.db.sqlalchemy.api + +# Number of Glance API worker processes to start. +# On machines with more than one CPU increasing this value +# may improve performance (especially if using SSL with +# compression turned on). It is typically recommended to set +# this value to the number of CPUs present on your machine. +workers = 1 + +# Maximum line size of message headers to be accepted. +# max_header_line may need to be increased when using large tokens +# (typically those generated by the Keystone v3 API with big service +# catalogs) +# max_header_line = 16384 + +# Role used to identify an authenticated user as administrator +#admin_role = admin + +# Allow unauthenticated users to access the API with read-only +# privileges. This only applies when using ContextMiddleware. +#allow_anonymous_access = False + +# Allow access to version 1 of glance api +#enable_v1_api = True + +# Allow access to version 2 of glance api +#enable_v2_api = True + +# Return the URL that references where the data is stored on +# the backend storage system. For example, if using the +# file system store a URL of 'file:///path/to/image' will +# be returned to the user in the 'direct_url' meta-data field. +# The default value is false. +#show_image_direct_url = False + +# Send headers containing user and tenant information when making requests to +# the v1 glance registry. This allows the registry to function as if a user is +# authenticated without the need to authenticate a user itself using the +# auth_token middleware. +# The default value is false. +#send_identity_headers = False + +# Supported values for the 'container_format' image attribute +#container_formats=ami,ari,aki,bare,ovf,ova + +# Supported values for the 'disk_format' image attribute +#disk_formats=ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso + +# Directory to use for lock files. Default to a temp directory +# (string value). This setting needs to be the same for both +# glance-scrubber and glance-api. +#lock_path= + +# Property Protections config file +# This file contains the rules for property protections and the roles/policies +# associated with it. +# If this config value is not specified, by default, property protections +# won't be enforced. +# If a value is specified and the file is not found, then the glance-api +# service will not start. +#property_protection_file = + +# Specify whether 'roles' or 'policies' are used in the +# property_protection_file. +# The default value for property_protection_rule_format is 'roles'. +#property_protection_rule_format = roles + +# Specifies how long (in hours) a task is supposed to live in the tasks DB +# after succeeding or failing before getting soft-deleted. +# The default value for task_time_to_live is 48 hours. +# task_time_to_live = 48 + +# This value sets what strategy will be used to determine the image location +# order. Currently two strategies are packaged with Glance 'location_order' +# and 'store_type'. +#location_strategy = location_order + +# ================= Syslog Options ============================ + +# Send logs to syslog (/dev/log) instead of to file specified +# by `log_file` +#use_syslog = False + +# Facility to use. If unset defaults to LOG_USER. +#syslog_log_facility = LOG_LOCAL0 + +# ================= SSL Options =============================== + +# Certificate file to use when starting API server securely +#cert_file = /path/to/certfile + +# Private key file to use when starting API server securely +#key_file = /path/to/keyfile + +# CA certificate file to use to verify connecting clients +#ca_file = /path/to/cafile + +# ================= Security Options ========================== + +# AES key for encrypting store 'location' metadata, including +# -- if used -- Swift or S3 credentials +# Should be set to a random string of length 16, 24 or 32 bytes +#metadata_encryption_key = <16, 24 or 32 char registry metadata key> + +# ============ Registry Options =============================== + +# Address to find the registry server +registry_host = 0.0.0.0 + +# Port the registry server is listening on +registry_port = 9191 + +# What protocol to use when connecting to the registry server? +# Set to https for secure HTTP communication +registry_client_protocol = http + +# The path to the key file to use in SSL connections to the +# registry server, if any. Alternately, you may set the +# GLANCE_CLIENT_KEY_FILE environ variable to a filepath of the key file +#registry_client_key_file = /path/to/key/file + +# The path to the cert file to use in SSL connections to the +# registry server, if any. Alternately, you may set the +# GLANCE_CLIENT_CERT_FILE environ variable to a filepath of the cert file +#registry_client_cert_file = /path/to/cert/file + +# The path to the certifying authority cert file to use in SSL connections +# to the registry server, if any. Alternately, you may set the +# GLANCE_CLIENT_CA_FILE environ variable to a filepath of the CA cert file +#registry_client_ca_file = /path/to/ca/file + +# When using SSL in connections to the registry server, do not require +# validation via a certifying authority. This is the registry's equivalent of +# specifying --insecure on the command line using glanceclient for the API +# Default: False +#registry_client_insecure = False + +# The period of time, in seconds, that the API server will wait for a registry +# request to complete. A value of '0' implies no timeout. +# Default: 600 +#registry_client_timeout = 600 + +# Whether to automatically create the database tables. +# Default: False +#db_auto_create = False + +# Enable DEBUG log messages from sqlalchemy which prints every database +# query and response. +# Default: False +#sqlalchemy_debug = True + +# Pass the user's token through for API requests to the registry. +# Default: True +#use_user_token = True + +# If 'use_user_token' is not in effect then admin credentials +# can be specified. Requests to the registry on behalf of +# the API will use these credentials. +# Admin user name +#admin_user = None +# Admin password +#admin_password = None +# Admin tenant name +#admin_tenant_name = None +# Keystone endpoint +#auth_url = None +# Keystone region +#auth_region = None +# Auth strategy +#auth_strategy = keystone + +# ============ Notification System Options ===================== + +# Driver or drivers to handle sending notifications. Set to +# 'messaging' to send notifications to a message queue. +# notification_driver = noop + +# Default publisher_id for outgoing notifications. +# default_publisher_id = image.localhost + +# Messaging driver used for 'messaging' notifications driver +rpc_backend=rabbit + +# Configuration options if sending notifications via rabbitmq (these are +# the defaults) +rabbit_host = ##RABBITMQ_HOST## +rabbit_port = ##RABBITMQ_PORT## +rabbit_use_ssl = false +rabbit_userid = ##RABBITMQ_USER## +rabbit_password = ##RABBITMQ_PASSWORD## +rabbit_virtual_host = / +rabbit_notification_exchange = glance +rabbit_notification_topic = notifications +rabbit_durable_queues = False + +# Configuration options if sending notifications via Qpid (these are +# the defaults) +#qpid_notification_exchange = glance +#qpid_notification_topic = notifications +#qpid_hostname = localhost +#qpid_port = 5672 +#qpid_username = +#qpid_password = +#qpid_sasl_mechanisms = +#qpid_reconnect_timeout = 0 +#qpid_reconnect_limit = 0 +#qpid_reconnect_interval_min = 0 +#qpid_reconnect_interval_max = 0 +#qpid_reconnect_interval = 0 +#qpid_heartbeat = 5 +# Set to 'ssl' to enable SSL +#qpid_protocol = tcp +#qpid_tcp_nodelay = True + +# ============ Filesystem Store Options ======================== + +# Directory that the Filesystem backend store +# writes image data to +filesystem_store_datadir = /var/lib/glance/images/ + +# A list of directories where image data can be stored. +# This option may be specified multiple times for specifying multiple store +# directories. Either one of filesystem_store_datadirs or +# filesystem_store_datadir option is required. A priority number may be given +# after each directory entry, separated by a ":". +# When adding an image, the highest priority directory will be selected, unless +# there is not enough space available in cases where the image size is already +# known. If no priority is given, it is assumed to be zero and the directory +# will be considered for selection last. If multiple directories have the same +# priority, then the one with the most free space available is selected. +# If same store is specified multiple times then BadStoreConfiguration +# exception will be raised. +#filesystem_store_datadirs = /var/lib/glance/images/:1 + +# A path to a JSON file that contains metadata describing the storage +# system. When show_multiple_locations is True the information in this +# file will be returned with any location that is contained in this +# store. +#filesystem_store_metadata_file = None + +# ============ Swift Store Options ============================= + +# Version of the authentication service to use +# Valid versions are '2' for keystone and '1' for swauth and rackspace +swift_store_auth_version = 2 + +# Address where the Swift authentication service lives +# Valid schemes are 'http://' and 'https://' +# If no scheme specified, default to 'https://' +# For swauth, use something like 'localhost:8080/v1.0/' +swift_store_auth_address = localhost:5000/v2.0/ + +# User to authenticate against the Swift authentication service +# If you use Swift authentication service, set it to 'account':'user' +# where 'account' is a Swift storage account and 'user' +# is a user in that account +swift_store_user = jdoe:jdoe + +# Auth key for the user authenticating against the +# Swift authentication service +swift_store_key = a86850deb2742ec3cb41518e26aa2d89 + +# Container within the account that the account should use +# for storing images in Swift +swift_store_container = glance + +# Do we create the container if it does not exist? +swift_store_create_container_on_put = False + +# What size, in MB, should Glance start chunking image files +# and do a large object manifest in Swift? By default, this is +# the maximum object size in Swift, which is 5GB +swift_store_large_object_size = 5120 + +# swift_store_config_file = glance-swift.conf +# This file contains references for each of the configured +# Swift accounts/backing stores. If used, this option can prevent +# credentials being stored in the database. Using Swift references +# is disabled if this config is left blank. + +# The reference to the default Swift parameters to use for adding new images. +# default_swift_reference = 'ref1' + +# When doing a large object manifest, what size, in MB, should +# Glance write chunks to Swift? This amount of data is written +# to a temporary disk buffer during the process of chunking +# the image file, and the default is 200MB +swift_store_large_object_chunk_size = 200 + +# Whether to use ServiceNET to communicate with the Swift storage servers. +# (If you aren't RACKSPACE, leave this False!) +# +# To use ServiceNET for authentication, prefix hostname of +# `swift_store_auth_address` with 'snet-'. +# Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/ +swift_enable_snet = False + +# If set to True enables multi-tenant storage mode which causes Glance images +# to be stored in tenant specific Swift accounts. +#swift_store_multi_tenant = False + +# A list of swift ACL strings that will be applied as both read and +# write ACLs to the containers created by Glance in multi-tenant +# mode. This grants the specified tenants/users read and write access +# to all newly created image objects. The standard swift ACL string +# formats are allowed, including: +# : +# : +# *: +# Multiple ACLs can be combined using a comma separated list, for +# example: swift_store_admin_tenants = service:glance,*:admin +#swift_store_admin_tenants = + +# The region of the swift endpoint to be used for single tenant. This setting +# is only necessary if the tenant has multiple swift endpoints. +#swift_store_region = + +# If set to False, disables SSL layer compression of https swift requests. +# Setting to 'False' may improve performance for images which are already +# in a compressed format, eg qcow2. If set to True, enables SSL layer +# compression (provided it is supported by the target swift proxy). +#swift_store_ssl_compression = True + +# The number of times a Swift download will be retried before the +# request fails +#swift_store_retry_get_count = 0 + +# Bypass SSL verification for Swift +#swift_store_auth_insecure = False + +# ============ S3 Store Options ============================= + +# Address where the S3 authentication service lives +# Valid schemes are 'http://' and 'https://' +# If no scheme specified, default to 'http://' +s3_store_host = localhost:8080/v1.0/ + +# User to authenticate against the S3 authentication service +s3_store_access_key = <20-char AWS access key> + +# Auth key for the user authenticating against the +# S3 authentication service +s3_store_secret_key = <40-char AWS secret key> + +# Container within the account that the account should use +# for storing images in S3. Note that S3 has a flat namespace, +# so you need a unique bucket name for your glance images. An +# easy way to do this is append your AWS access key to "glance". +# S3 buckets in AWS *must* be lowercased, so remember to lowercase +# your AWS access key if you use it in your bucket name below! +s3_store_bucket = glance + +# Do we create the bucket if it does not exist? +s3_store_create_bucket_on_put = False + +# When sending images to S3, the data will first be written to a +# temporary buffer on disk. By default the platform's temporary directory +# will be used. If required, an alternative directory can be specified here. +#s3_store_object_buffer_dir = /path/to/dir + +# When forming a bucket url, boto will either set the bucket name as the +# subdomain or as the first token of the path. Amazon's S3 service will +# accept it as the subdomain, but Swift's S3 middleware requires it be +# in the path. Set this to 'path' or 'subdomain' - defaults to 'subdomain'. +#s3_store_bucket_url_format = subdomain + +# Size, in MB, should S3 start chunking image files +# and do a multipart upload in S3. The default is 100MB. +#s3_store_large_object_size = 100 + +# Multipart upload part size, in MB, should S3 use when uploading +# parts. The size must be greater than or equal to +# 5MB. The default is 10MB. +#s3_store_large_object_chunk_size = 10 + +# The number of thread pools to perform a multipart upload +# in S3. The default is 10. +#s3_store_thread_pools = 10 + +# ============ RBD Store Options ============================= + +# Ceph configuration file path +# If using cephx authentication, this file should +# include a reference to the right keyring +# in a client. section +#rbd_store_ceph_conf = /etc/ceph/ceph.conf + +# RADOS user to authenticate as (only applicable if using cephx) +# If , a default will be chosen based on the client. section +# in rbd_store_ceph_conf +#rbd_store_user = + +# RADOS pool in which images are stored +#rbd_store_pool = images + +# RADOS images will be chunked into objects of this size (in megabytes). +# For best performance, this should be a power of two +#rbd_store_chunk_size = 8 + +# ============ Sheepdog Store Options ============================= + +sheepdog_store_address = localhost + +sheepdog_store_port = 7000 + +# Images will be chunked into objects of this size (in megabytes). +# For best performance, this should be a power of two +sheepdog_store_chunk_size = 64 + +# ============ Cinder Store Options =============================== + +# Info to match when looking for cinder in the service catalog +# Format is : separated values of the form: +# :: (string value) +#cinder_catalog_info = volume:cinder:publicURL + +# Override service catalog lookup with template for cinder endpoint +# e.g. http://localhost:8776/v1/%(project_id)s (string value) +#cinder_endpoint_template = + +# Region name of this node (string value) +#os_region_name = + +# Location of ca certicates file to use for cinder client requests +# (string value) +#cinder_ca_certificates_file = + +# Number of cinderclient retries on failed http calls (integer value) +#cinder_http_retries = 3 + +# Allow to perform insecure SSL requests to cinder (boolean value) +#cinder_api_insecure = False + +# ============ VMware Datastore Store Options ===================== + +# ESX/ESXi or vCenter Server target system. +# The server value can be an IP address or a DNS name +# e.g. localhost, localhost:443, www.vmware-infra.com +#vmware_server_host = + +# Server username (string value) +#vmware_server_username = + +# Server password (string value) +#vmware_server_password = + +# Inventory path to a datacenter (string value) +# Value optional when vmware_server_ip is an ESX/ESXi host: if specified +# should be `ha-datacenter`. +#vmware_datacenter_path = + +# Datastore associated with the datacenter (string value) +#vmware_datastore_name = + +# The number of times we retry on failures +# e.g., socket error, etc (integer value) +#vmware_api_retry_count = 10 + +# The interval used for polling remote tasks +# invoked on VMware ESX/VC server in seconds (integer value) +#vmware_task_poll_interval = 5 + +# Absolute path of the folder containing the images in the datastore +# (string value) +#vmware_store_image_dir = /openstack_glance + +# Allow to perform insecure SSL requests to the target system (boolean value) +#vmware_api_insecure = False + +# ============ Delayed Delete Options ============================= + +# Turn on/off delayed delete +delayed_delete = False + +# Delayed delete time in seconds +scrub_time = 43200 + +# Directory that the scrubber will use to remind itself of what to delete +# Make sure this is also set in glance-scrubber.conf +scrubber_datadir = /var/lib/glance/scrubber + +# =============== Quota Options ================================== + +# The maximum number of image members allowed per image +#image_member_quota = 128 + +# The maximum number of image properties allowed per image +#image_property_quota = 128 + +# The maximum number of tags allowed per image +#image_tag_quota = 128 + +# The maximum number of locations allowed per image +#image_location_quota = 10 + +# Set a system wide quota for every user. This value is the total number +# of bytes that a user can use across all storage systems. A value of +# 0 means unlimited. +#user_storage_quota = 0 + +# =============== Image Cache Options ============================= + +# Base directory that the Image Cache uses +image_cache_dir = /var/lib/glance/image-cache/ + +# =============== Manager Options ================================= + +# DEPRECATED. TO BE REMOVED IN THE JUNO RELEASE. +# Whether or not to enforce that all DB tables have charset utf8. +# If your database tables do not have charset utf8 you will +# need to convert before this option is removed. This option is +# only relevant if your database engine is MySQL. +#db_enforce_mysql_charset = True + +# =============== Database Options ================================= + +[database] +# The file name to use with SQLite (string value) +#sqlite_db = glance.sqlite + +# If True, SQLite uses synchronous mode (boolean value) +#sqlite_synchronous = True + +# The backend to use for db (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend = sqlalchemy + +# The SQLAlchemy connection string used to connect to the +# database (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +# Deprecated group/name - [sql]/connection +#connection = +connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance + +# The SQL mode to be used for MySQL sessions. This option, +# including the default, overrides any server-set SQL mode. To +# use whatever SQL mode is set by the server configuration, +# set this to no value. Example: mysql_sql_mode= (string +# value) +#mysql_sql_mode = TRADITIONAL + +# Timeout before idle sql connections are reaped (integer +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/sql_idle_timeout +# Deprecated group/name - [sql]/idle_timeout +#idle_timeout = 3600 + +# Minimum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_min_pool_size +# Deprecated group/name - [DATABASE]/sql_min_pool_size +#min_pool_size = 1 + +# Maximum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_pool_size +# Deprecated group/name - [DATABASE]/sql_max_pool_size +#max_pool_size = + +# Maximum db connection retries during startup. (setting -1 +# implies an infinite retry count) (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_retries +# Deprecated group/name - [DATABASE]/sql_max_retries +#max_retries = 10 + +# Interval between retries of opening a sql connection +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_retry_interval +# Deprecated group/name - [DATABASE]/reconnect_interval +#retry_interval = 10 + +# If set, use this value for max_overflow with sqlalchemy +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_overflow +# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow +#max_overflow = + +# Verbosity of SQL debugging information. 0=None, +# 100=Everything (integer value) +# Deprecated group/name - [DEFAULT]/sql_connection_debug +#connection_debug = 0 + +# Add python stack traces to SQL as comment strings (boolean +# value) +# Deprecated group/name - [DEFAULT]/sql_connection_trace +#connection_trace = False + +# If set, use this value for pool_timeout with sqlalchemy +# (integer value) +# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout +#pool_timeout = + +# Enable the experimental use of database reconnect on +# connection lost (boolean value) +#use_db_reconnect = False + +# seconds between db connection retries (integer value) +#db_retry_interval = 1 + +# Whether to increase interval between db connection retries, +# up to db_max_retry_interval (boolean value) +#db_inc_retry_interval = True + +# max seconds between db connection retries, if +# db_inc_retry_interval is enabled (integer value) +#db_max_retry_interval = 10 + +# maximum db connection retries before error is raised. +# (setting -1 implies an infinite retry count) (integer value) +#db_max_retries = 20 + +[keystone_authtoken] +auth_uri = ##KEYSTONE_PUBLIC_URL## +identity_uri = ##IDENTITY_URI## +admin_tenant_name = service +admin_user = ##GLANCE_SERVICE_USER## +admin_password = ##GLANCE_SERVICE_PASSWORD## + +[paste_deploy] +# Name of the paste configuration file that defines the available pipelines +#config_file = glance-api-paste.ini + +# Partial name of a pipeline in your paste configuration file with the +# service name removed. For example, if your paste section name is +# [pipeline:glance-api-keystone], you would configure the flavor below +# as 'keystone'. +flavor = keystone + +[store_type_location_strategy] +# The scheme list to use to get store preference order. The scheme must be +# registered by one of the stores defined by the 'known_stores' config option. +# This option will be applied when you using 'store_type' option as image +# location strategy defined by the 'location_strategy' config option. +#store_type_preference = diff --git a/openstack/etc/glance/glance-cache.conf b/openstack/etc/glance/glance-cache.conf new file mode 100644 index 00000000..a4453353 --- /dev/null +++ b/openstack/etc/glance/glance-cache.conf @@ -0,0 +1,200 @@ +[DEFAULT] +# Show more verbose log output (sets INFO log level output) +#verbose = False + +# Show debugging output in logs (sets DEBUG log level output) +#debug = False + +# Log to this file. Make sure you do not set the same log file for both the API +# and registry servers! +# +# If `log_file` is omitted and `use_syslog` is false, then log messages are +# sent to stdout as a fallback. +log_file = /var/log/glance/image-cache.log + +# Send logs to syslog (/dev/log) instead of to file specified by `log_file` +#use_syslog = False + +# Directory that the Image Cache writes data to +image_cache_dir = /var/lib/glance/image-cache/ + +# Number of seconds after which we should consider an incomplete image to be +# stalled and eligible for reaping +image_cache_stall_time = 86400 + +# Max cache size in bytes +image_cache_max_size = 10737418240 + +# Address to find the registry server +registry_host = 0.0.0.0 + +# Port the registry server is listening on +registry_port = 9191 + +# Auth settings if using Keystone +# auth_url = http://localhost:5000/v2.0/ +# admin_tenant_name = %SERVICE_TENANT_NAME% +# admin_user = %SERVICE_USER% +# admin_password = %SERVICE_PASSWORD% + +# List of which store classes and store class locations are +# currently known to glance at startup. +# known_stores = glance.store.filesystem.Store, +# glance.store.http.Store, +# glance.store.rbd.Store, +# glance.store.s3.Store, +# glance.store.swift.Store, +# glance.store.sheepdog.Store, +# glance.store.cinder.Store, +# glance.store.vmware_datastore.Store, + +# ============ Filesystem Store Options ======================== + +# Directory that the Filesystem backend store +# writes image data to +filesystem_store_datadir = /var/lib/glance/images/ + +# ============ Swift Store Options ============================= + +# Version of the authentication service to use +# Valid versions are '2' for keystone and '1' for swauth and rackspace +swift_store_auth_version = 2 + +# Address where the Swift authentication service lives +# Valid schemes are 'http://' and 'https://' +# If no scheme specified, default to 'https://' +# For swauth, use something like 'localhost:8080/v1.0/' +swift_store_auth_address = localhost:5000/v2.0/ + +# User to authenticate against the Swift authentication service +# If you use Swift authentication service, set it to 'account':'user' +# where 'account' is a Swift storage account and 'user' +# is a user in that account +swift_store_user = jdoe:jdoe + +# Auth key for the user authenticating against the +# Swift authentication service +swift_store_key = a86850deb2742ec3cb41518e26aa2d89 + +# Container within the account that the account should use +# for storing images in Swift +swift_store_container = glance + +# Do we create the container if it does not exist? +swift_store_create_container_on_put = False + +# What size, in MB, should Glance start chunking image files +# and do a large object manifest in Swift? By default, this is +# the maximum object size in Swift, which is 5GB +swift_store_large_object_size = 5120 + +# When doing a large object manifest, what size, in MB, should +# Glance write chunks to Swift? This amount of data is written +# to a temporary disk buffer during the process of chunking +# the image file, and the default is 200MB +swift_store_large_object_chunk_size = 200 + +# Whether to use ServiceNET to communicate with the Swift storage servers. +# (If you aren't RACKSPACE, leave this False!) +# +# To use ServiceNET for authentication, prefix hostname of +# `swift_store_auth_address` with 'snet-'. +# Ex. https://example.com/v1.0/ -> https://snet-example.com/v1.0/ +swift_enable_snet = False + +# ============ S3 Store Options ============================= + +# Address where the S3 authentication service lives +# Valid schemes are 'http://' and 'https://' +# If no scheme specified, default to 'http://' +s3_store_host = localhost:8080/v1.0/ + +# User to authenticate against the S3 authentication service +s3_store_access_key = <20-char AWS access key> + +# Auth key for the user authenticating against the +# S3 authentication service +s3_store_secret_key = <40-char AWS secret key> + +# Container within the account that the account should use +# for storing images in S3. Note that S3 has a flat namespace, +# so you need a unique bucket name for your glance images. An +# easy way to do this is append your AWS access key to "glance". +# S3 buckets in AWS *must* be lowercased, so remember to lowercase +# your AWS access key if you use it in your bucket name below! +s3_store_bucket = glance + +# Do we create the bucket if it does not exist? +s3_store_create_bucket_on_put = False + +# When sending images to S3, the data will first be written to a +# temporary buffer on disk. By default the platform's temporary directory +# will be used. If required, an alternative directory can be specified here. +# s3_store_object_buffer_dir = /path/to/dir + +# ============ Cinder Store Options =========================== + +# Info to match when looking for cinder in the service catalog +# Format is : separated values of the form: +# :: (string value) +#cinder_catalog_info = volume:cinder:publicURL + +# Override service catalog lookup with template for cinder endpoint +# e.g. http://localhost:8776/v1/%(project_id)s (string value) +#cinder_endpoint_template = + +# Region name of this node (string value) +#os_region_name = + +# Location of ca certicates file to use for cinder client requests +# (string value) +#cinder_ca_certificates_file = + +# Number of cinderclient retries on failed http calls (integer value) +#cinder_http_retries = 3 + +# Allow to perform insecure SSL requests to cinder (boolean value) +#cinder_api_insecure = False + +# ============ VMware Datastore Store Options ===================== + +# ESX/ESXi or vCenter Server target system. +# The server value can be an IP address or a DNS name +# e.g. localhost, localhost:443, www.vmware-infra.com +#vmware_server_host = + +# Server username (string value) +#vmware_server_username = + +# Server password (string value) +#vmware_server_password = + +# Inventory path to a datacenter (string value) +# Value optional when vmware_server_ip is an ESX/ESXi host: if specified +# should be `ha-datacenter`. +#vmware_datacenter_path = + +# Datastore associated with the datacenter (string value) +#vmware_datastore_name = + +# The number of times we retry on failures +# e.g., socket error, etc (integer value) +#vmware_api_retry_count = 10 + +# The interval used for polling remote tasks +# invoked on VMware ESX/VC server in seconds (integer value) +#vmware_task_poll_interval = 5 + +# Absolute path of the folder containing the images in the datastore +# (string value) +#vmware_store_image_dir = /openstack_glance + +# Allow to perform insecure SSL requests to the target system (boolean value) +#vmware_api_insecure = False + +# ================= Security Options ========================== + +# AES key for encrypting store 'location' metadata, including +# -- if used -- Swift or S3 credentials +# Should be set to a random string of length 16, 24 or 32 bytes +# metadata_encryption_key = <16, 24 or 32 char registry metadata key> diff --git a/openstack/etc/glance/glance-registry-paste.ini b/openstack/etc/glance/glance-registry-paste.ini new file mode 100644 index 00000000..ab8c2856 --- /dev/null +++ b/openstack/etc/glance/glance-registry-paste.ini @@ -0,0 +1,25 @@ +# Use this pipeline for no auth - DEFAULT +[pipeline:glance-registry] +pipeline = unauthenticated-context registryapp + +# Use this pipeline for keystone auth +[pipeline:glance-registry-keystone] +pipeline = authtoken context registryapp + +# Use this pipeline for authZ only. This means that the registry will treat a +# user as authenticated without making requests to keystone to reauthenticate +# the user. +[pipeline:glance-registry-trusted-auth] +pipeline = context registryapp + +[app:registryapp] +paste.app_factory = glance.registry.api:API.factory + +[filter:context] +paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory + +[filter:unauthenticated-context] +paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/openstack/etc/glance/glance-registry.conf b/openstack/etc/glance/glance-registry.conf new file mode 100644 index 00000000..fbfe7c8d --- /dev/null +++ b/openstack/etc/glance/glance-registry.conf @@ -0,0 +1,197 @@ +[DEFAULT] +# Show more verbose log output (sets INFO log level output) +#verbose = False + +# Show debugging output in logs (sets DEBUG log level output) +#debug = False + +# Address to bind the registry server +bind_host = 0.0.0.0 + +# Port the bind the registry server to +bind_port = 9191 + +# Log to this file. Make sure you do not set the same log file for both the API +# and registry servers! +# +# If `log_file` is omitted and `use_syslog` is false, then log messages are +# sent to stdout as a fallback. +log_file = /var/log/glance/registry.log + +# Backlog requests when creating socket +backlog = 4096 + +# TCP_KEEPIDLE value in seconds when creating socket. +# Not supported on OS X. +#tcp_keepidle = 600 + +# API to use for accessing data. Default value points to sqlalchemy +# package. +#data_api = glance.db.sqlalchemy.api + +# Number of Glance Registry worker processes to start. +# On machines with more than one CPU increasing this value +# may improve performance (especially if using SSL with +# compression turned on). It is typically recommended to set +# this value to the number of CPUs present on your machine. +workers = 1 + +# Enable Registry API versions individually or simultaneously +#enable_v1_registry = True +#enable_v2_registry = True + +# Limit the api to return `param_limit_max` items in a call to a container. If +# a larger `limit` query param is provided, it will be reduced to this value. +api_limit_max = 1000 + +# If a `limit` query param is not provided in an api request, it will +# default to `limit_param_default` +limit_param_default = 25 + +# Role used to identify an authenticated user as administrator +#admin_role = admin + +# Whether to automatically create the database tables. +# Default: False +#db_auto_create = False + +# Enable DEBUG log messages from sqlalchemy which prints every database +# query and response. +# Default: False +#sqlalchemy_debug = True + +# ================= Syslog Options ============================ + +# Send logs to syslog (/dev/log) instead of to file specified +# by `log_file` +#use_syslog = False + +# Facility to use. If unset defaults to LOG_USER. +#syslog_log_facility = LOG_LOCAL1 + +# ================= SSL Options =============================== + +# Certificate file to use when starting registry server securely +#cert_file = /path/to/certfile + +# Private key file to use when starting registry server securely +#key_file = /path/to/keyfile + +# CA certificate file to use to verify connecting clients +#ca_file = /path/to/cafile + +# ================= Database Options ========================== + +[database] +# The file name to use with SQLite (string value) +#sqlite_db = glance.sqlite + +# If True, SQLite uses synchronous mode (boolean value) +#sqlite_synchronous = True + +# The backend to use for db (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend = sqlalchemy + +# The SQLAlchemy connection string used to connect to the +# database (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +# Deprecated group/name - [sql]/connection +#connection = +connection=postgresql://##GLANCE_DB_USER##:##GLANCE_DB_PASSWORD##@onenode/glance + +# The SQL mode to be used for MySQL sessions. This option, +# including the default, overrides any server-set SQL mode. To +# use whatever SQL mode is set by the server configuration, +# set this to no value. Example: mysql_sql_mode= (string +# value) +#mysql_sql_mode = TRADITIONAL + +# Timeout before idle sql connections are reaped (integer +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/sql_idle_timeout +# Deprecated group/name - [sql]/idle_timeout +#idle_timeout = 3600 + +# Minimum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_min_pool_size +# Deprecated group/name - [DATABASE]/sql_min_pool_size +#min_pool_size = 1 + +# Maximum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_pool_size +# Deprecated group/name - [DATABASE]/sql_max_pool_size +#max_pool_size = + +# Maximum db connection retries during startup. (setting -1 +# implies an infinite retry count) (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_retries +# Deprecated group/name - [DATABASE]/sql_max_retries +#max_retries = 10 + +# Interval between retries of opening a sql connection +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_retry_interval +# Deprecated group/name - [DATABASE]/reconnect_interval +#retry_interval = 10 + +# If set, use this value for max_overflow with sqlalchemy +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_overflow +# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow +#max_overflow = + +# Verbosity of SQL debugging information. 0=None, +# 100=Everything (integer value) +# Deprecated group/name - [DEFAULT]/sql_connection_debug +#connection_debug = 0 + +# Add python stack traces to SQL as comment strings (boolean +# value) +# Deprecated group/name - [DEFAULT]/sql_connection_trace +#connection_trace = False + +# If set, use this value for pool_timeout with sqlalchemy +# (integer value) +# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout +#pool_timeout = + +# Enable the experimental use of database reconnect on +# connection lost (boolean value) +#use_db_reconnect = False + +# seconds between db connection retries (integer value) +#db_retry_interval = 1 + +# Whether to increase interval between db connection retries, +# up to db_max_retry_interval (boolean value) +#db_inc_retry_interval = True + +# max seconds between db connection retries, if +# db_inc_retry_interval is enabled (integer value) +#db_max_retry_interval = 10 + +# maximum db connection retries before error is raised. +# (setting -1 implies an infinite retry count) (integer value) +#db_max_retries = 20 + +[keystone_authtoken] +auth_uri = ##KEYSTONE_PUBLIC_URL## +identity_uri = ##IDENTITY_URI## +admin_tenant_name = service +admin_user = ##GLANCE_SERVICE_USER## +admin_password = ##GLANCE_SERVICE_PASSWORD## + +[paste_deploy] +# Name of the paste configuration file that defines the available pipelines +#config_file = glance-registry-paste.ini + +# Partial name of a pipeline in your paste configuration file with the +# service name removed. For example, if your paste section name is +# [pipeline:glance-registry-keystone], you would configure the flavor below +# as 'keystone'. +flavor = keystone diff --git a/openstack/etc/glance/glance-scrubber.conf b/openstack/etc/glance/glance-scrubber.conf new file mode 100644 index 00000000..5c5e8d4c --- /dev/null +++ b/openstack/etc/glance/glance-scrubber.conf @@ -0,0 +1,56 @@ +[DEFAULT] +# Show more verbose log output (sets INFO log level output) +#verbose = False + +# Show debugging output in logs (sets DEBUG log level output) +#debug = False + +# Log to this file. Make sure you do not set the same log file for both the API +# and registry servers! +# +# If `log_file` is omitted and `use_syslog` is false, then log messages are +# sent to stdout as a fallback. +log_file = /var/log/glance/scrubber.log + +# Send logs to syslog (/dev/log) instead of to file specified by `log_file` +#use_syslog = False + +# Should we run our own loop or rely on cron/scheduler to run us +daemon = False + +# Loop time between checking for new items to schedule for delete +wakeup_time = 300 + +# Directory that the scrubber will use to remind itself of what to delete +# Make sure this is also set in glance-api.conf +scrubber_datadir = /var/lib/glance/scrubber + +# Only one server in your deployment should be designated the cleanup host +cleanup_scrubber = False + +# pending_delete items older than this time are candidates for cleanup +cleanup_scrubber_time = 86400 + +# Address to find the registry server for cleanups +registry_host = 0.0.0.0 + +# Port the registry server is listening on +registry_port = 9191 + +# Auth settings if using Keystone +# auth_url = http://127.0.0.1:5000/v2.0/ +# admin_tenant_name = %SERVICE_TENANT_NAME% +# admin_user = %SERVICE_USER% +# admin_password = %SERVICE_PASSWORD% + +# Directory to use for lock files. Default to a temp directory +# (string value). This setting needs to be the same for both +# glance-scrubber and glance-api. +#lock_path= + +# ================= Security Options ========================== + +# AES key for encrypting store 'location' metadata, including +# -- if used -- Swift or S3 credentials +# Should be set to a random string of length 16, 24 or 32 bytes +#metadata_encryption_key = <16, 24 or 32 char registry metadata key> diff --git a/openstack/etc/glance/logging.conf b/openstack/etc/glance/logging.conf new file mode 100644 index 00000000..8de2ffd1 --- /dev/null +++ b/openstack/etc/glance/logging.conf @@ -0,0 +1,54 @@ +[loggers] +keys=root,api,registry,combined + +[formatters] +keys=normal,normal_with_name,debug + +[handlers] +keys=production,file,devel + +[logger_root] +level=NOTSET +handlers=devel + +[logger_api] +level=DEBUG +handlers=devel +qualname=glance-api + +[logger_registry] +level=DEBUG +handlers=devel +qualname=glance-registry + +[logger_combined] +level=DEBUG +handlers=devel +qualname=glance-combined + +[handler_production] +class=handlers.SysLogHandler +level=ERROR +formatter=normal_with_name +args=(('127.0.0.1', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER) + +[handler_file] +class=FileHandler +level=DEBUG +formatter=normal_with_name +args=('glance.log', 'w') + +[handler_devel] +class=StreamHandler +level=NOTSET +formatter=debug +args=(sys.stdout,) + +[formatter_normal] +format=%(asctime)s %(levelname)s %(message)s + +[formatter_normal_with_name] +format=(%(name)s): %(asctime)s %(levelname)s %(message)s + +[formatter_debug] +format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s diff --git a/openstack/etc/glance/policy.json b/openstack/etc/glance/policy.json new file mode 100644 index 00000000..8b7e6871 --- /dev/null +++ b/openstack/etc/glance/policy.json @@ -0,0 +1,32 @@ +{ + "context_is_admin": "role:admin", + "default": "", + + "add_image": "", + "delete_image": "", + "get_image": "", + "get_images": "", + "modify_image": "", + "publicize_image": "role:admin", + "copy_from": "", + + "download_image": "", + "upload_image": "", + + "delete_image_location": "", + "get_image_location": "", + "set_image_location": "", + + "add_member": "", + "delete_member": "", + "get_member": "", + "get_members": "", + "modify_member": "", + + "manage_image_cache": "role:admin", + + "get_task": "", + "get_tasks": "", + "add_task": "", + "modify_task": "" +} diff --git a/openstack/etc/glance/schema-image.json b/openstack/etc/glance/schema-image.json new file mode 100644 index 00000000..5aafd6b3 --- /dev/null +++ b/openstack/etc/glance/schema-image.json @@ -0,0 +1,28 @@ +{ + "kernel_id": { + "type": "string", + "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$", + "description": "ID of image stored in Glance that should be used as the kernel when booting an AMI-style image." + }, + "ramdisk_id": { + "type": "string", + "pattern": "^([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}$", + "description": "ID of image stored in Glance that should be used as the ramdisk when booting an AMI-style image." + }, + "instance_uuid": { + "type": "string", + "description": "ID of instance used to create this image." + }, + "architecture": { + "description": "Operating system architecture as specified in http://docs.openstack.org/trunk/openstack-compute/admin/content/adding-images.html", + "type": "string" + }, + "os_distro": { + "description": "Common name of operating system distribution as specified in http://docs.openstack.org/trunk/openstack-compute/admin/content/adding-images.html", + "type": "string" + }, + "os_version": { + "description": "Operating system version as specified by the distributor", + "type": "string" + } +} diff --git a/openstack/etc/horizon/apache-horizon.conf b/openstack/etc/horizon/apache-horizon.conf new file mode 100644 index 00000000..e51fbd17 --- /dev/null +++ b/openstack/etc/horizon/apache-horizon.conf @@ -0,0 +1,32 @@ + + WSGIScriptAlias /horizon /var/lib/horizon/django.wsgi + WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horzion + WSGIApplicationGroup %{GLOBAL} + + SetEnv APACHE_RUN_USER apache + SetEnv APACHE_RUN_GROUP apache + WSGIProcessGroup horizon + + DocumentRoot /var/lib/horizon/.blackhole + Alias /static /var/lib/horizon/openstack_dashboard/static + + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + # Apache 2.4 uses mod_authz_host for access control now (instead of + # "Allow") + + Order allow,deny + Allow from all + + = 2.4> + Require all granted + + + + ErrorLog /var/log/httpd/horizon_error.log + LogLevel warn + CustomLog /var/log/httpd/horizon_access.log combined + + +WSGISocketPrefix /var/run/httpd diff --git a/openstack/etc/horizon/openstack_dashboard/local_settings.py b/openstack/etc/horizon/openstack_dashboard/local_settings.py new file mode 100644 index 00000000..dc757eb1 --- /dev/null +++ b/openstack/etc/horizon/openstack_dashboard/local_settings.py @@ -0,0 +1,549 @@ +import os + +from django.utils.translation import ugettext_lazy as _ + +from openstack_dashboard import exceptions + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +STATIC_ROOT = "/var/lib/horizon/openstack_dashboard/static" + +# Required for Django 1.5. +# If horizon is running in production (DEBUG is False), set this +# with the list of host/domain names that the application can serve. +# For more information see: +# https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts +#ALLOWED_HOSTS = ['horizon.example.com', ] +ALLOWED_HOSTS = ['*'] + +# Set SSL proxy settings: +# For Django 1.4+ pass this header from the proxy after terminating the SSL, +# and don't forget to strip it from the client's request. +# For more information see: +# https://docs.djangoproject.com/en/1.4/ref/settings/#secure-proxy-ssl-header +# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') + +# If Horizon is being served through SSL, then uncomment the following two +# settings to better secure the cookies from security exploits +#CSRF_COOKIE_SECURE = True +#SESSION_COOKIE_SECURE = True + +# Overrides for OpenStack API versions. Use this setting to force the +# OpenStack dashboard to use a specific API version for a given service API. +# NOTE: The version should be formatted as it appears in the URL for the +# service API. For example, The identity service APIs have inconsistent +# use of the decimal point, so valid options would be "2.0" or "3". +# OPENSTACK_API_VERSIONS = { +# "data_processing": 1.1, +# "identity": 3, +# "volume": 2 +# } + +# Set this to True if running on multi-domain model. When this is enabled, it +# will require user to enter the Domain name in addition to username for login. +# OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT = False + +# Overrides the default domain used when running on single-domain model +# with Keystone V3. All entities will be created in the default domain. +# OPENSTACK_KEYSTONE_DEFAULT_DOMAIN = 'Default' + +# Set Console type: +# valid options would be "AUTO"(default), "VNC", "SPICE", "RDP" or None +# Set to None explicitly if you want to deactivate the console. +# CONSOLE_TYPE = "AUTO" + +# Default OpenStack Dashboard configuration. +HORIZON_CONFIG = { + 'user_home': 'openstack_dashboard.views.get_user_home', + 'ajax_queue_limit': 10, + 'auto_fade_alerts': { + 'delay': 3000, + 'fade_duration': 1500, + 'types': ['alert-success', 'alert-info'] + }, + 'help_url': "http://docs.openstack.org", + 'exceptions': {'recoverable': exceptions.RECOVERABLE, + 'not_found': exceptions.NOT_FOUND, + 'unauthorized': exceptions.UNAUTHORIZED}, + 'modal_backdrop': 'static', + 'angular_modules': [], + 'js_files': [], +} + +# Specify a regular expression to validate user passwords. +# HORIZON_CONFIG["password_validator"] = { +# "regex": '.*', +# "help_text": _("Your password does not meet the requirements.") +# } + +# Disable simplified floating IP address management for deployments with +# multiple floating IP pools or complex network requirements. +# HORIZON_CONFIG["simple_ip_management"] = False + +# Turn off browser autocompletion for forms including the login form and +# the database creation workflow if so desired. +# HORIZON_CONFIG["password_autocomplete"] = "off" + +# Setting this to True will disable the reveal button for password fields, +# including on the login form. +# HORIZON_CONFIG["disable_password_reveal"] = False + +#LOCAL_PATH = os.path.dirname(os.path.abspath(__file__)) + +LOCAL_PATH = "/var/lib/horizon" + +# Set custom secret key: +# You can either set it to a specific value or you can let horizon generate a +# default secret key that is unique on this machine, e.i. regardless of the +# amount of Python WSGI workers (if used behind Apache+mod_wsgi): However, there +# may be situations where you would want to set this explicitly, e.g. when +# multiple dashboard instances are distributed on different machines (usually +# behind a load-balancer). Either you have to make sure that a session gets all +# requests routed to the same dashboard instance or you set the same SECRET_KEY +# for all of them. +from horizon.utils import secret_key +SECRET_KEY = secret_key.generate_or_read_from_file( + os.path.join(LOCAL_PATH, '.secret_key_store')) + +# We recommend you use memcached for development; otherwise after every reload +# of the django development server, you will have to login again. To use +# memcached set CACHES to something like +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', + 'LOCATION': '127.0.0.1:11211', + } +} + +#CACHES = { +# 'default': { +# 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache' +# } +#} + +# Send email to the console by default +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +# Or send them to /dev/null +#EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' + +# Configure these for your outgoing email host +# EMAIL_HOST = 'smtp.my-company.com' +# EMAIL_PORT = 25 +# EMAIL_HOST_USER = 'djangomail' +# EMAIL_HOST_PASSWORD = 'top-secret!' + +# For multiple regions uncomment this configuration, and add (endpoint, title). +# AVAILABLE_REGIONS = [ +# ('http://cluster1.example.com:5000/v2.0', 'cluster1'), +# ('http://cluster2.example.com:5000/v2.0', 'cluster2'), +# ] + +OPENSTACK_HOST = "127.0.0.1" +OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST +OPENSTACK_KEYSTONE_DEFAULT_ROLE = "_member_" + +# Disable SSL certificate checks (useful for self-signed certificates): +# OPENSTACK_SSL_NO_VERIFY = True + +# The CA certificate to use to verify SSL connections +# OPENSTACK_SSL_CACERT = '/path/to/cacert.pem' + +# The OPENSTACK_KEYSTONE_BACKEND settings can be used to identify the +# capabilities of the auth backend for Keystone. +# If Keystone has been configured to use LDAP as the auth backend then set +# can_edit_user to False and name to 'ldap'. +# +# TODO(tres): Remove these once Keystone has an API to identify auth backend. +OPENSTACK_KEYSTONE_BACKEND = { + 'name': 'native', + 'can_edit_user': True, + 'can_edit_group': True, + 'can_edit_project': True, + 'can_edit_domain': True, + 'can_edit_role': True +} + +#Setting this to True, will add a new "Retrieve Password" action on instance, +#allowing Admin session password retrieval/decryption. +#OPENSTACK_ENABLE_PASSWORD_RETRIEVE = False + +# The Xen Hypervisor has the ability to set the mount point for volumes +# attached to instances (other Hypervisors currently do not). Setting +# can_set_mount_point to True will add the option to set the mount point +# from the UI. +OPENSTACK_HYPERVISOR_FEATURES = { + 'can_set_mount_point': False, + 'can_set_password': False, +} + +# The OPENSTACK_CINDER_FEATURES settings can be used to enable optional +# services provided by cinder that is not exposed by its extension API. +OPENSTACK_CINDER_FEATURES = { + 'enable_backup': False, +} + +# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional +# services provided by neutron. Options currently available are load +# balancer service, security groups, quotas, VPN service. +OPENSTACK_NEUTRON_NETWORK = { + 'enable_router': True, + 'enable_quotas': True, + 'enable_ipv6': True, + 'enable_distributed_router': False, + 'enable_ha_router': False, + 'enable_lb': True, + 'enable_firewall': True, + 'enable_vpn': True, + # The profile_support option is used to detect if an external router can be + # configured via the dashboard. When using specific plugins the + # profile_support can be turned on if needed. + 'profile_support': None, + #'profile_support': 'cisco', + # Set which provider network types are supported. Only the network types + # in this list will be available to choose from when creating a network. + # Network types include local, flat, vlan, gre, and vxlan. + 'supported_provider_types': ['*'], +} + +# The OPENSTACK_IMAGE_BACKEND settings can be used to customize features +# in the OpenStack Dashboard related to the Image service, such as the list +# of supported image formats. +# OPENSTACK_IMAGE_BACKEND = { +# 'image_formats': [ +# ('', _('Select format')), +# ('aki', _('AKI - Amazon Kernel Image')), +# ('ami', _('AMI - Amazon Machine Image')), +# ('ari', _('ARI - Amazon Ramdisk Image')), +# ('iso', _('ISO - Optical Disk Image')), +# ('qcow2', _('QCOW2 - QEMU Emulator')), +# ('raw', _('Raw')), +# ('vdi', _('VDI')), +# ('vhd', _('VHD')), +# ('vmdk', _('VMDK')) +# ] +# } + +# The IMAGE_CUSTOM_PROPERTY_TITLES settings is used to customize the titles for +# image custom property attributes that appear on image detail pages. +IMAGE_CUSTOM_PROPERTY_TITLES = { + "architecture": _("Architecture"), + "kernel_id": _("Kernel ID"), + "ramdisk_id": _("Ramdisk ID"), + "image_state": _("Euca2ools state"), + "project_id": _("Project ID"), + "image_type": _("Image Type") +} + +# The IMAGE_RESERVED_CUSTOM_PROPERTIES setting is used to specify which image +# custom properties should not be displayed in the Image Custom Properties +# table. +IMAGE_RESERVED_CUSTOM_PROPERTIES = [] + +# OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints +# in the Keystone service catalog. Use this setting when Horizon is running +# external to the OpenStack environment. The default is 'publicURL'. +#OPENSTACK_ENDPOINT_TYPE = "publicURL" + +# SECONDARY_ENDPOINT_TYPE specifies the fallback endpoint type to use in the +# case that OPENSTACK_ENDPOINT_TYPE is not present in the endpoints +# in the Keystone service catalog. Use this setting when Horizon is running +# external to the OpenStack environment. The default is None. This +# value should differ from OPENSTACK_ENDPOINT_TYPE if used. +#SECONDARY_ENDPOINT_TYPE = "publicURL" + +# The number of objects (Swift containers/objects or images) to display +# on a single page before providing a paging element (a "more" link) +# to paginate results. +API_RESULT_LIMIT = 1000 +API_RESULT_PAGE_SIZE = 20 + +# Specify a maximum number of items to display in a dropdown. +DROPDOWN_MAX_ITEMS = 30 + +# The timezone of the server. This should correspond with the timezone +# of your entire OpenStack installation, and hopefully be in UTC. +TIME_ZONE = "UTC" + +# When launching an instance, the menu of available flavors is +# sorted by RAM usage, ascending. If you would like a different sort order, +# you can provide another flavor attribute as sorting key. Alternatively, you +# can provide a custom callback method to use for sorting. You can also provide +# a flag for reverse sort. For more info, see +# http://docs.python.org/2/library/functions.html#sorted +# CREATE_INSTANCE_FLAVOR_SORT = { +# 'key': 'name', +# # or +# 'key': my_awesome_callback_method, +# 'reverse': False, +# } + +# The Horizon Policy Enforcement engine uses these values to load per service +# policy rule files. The content of these files should match the files the +# OpenStack services are using to determine role based access control in the +# target installation. + +# Path to directory containing policy.json files +#POLICY_FILES_PATH = os.path.join(ROOT_PATH, "conf") +# Map of local copy of service policy files +#POLICY_FILES = { +# 'identity': 'keystone_policy.json', +# 'compute': 'nova_policy.json', +# 'volume': 'cinder_policy.json', +# 'image': 'glance_policy.json', +# 'orchestration': 'heat_policy.json', +# 'network': 'neutron_policy.json', +#} + +# Trove user and database extension support. By default support for +# creating users and databases on database instances is turned on. +# To disable these extensions set the permission here to something +# unusable such as ["!"]. +# TROVE_ADD_USER_PERMS = [] +# TROVE_ADD_DATABASE_PERMS = [] + +LOGGING = { + 'version': 1, + # When set to True this will disable all logging except + # for loggers specified in this configuration dictionary. Note that + # if nothing is specified here and disable_existing_loggers is True, + # django.db.backends will still log unless it is disabled explicitly. + 'disable_existing_loggers': False, + 'handlers': { + 'null': { + 'level': 'DEBUG', + 'class': 'django.utils.log.NullHandler', + }, + 'console': { + # Set the level to "DEBUG" for verbose output logging. + 'level': 'INFO', + 'class': 'logging.StreamHandler', + }, + }, + 'loggers': { + # Logging from django.db.backends is VERY verbose, send to null + # by default. + 'django.db.backends': { + 'handlers': ['null'], + 'propagate': False, + }, + 'requests': { + 'handlers': ['null'], + 'propagate': False, + }, + 'horizon': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'openstack_dashboard': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'novaclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'cinderclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'keystoneclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'glanceclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'neutronclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'heatclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'ceilometerclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'troveclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'swiftclient': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'openstack_auth': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'nose.plugins.manager': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'django': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': False, + }, + 'iso8601': { + 'handlers': ['null'], + 'propagate': False, + }, + 'scss': { + 'handlers': ['null'], + 'propagate': False, + }, + } +} + +# 'direction' should not be specified for all_tcp/udp/icmp. +# It is specified in the form. +SECURITY_GROUP_RULES = { + 'all_tcp': { + 'name': _('All TCP'), + 'ip_protocol': 'tcp', + 'from_port': '1', + 'to_port': '65535', + }, + 'all_udp': { + 'name': _('All UDP'), + 'ip_protocol': 'udp', + 'from_port': '1', + 'to_port': '65535', + }, + 'all_icmp': { + 'name': _('All ICMP'), + 'ip_protocol': 'icmp', + 'from_port': '-1', + 'to_port': '-1', + }, + 'ssh': { + 'name': 'SSH', + 'ip_protocol': 'tcp', + 'from_port': '22', + 'to_port': '22', + }, + 'smtp': { + 'name': 'SMTP', + 'ip_protocol': 'tcp', + 'from_port': '25', + 'to_port': '25', + }, + 'dns': { + 'name': 'DNS', + 'ip_protocol': 'tcp', + 'from_port': '53', + 'to_port': '53', + }, + 'http': { + 'name': 'HTTP', + 'ip_protocol': 'tcp', + 'from_port': '80', + 'to_port': '80', + }, + 'pop3': { + 'name': 'POP3', + 'ip_protocol': 'tcp', + 'from_port': '110', + 'to_port': '110', + }, + 'imap': { + 'name': 'IMAP', + 'ip_protocol': 'tcp', + 'from_port': '143', + 'to_port': '143', + }, + 'ldap': { + 'name': 'LDAP', + 'ip_protocol': 'tcp', + 'from_port': '389', + 'to_port': '389', + }, + 'https': { + 'name': 'HTTPS', + 'ip_protocol': 'tcp', + 'from_port': '443', + 'to_port': '443', + }, + 'smtps': { + 'name': 'SMTPS', + 'ip_protocol': 'tcp', + 'from_port': '465', + 'to_port': '465', + }, + 'imaps': { + 'name': 'IMAPS', + 'ip_protocol': 'tcp', + 'from_port': '993', + 'to_port': '993', + }, + 'pop3s': { + 'name': 'POP3S', + 'ip_protocol': 'tcp', + 'from_port': '995', + 'to_port': '995', + }, + 'ms_sql': { + 'name': 'MS SQL', + 'ip_protocol': 'tcp', + 'from_port': '1433', + 'to_port': '1433', + }, + 'mysql': { + 'name': 'MYSQL', + 'ip_protocol': 'tcp', + 'from_port': '3306', + 'to_port': '3306', + }, + 'rdp': { + 'name': 'RDP', + 'ip_protocol': 'tcp', + 'from_port': '3389', + 'to_port': '3389', + }, +} + +# Deprecation Notice: +# +# The setting FLAVOR_EXTRA_KEYS has been deprecated. +# Please load extra spec metadata into the Glance Metadata Definition Catalog. +# +# The sample quota definitions can be found in: +# /etc/metadefs/compute-quota.json +# +# The metadata definition catalog supports CLI and API: +# $glance --os-image-api-version 2 help md-namespace-import +# $glance-manage db_load_metadefs +# +# See Metadata Definitions on: http://docs.openstack.org/developer/glance/ + +# Indicate to the Sahara data processing service whether or not +# automatic floating IP allocation is in effect. If it is not +# in effect, the user will be prompted to choose a floating IP +# pool for use in their cluster. False by default. You would want +# to set this to True if you were running Nova Networking with +# auto_assign_floating_ip = True. +# SAHARA_AUTO_IP_ALLOCATION_ENABLED = False + +# The hash algorithm to use for authentication tokens. This must +# match the hash algorithm that the identity server and the +# auth_token middleware are using. Allowed values are the +# algorithms supported by Python's hashlib library. +# OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5' + diff --git a/openstack/etc/hosts b/openstack/etc/hosts new file mode 100644 index 00000000..b35139ac --- /dev/null +++ b/openstack/etc/hosts @@ -0,0 +1,2 @@ +127.0.0.1 localhost onenode +::1 localhost diff --git a/openstack/etc/keystone/keystone-paste.ini b/openstack/etc/keystone/keystone-paste.ini new file mode 100644 index 00000000..cd132971 --- /dev/null +++ b/openstack/etc/keystone/keystone-paste.ini @@ -0,0 +1,112 @@ +# Keystone PasteDeploy configuration file. + +[filter:debug] +paste.filter_factory = keystone.common.wsgi:Debug.factory + +[filter:build_auth_context] +paste.filter_factory = keystone.middleware:AuthContextMiddleware.factory + +[filter:token_auth] +paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory + +[filter:admin_token_auth] +paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory + +[filter:xml_body] +paste.filter_factory = keystone.middleware:XmlBodyMiddleware.factory + +[filter:xml_body_v2] +paste.filter_factory = keystone.middleware:XmlBodyMiddlewareV2.factory + +[filter:xml_body_v3] +paste.filter_factory = keystone.middleware:XmlBodyMiddlewareV3.factory + +[filter:json_body] +paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory + +[filter:user_crud_extension] +paste.filter_factory = keystone.contrib.user_crud:CrudExtension.factory + +[filter:crud_extension] +paste.filter_factory = keystone.contrib.admin_crud:CrudExtension.factory + +[filter:ec2_extension] +paste.filter_factory = keystone.contrib.ec2:Ec2Extension.factory + +[filter:ec2_extension_v3] +paste.filter_factory = keystone.contrib.ec2:Ec2ExtensionV3.factory + +[filter:federation_extension] +paste.filter_factory = keystone.contrib.federation.routers:FederationExtension.factory + +[filter:oauth1_extension] +paste.filter_factory = keystone.contrib.oauth1.routers:OAuth1Extension.factory + +[filter:s3_extension] +paste.filter_factory = keystone.contrib.s3:S3Extension.factory + +[filter:endpoint_filter_extension] +paste.filter_factory = keystone.contrib.endpoint_filter.routers:EndpointFilterExtension.factory + +[filter:simple_cert_extension] +paste.filter_factory = keystone.contrib.simple_cert:SimpleCertExtension.factory + +[filter:revoke_extension] +paste.filter_factory = keystone.contrib.revoke.routers:RevokeExtension.factory + +[filter:url_normalize] +paste.filter_factory = keystone.middleware:NormalizingFilter.factory + +[filter:sizelimit] +paste.filter_factory = keystone.middleware:RequestBodySizeLimiter.factory + +[filter:stats_monitoring] +paste.filter_factory = keystone.contrib.stats:StatsMiddleware.factory + +[filter:stats_reporting] +paste.filter_factory = keystone.contrib.stats:StatsExtension.factory + +[filter:access_log] +paste.filter_factory = keystone.contrib.access:AccessLogMiddleware.factory + +[app:public_service] +paste.app_factory = keystone.service:public_app_factory + +[app:service_v3] +paste.app_factory = keystone.service:v3_app_factory + +[app:admin_service] +paste.app_factory = keystone.service:admin_app_factory + +[pipeline:public_api] +pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v2 json_body ec2_extension user_crud_extension public_service + +[pipeline:admin_api] +pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v2 json_body ec2_extension s3_extension crud_extension admin_service + +[pipeline:api_v3] +pipeline = sizelimit url_normalize build_auth_context token_auth admin_token_auth xml_body_v3 json_body ec2_extension_v3 s3_extension simple_cert_extension service_v3 + +[app:public_version_service] +paste.app_factory = keystone.service:public_version_app_factory + +[app:admin_version_service] +paste.app_factory = keystone.service:admin_version_app_factory + +[pipeline:public_version_api] +pipeline = sizelimit url_normalize xml_body public_version_service + +[pipeline:admin_version_api] +pipeline = sizelimit url_normalize xml_body admin_version_service + +[composite:main] +use = egg:Paste#urlmap +/v2.0 = public_api +/v3 = api_v3 +/ = public_version_api + +[composite:admin] +use = egg:Paste#urlmap +/v2.0 = admin_api +/v3 = api_v3 +/ = admin_version_api diff --git a/openstack/etc/keystone/keystone.conf b/openstack/etc/keystone/keystone.conf new file mode 100644 index 00000000..a46cc5fc --- /dev/null +++ b/openstack/etc/keystone/keystone.conf @@ -0,0 +1,1384 @@ +[DEFAULT] + +# +# Options defined in keystone +# + +# A "shared secret" that can be used to bootstrap Keystone. +# This "token" does not represent a user, and carries no +# explicit authorization. To disable in production (highly +# recommended), remove AdminTokenAuthMiddleware from your +# paste application pipelines (for example, in keystone- +# paste.ini). (string value) +admin_token=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## + +# The IP address of the network interface for the public +# service to listen on. (string value) +# Deprecated group/name - [DEFAULT]/bind_host +#public_bind_host=0.0.0.0 + +# The IP address of the network interface for the admin +# service to listen on. (string value) +# Deprecated group/name - [DEFAULT]/bind_host +#admin_bind_host=0.0.0.0 + +# The port which the OpenStack Compute service listens on. +# (integer value) +compute_port=8774 + +# The port number which the admin service listens on. (integer +# value) +admin_port=35357 + +# The port number which the public service listens on. +# (integer value) +public_port=5000 + +# The base public endpoint URL for Keystone that is advertised +# to clients (NOTE: this does NOT affect how Keystone listens +# for connections). Defaults to the base host URL of the +# request. E.g. a request to http://server:5000/v2.0/users +# will default to http://server:5000. You should only need to +# set this value if the base URL contains a path (e.g. +# /prefix/v2.0) or the endpoint should be found on a different +# server. (string value) +#public_endpoint= + +# The base admin endpoint URL for Keystone that is advertised +# to clients (NOTE: this does NOT affect how Keystone listens +# for connections). Defaults to the base host URL of the +# request. E.g. a request to http://server:35357/v2.0/users +# will default to http://server:35357. You should only need to +# set this value if the base URL contains a path (e.g. +# /prefix/v2.0) or the endpoint should be found on a different +# server. (string value) +#admin_endpoint= + +# The number of worker processes to serve the public WSGI +# application (integer value) +#public_workers=1 + +# The number of worker processes to serve the admin WSGI +# application (integer value) +#admin_workers=1 + +# Enforced by optional sizelimit middleware +# (keystone.middleware:RequestBodySizeLimiter). (integer +# value) +#max_request_body_size=114688 + +# Limit the sizes of user & project ID/names. (integer value) +#max_param_size=64 + +# Similar to max_param_size, but provides an exception for +# token values. (integer value) +#max_token_size=8192 + +# During a SQL upgrade member_role_id will be used to create a +# new role that will replace records in the assignment table +# with explicit role grants. After migration, the +# member_role_id will be used in the API add_user_to_project. +# (string value) +#member_role_id=9fe2ff9ee4384b1894a90878d3e92bab + +# During a SQL upgrade member_role_name will be used to create +# a new role that will replace records in the assignment table +# with explicit role grants. After migration, member_role_name +# will be ignored. (string value) +#member_role_name=_member_ + +# The value passed as the keyword "rounds" to passlib's +# encrypt method. (integer value) +#crypt_strength=40000 + +# Set this to true if you want to enable TCP_KEEPALIVE on +# server sockets, i.e. sockets used by the Keystone wsgi +# server for client connections. (boolean value) +#tcp_keepalive=false + +# Sets the value of TCP_KEEPIDLE in seconds for each server +# socket. Only applies if tcp_keepalive is true. Not supported +# on OS X. (integer value) +#tcp_keepidle=600 + +# The maximum number of entities that will be returned in a +# collection, with no limit set by default. This global limit +# may be then overridden for a specific driver, by specifying +# a list_limit in the appropriate section (e.g. [assignment]). +# (integer value) +#list_limit= + +# Set this to false if you want to enable the ability for +# user, group and project entities to be moved between domains +# by updating their domain_id. Allowing such movement is not +# recommended if the scope of a domain admin is being +# restricted by use of an appropriate policy file (see +# policy.v3cloudsample as an example). (boolean value) +#domain_id_immutable=true + +# If set to true, strict password length checking is performed +# for password manipulation. If a password exceeds the maximum +# length, the operation will fail with an HTTP 403 Forbidden +# error. If set to false, passwords are automatically +# truncated to the maximum length. (boolean value) +#strict_password_check=false + + +# +# Options defined in oslo.messaging +# + +# Use durable queues in amqp. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_durable_queues +#amqp_durable_queues=false + +# Auto-delete queues in amqp. (boolean value) +#amqp_auto_delete=false + +# Size of RPC connection pool. (integer value) +#rpc_conn_pool_size=30 + +# Modules of exceptions that are permitted to be recreated +# upon receiving exception data from an rpc call. (list value) +#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions + +# Qpid broker hostname. (string value) +#qpid_hostname=keystone + +# Qpid broker port. (integer value) +#qpid_port=5672 + +# Qpid HA cluster host:port pairs. (list value) +#qpid_hosts=$qpid_hostname:$qpid_port + +# Username for Qpid connection. (string value) +#qpid_username= + +# Password for Qpid connection. (string value) +#qpid_password= + +# Space separated list of SASL mechanisms to use for auth. +# (string value) +#qpid_sasl_mechanisms= + +# Seconds between connection keepalive heartbeats. (integer +# value) +#qpid_heartbeat=60 + +# Transport to use, either 'tcp' or 'ssl'. (string value) +#qpid_protocol=tcp + +# Whether to disable the Nagle algorithm. (boolean value) +#qpid_tcp_nodelay=true + +# The qpid topology version to use. Version 1 is what was +# originally used by impl_qpid. Version 2 includes some +# backwards-incompatible changes that allow broker federation +# to work. Users should update to version 2 when they are +# able to take everything down, as it requires a clean break. +# (integer value) +#qpid_topology_version=1 + +# SSL version to use (valid only if SSL enabled). valid values +# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some +# distributions. (string value) +#kombu_ssl_version= + +# SSL key file (valid only if SSL enabled). (string value) +#kombu_ssl_keyfile= + +# SSL cert file (valid only if SSL enabled). (string value) +#kombu_ssl_certfile= + +# SSL certification authority file (valid only if SSL +# enabled). (string value) +#kombu_ssl_ca_certs= + +# How long to wait before reconnecting in response to an AMQP +# consumer cancel notification. (floating point value) +#kombu_reconnect_delay=1.0 + +# The RabbitMQ broker address where a single node is used. +# (string value) +rabbit_host=##RABBITMQ_HOST## + +# The RabbitMQ broker port where a single node is used. +# (integer value) +rabbit_port=##RABBITMQ_PORT## + +# RabbitMQ HA cluster host:port pairs. (list value) +rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +rabbit_userid=##RABBITMQ_USER## + +# The RabbitMQ password. (string value) +rabbit_password=##RABBITMQ_PASSWORD## + +# the RabbitMQ login method (string value) +#rabbit_login_method=AMQPLAIN + +# The RabbitMQ virtual host. (string value) +#rabbit_virtual_host=/ + +# How frequently to retry connecting with RabbitMQ. (integer +# value) +#rabbit_retry_interval=1 + +# How long to backoff for between retries when connecting to +# RabbitMQ. (integer value) +#rabbit_retry_backoff=2 + +# Maximum number of RabbitMQ connection retries. Default is 0 +# (infinite retry count). (integer value) +#rabbit_max_retries=0 + +# Use HA queues in RabbitMQ (x-ha-policy: all). If you change +# this option, you must wipe the RabbitMQ database. (boolean +# value) +#rabbit_ha_queues=false + +# If passed, use a fake RabbitMQ provider. (boolean value) +#fake_rabbit=false + +# ZeroMQ bind address. Should be a wildcard (*), an ethernet +# interface, or IP. The "host" option should point or resolve +# to this address. (string value) +#rpc_zmq_bind_address=* + +# MatchMaker driver. (string value) +#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + +# ZeroMQ receiver listening port. (integer value) +#rpc_zmq_port=9501 + +# Number of ZeroMQ contexts, defaults to 1. (integer value) +#rpc_zmq_contexts=1 + +# Maximum number of ingress messages to locally buffer per +# topic. Default is unlimited. (integer value) +#rpc_zmq_topic_backlog= + +# Directory for holding IPC sockets. (string value) +#rpc_zmq_ipc_dir=/var/run/openstack + +# Name of this node. Must be a valid hostname, FQDN, or IP +# address. Must match "host" option, if running Nova. (string +# value) +#rpc_zmq_host=keystone + +# Seconds to wait before a cast expires (TTL). Only supported +# by impl_zmq. (integer value) +#rpc_cast_timeout=30 + +# Heartbeat frequency. (integer value) +#matchmaker_heartbeat_freq=300 + +# Heartbeat time-to-live. (integer value) +#matchmaker_heartbeat_ttl=600 + +# Host to locate redis. (string value) +#host=localhost + +# Use this port to connect to redis host. (integer value) +#port=6379 + +# Password for Redis server (optional). (string value) +#password= + +# Size of RPC greenthread pool. (integer value) +#rpc_thread_pool_size=64 + +# Driver or drivers to handle sending notifications. (multi +# valued) +#notification_driver= + +# AMQP topic used for OpenStack notifications. (list value) +# Deprecated group/name - [rpc_notifier2]/topics +#notification_topics=notifications + +# Seconds to wait for a response from a call. (integer value) +#rpc_response_timeout=60 + +# A URL representing the messaging driver to use and its full +# configuration. If not set, we fall back to the rpc_backend +# option and driver specific configuration. (string value) +#transport_url= + +# The messaging driver to use, defaults to rabbit. Other +# drivers include qpid and zmq. (string value) +rpc_backend=rabbit + +# The default exchange under which topics are scoped. May be +# overridden by an exchange name specified in the +# transport_url option. (string value) +#control_exchange=openstack + + +# +# Options defined in keystone.notifications +# + +# Default publisher_id for outgoing notifications (string +# value) +#default_publisher_id= + + +# +# Options defined in keystone.middleware.ec2_token +# + +# URL to get token from ec2 request. (string value) +#keystone_ec2_url=http://localhost:5000/v2.0/ec2tokens + +# Required if EC2 server requires client certificate. (string +# value) +#keystone_ec2_keyfile= + +# Client certificate key filename. Required if EC2 server +# requires client certificate. (string value) +#keystone_ec2_certfile= + +# A PEM encoded certificate authority to use when verifying +# HTTPS connections. Defaults to the system CAs. (string +# value) +#keystone_ec2_cafile= + +# Disable SSL certificate verification. (boolean value) +#keystone_ec2_insecure=false + + +# +# Options defined in keystone.openstack.common.eventlet_backdoor +# + +# Enable eventlet backdoor. Acceptable values are 0, , +# and :, where 0 results in listening on a random +# tcp port number; results in listening on the +# specified port number (and not enabling backdoor if that +# port is in use); and : results in listening on +# the smallest unused port number within the specified range +# of port numbers. The chosen port is displayed in the +# service's log file. (string value) +#backdoor_port= + + +# +# Options defined in keystone.openstack.common.lockutils +# + +# Enables or disables inter-process locks. (boolean value) +#disable_process_locking=false + +# Directory to use for lock files. (string value) +#lock_path= + + +# +# Options defined in keystone.openstack.common.log +# + +# Print debugging output (set logging level to DEBUG instead +# of default WARNING level). (boolean value) +#debug=false + +# Print more verbose output (set logging level to INFO instead +# of default WARNING level). (boolean value) +#verbose=false + +# Log output to standard error. (boolean value) +#use_stderr=true + +# Format string to use for log messages with context. (string +# value) +#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s + +# Format string to use for log messages without context. +# (string value) +#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s + +# Data to append to log format when level is DEBUG. (string +# value) +#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d + +# Prefix each line of exception output with this format. +# (string value) +#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s + +# List of logger=LEVEL pairs. (list value) +#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN + +# Enables or disables publication of error events. (boolean +# value) +#publish_errors=false + +# Enables or disables fatal status of deprecations. (boolean +# value) +#fatal_deprecations=false + +# The format for an instance that is passed with the log +# message. (string value) +#instance_format="[instance: %(uuid)s] " + +# The format for an instance UUID that is passed with the log +# message. (string value) +#instance_uuid_format="[instance: %(uuid)s] " + +# The name of a logging configuration file. This file is +# appended to any existing logging configuration files. For +# details about logging configuration files, see the Python +# logging module documentation. (string value) +# Deprecated group/name - [DEFAULT]/log_config +#log_config_append= + +# DEPRECATED. A logging.Formatter log message format string +# which may use any of the available logging.LogRecord +# attributes. This option is deprecated. Please use +# logging_context_format_string and +# logging_default_format_string instead. (string value) +#log_format= + +# Format string for %%(asctime)s in log records. Default: +# %(default)s . (string value) +#log_date_format=%Y-%m-%d %H:%M:%S + +# (Optional) Name of log file to output to. If no default is +# set, logging will go to stdout. (string value) +# Deprecated group/name - [DEFAULT]/logfile +#log_file= + +# (Optional) The base directory used for relative --log-file +# paths. (string value) +# Deprecated group/name - [DEFAULT]/logdir +#log_dir= + +# Use syslog for logging. Existing syslog format is DEPRECATED +# during I, and will chang in J to honor RFC5424. (boolean +# value) +#use_syslog=false + +# (Optional) Enables or disables syslog rfc5424 format for +# logging. If enabled, prefixes the MSG part of the syslog +# message with APP-NAME (RFC5424). The format without the APP- +# NAME is deprecated in I, and will be removed in J. (boolean +# value) +#use_syslog_rfc_format=false + +# Syslog facility to receive log lines. (string value) +#syslog_log_facility=LOG_USER + + +# +# Options defined in keystone.openstack.common.policy +# + +# The JSON file that defines policies. (string value) +#policy_file=policy.json + +# Default rule. Enforced when a requested rule is not found. +# (string value) +#policy_default_rule=default + + +[assignment] + +# +# Options defined in keystone +# + +# Assignment backend driver. (string value) +#driver= + +# Toggle for assignment caching. This has no effect unless +# global caching is enabled. (boolean value) +#caching=true + +# TTL (in seconds) to cache assignment data. This has no +# effect unless global caching is enabled. (integer value) +#cache_time= + +# Maximum number of entities that will be returned in an +# assignment collection. (integer value) +#list_limit= + + +[auth] + +# +# Options defined in keystone +# + +# Default auth methods. (list value) +#methods=external,password,token + +# The password auth plugin module. (string value) +#password=keystone.auth.plugins.password.Password + +# The token auth plugin module. (string value) +#token=keystone.auth.plugins.token.Token + +# The external (REMOTE_USER) auth plugin module. (string +# value) +#external=keystone.auth.plugins.external.DefaultDomain + + +[cache] + +# +# Options defined in keystone +# + +# Prefix for building the configuration dictionary for the +# cache region. This should not need to be changed unless +# there is another dogpile.cache region with the same +# configuration name. (string value) +#config_prefix=cache.keystone + +# Default TTL, in seconds, for any cached item in the +# dogpile.cache region. This applies to any cached method that +# doesn't have an explicit cache expiration time defined for +# it. (integer value) +#expiration_time=600 + +# Dogpile.cache backend module. It is recommended that +# Memcache (dogpile.cache.memcached) or Redis +# (dogpile.cache.redis) be used in production deployments. +# Small workloads (single process) like devstack can use the +# dogpile.cache.memory backend. (string value) +#backend=keystone.common.cache.noop + +# Use a key-mangling function (sha1) to ensure fixed length +# cache-keys. This is toggle-able for debugging purposes, it +# is highly recommended to always leave this set to true. +# (boolean value) +#use_key_mangler=true + +# Arguments supplied to the backend module. Specify this +# option once per argument to be passed to the dogpile.cache +# backend. Example format: ":". (multi valued) +#backend_argument= + +# Proxy classes to import that will affect the way the +# dogpile.cache backend functions. See the dogpile.cache +# documentation on changing-backend-behavior. (list value) +#proxies= + +# Global toggle for all caching using the should_cache_fn +# mechanism. (boolean value) +#enabled=false + +# Extra debugging from the cache backend (cache keys, +# get/set/delete/etc calls). This is only really useful if you +# need to see the specific cache-backend get/set/delete calls +# with the keys/values. Typically this should be left set to +# false. (boolean value) +#debug_cache_backend=false + + +[catalog] + +# +# Options defined in keystone +# + +# Catalog template file name for use with the template catalog +# backend. (string value) +#template_file=default_catalog.templates + +# Catalog backend driver. (string value) +#driver=keystone.catalog.backends.sql.Catalog + +# Maximum number of entities that will be returned in a +# catalog collection. (integer value) +#list_limit= + + +[credential] + +# +# Options defined in keystone +# + +# Credential backend driver. (string value) +#driver=keystone.credential.backends.sql.Credential + + +[database] + +# +# Options defined in oslo.db +# + +# The file name to use with SQLite. (string value) +#sqlite_db=oslo.sqlite + +# If True, SQLite uses synchronous mode. (boolean value) +#sqlite_synchronous=true + +# The back end to use for the database. (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend=sqlalchemy + +# The SQLAlchemy connection string to use to connect to the +# database. (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +# Deprecated group/name - [sql]/connection +#connection= +connection=postgresql://##KEYSTONE_DB_USER##:##KEYSTONE_DB_PASSWORD##@onenode/keystone + +# The SQLAlchemy connection string to use to connect to the +# slave database. (string value) +#slave_connection= + +# The SQL mode to be used for MySQL sessions. This option, +# including the default, overrides any server-set SQL mode. To +# use whatever SQL mode is set by the server configuration, +# set this to no value. Example: mysql_sql_mode= (string +# value) +#mysql_sql_mode=TRADITIONAL + +# Timeout before idle SQL connections are reaped. (integer +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/sql_idle_timeout +# Deprecated group/name - [sql]/idle_timeout +#idle_timeout=3600 + +# Minimum number of SQL connections to keep open in a pool. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_min_pool_size +# Deprecated group/name - [DATABASE]/sql_min_pool_size +#min_pool_size=1 + +# Maximum number of SQL connections to keep open in a pool. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_pool_size +# Deprecated group/name - [DATABASE]/sql_max_pool_size +#max_pool_size= + +# Maximum db connection retries during startup. Set to -1 to +# specify an infinite retry count. (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_retries +# Deprecated group/name - [DATABASE]/sql_max_retries +#max_retries=10 + +# Interval between retries of opening a SQL connection. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_retry_interval +# Deprecated group/name - [DATABASE]/reconnect_interval +#retry_interval=10 + +# If set, use this value for max_overflow with SQLAlchemy. +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_overflow +# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow +#max_overflow= + +# Verbosity of SQL debugging information: 0=None, +# 100=Everything. (integer value) +# Deprecated group/name - [DEFAULT]/sql_connection_debug +#connection_debug=0 + +# Add Python stack traces to SQL as comment strings. (boolean +# value) +# Deprecated group/name - [DEFAULT]/sql_connection_trace +#connection_trace=false + +# If set, use this value for pool_timeout with SQLAlchemy. +# (integer value) +# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout +#pool_timeout= + +# Enable the experimental use of database reconnect on +# connection lost. (boolean value) +#use_db_reconnect=false + +# Seconds between database connection retries. (integer value) +#db_retry_interval=1 + +# If True, increases the interval between database connection +# retries up to db_max_retry_interval. (boolean value) +#db_inc_retry_interval=true + +# If db_inc_retry_interval is set, the maximum seconds between +# database connection retries. (integer value) +#db_max_retry_interval=10 + +# Maximum database connection retries before error is raised. +# Set to -1 to specify an infinite retry count. (integer +# value) +#db_max_retries=20 + + +[ec2] + +# +# Options defined in keystone +# + +# EC2Credential backend driver. (string value) +#driver=keystone.contrib.ec2.backends.kvs.Ec2 + + +[endpoint_filter] + +# +# Options defined in keystone +# + +# Endpoint Filter backend driver (string value) +#driver=keystone.contrib.endpoint_filter.backends.sql.EndpointFilter + +# Toggle to return all active endpoints if no filter exists. +# (boolean value) +#return_all_endpoints_if_no_filter=true + + +[federation] + +# +# Options defined in keystone +# + +# Federation backend driver. (string value) +#driver=keystone.contrib.federation.backends.sql.Federation + +# Value to be used when filtering assertion parameters from +# the environment. (string value) +#assertion_prefix= + + +[identity] + +# +# Options defined in keystone +# + +# This references the domain to use for all Identity API v2 +# requests (which are not aware of domains). A domain with +# this ID will be created for you by keystone-manage db_sync +# in migration 008. The domain referenced by this ID cannot be +# deleted on the v3 API, to prevent accidentally breaking the +# v2 API. There is nothing special about this domain, other +# than the fact that it must exist to order to maintain +# support for your v2 clients. (string value) +#default_domain_id=default + +# A subset (or all) of domains can have their own identity +# driver, each with their own partial configuration file in a +# domain configuration directory. Only values specific to the +# domain need to be placed in the domain specific +# configuration file. This feature is disabled by default; set +# to true to enable. (boolean value) +#domain_specific_drivers_enabled=false + +# Path for Keystone to locate the domain specific identity +# configuration files if domain_specific_drivers_enabled is +# set to true. (string value) +#domain_config_dir=/etc/keystone/domains + +# Identity backend driver. (string value) +#driver=keystone.identity.backends.sql.Identity + +# Maximum supported length for user passwords; decrease to +# improve performance. (integer value) +#max_password_length=4096 + +# Maximum number of entities that will be returned in an +# identity collection. (integer value) +#list_limit= + + +[kvs] + +# +# Options defined in keystone +# + +# Extra dogpile.cache backend modules to register with the +# dogpile.cache library. (list value) +#backends= + +# Prefix for building the configuration dictionary for the KVS +# region. This should not need to be changed unless there is +# another dogpile.cache region with the same configuration +# name. (string value) +#config_prefix=keystone.kvs + +# Toggle to disable using a key-mangling function to ensure +# fixed length keys. This is toggle-able for debugging +# purposes, it is highly recommended to always leave this set +# to true. (boolean value) +#enable_key_mangler=true + +# Default lock timeout for distributed locking. (integer +# value) +#default_lock_timeout=5 + + +[ldap] + +# +# Options defined in keystone +# + +# URL for connecting to the LDAP server. (string value) +#url=ldap://keystone + +# User BindDN to query the LDAP server. (string value) +#user= + +# Password for the BindDN to query the LDAP server. (string +# value) +#password= + +# LDAP server suffix (string value) +#suffix=cn=example,cn=com + +# If true, will add a dummy member to groups. This is required +# if the objectclass for groups requires the "member" +# attribute. (boolean value) +#use_dumb_member=false + +# DN of the "dummy member" to use when "use_dumb_member" is +# enabled. (string value) +#dumb_member=cn=dumb,dc=nonexistent + +# Delete subtrees using the subtree delete control. Only +# enable this option if your LDAP server supports subtree +# deletion. (boolean value) +#allow_subtree_delete=false + +# The LDAP scope for queries, this can be either "one" +# (onelevel/singleLevel) or "sub" (subtree/wholeSubtree). +# (string value) +#query_scope=one + +# Maximum results per page; a value of zero ("0") disables +# paging. (integer value) +#page_size=0 + +# The LDAP dereferencing option for queries. This can be +# either "never", "searching", "always", "finding" or +# "default". The "default" option falls back to using default +# dereferencing configured by your ldap.conf. (string value) +#alias_dereferencing=default + +# Sets the LDAP debugging level for LDAP calls. A value of 0 +# means that debugging is not enabled. This value is a +# bitmask, consult your LDAP documentation for possible +# values. (integer value) +#debug_level= + +# Override the system's default referral chasing behavior for +# queries. (boolean value) +#chase_referrals= + +# Search base for users. (string value) +#user_tree_dn= + +# LDAP search filter for users. (string value) +#user_filter= + +# LDAP objectclass for users. (string value) +#user_objectclass=inetOrgPerson + +# LDAP attribute mapped to user id. (string value) +#user_id_attribute=cn + +# LDAP attribute mapped to user name. (string value) +#user_name_attribute=sn + +# LDAP attribute mapped to user email. (string value) +#user_mail_attribute=email + +# LDAP attribute mapped to password. (string value) +#user_pass_attribute=userPassword + +# LDAP attribute mapped to user enabled flag. (string value) +#user_enabled_attribute=enabled + +# Bitmask integer to indicate the bit that the enabled value +# is stored in if the LDAP server represents "enabled" as a +# bit on an integer rather than a boolean. A value of "0" +# indicates the mask is not used. If this is not set to "0" +# the typical value is "2". This is typically used when +# "user_enabled_attribute = userAccountControl". (integer +# value) +#user_enabled_mask=0 + +# Default value to enable users. This should match an +# appropriate int value if the LDAP server uses non-boolean +# (bitmask) values to indicate if a user is enabled or +# disabled. If this is not set to "True" the typical value is +# "512". This is typically used when "user_enabled_attribute = +# userAccountControl". (string value) +#user_enabled_default=True + +# List of attributes stripped off the user on update. (list +# value) +#user_attribute_ignore=default_project_id,tenants + +# LDAP attribute mapped to default_project_id for users. +# (string value) +#user_default_project_id_attribute= + +# Allow user creation in LDAP backend. (boolean value) +#user_allow_create=true + +# Allow user updates in LDAP backend. (boolean value) +#user_allow_update=true + +# Allow user deletion in LDAP backend. (boolean value) +#user_allow_delete=true + +# If true, Keystone uses an alternative method to determine if +# a user is enabled or not by checking if they are a member of +# the "user_enabled_emulation_dn" group. (boolean value) +#user_enabled_emulation=false + +# DN of the group entry to hold enabled users when using +# enabled emulation. (string value) +#user_enabled_emulation_dn= + +# List of additional LDAP attributes used for mapping +# additional attribute mappings for users. Attribute mapping +# format is :, where ldap_attr is the +# attribute in the LDAP entry and user_attr is the Identity +# API attribute. (list value) +#user_additional_attribute_mapping= + +# Search base for projects (string value) +# Deprecated group/name - [ldap]/tenant_tree_dn +#project_tree_dn= + +# LDAP search filter for projects. (string value) +# Deprecated group/name - [ldap]/tenant_filter +#project_filter= + +# LDAP objectclass for projects. (string value) +# Deprecated group/name - [ldap]/tenant_objectclass +#project_objectclass=groupOfNames + +# LDAP attribute mapped to project id. (string value) +# Deprecated group/name - [ldap]/tenant_id_attribute +#project_id_attribute=cn + +# LDAP attribute mapped to project membership for user. +# (string value) +# Deprecated group/name - [ldap]/tenant_member_attribute +#project_member_attribute=member + +# LDAP attribute mapped to project name. (string value) +# Deprecated group/name - [ldap]/tenant_name_attribute +#project_name_attribute=ou + +# LDAP attribute mapped to project description. (string value) +# Deprecated group/name - [ldap]/tenant_desc_attribute +#project_desc_attribute=description + +# LDAP attribute mapped to project enabled. (string value) +# Deprecated group/name - [ldap]/tenant_enabled_attribute +#project_enabled_attribute=enabled + +# LDAP attribute mapped to project domain_id. (string value) +# Deprecated group/name - [ldap]/tenant_domain_id_attribute +#project_domain_id_attribute=businessCategory + +# List of attributes stripped off the project on update. (list +# value) +# Deprecated group/name - [ldap]/tenant_attribute_ignore +#project_attribute_ignore= + +# Allow project creation in LDAP backend. (boolean value) +# Deprecated group/name - [ldap]/tenant_allow_create +#project_allow_create=true + +# Allow project update in LDAP backend. (boolean value) +# Deprecated group/name - [ldap]/tenant_allow_update +#project_allow_update=true + +# Allow project deletion in LDAP backend. (boolean value) +# Deprecated group/name - [ldap]/tenant_allow_delete +#project_allow_delete=true + +# If true, Keystone uses an alternative method to determine if +# a project is enabled or not by checking if they are a member +# of the "project_enabled_emulation_dn" group. (boolean value) +# Deprecated group/name - [ldap]/tenant_enabled_emulation +#project_enabled_emulation=false + +# DN of the group entry to hold enabled projects when using +# enabled emulation. (string value) +# Deprecated group/name - [ldap]/tenant_enabled_emulation_dn +#project_enabled_emulation_dn= + +# Additional attribute mappings for projects. Attribute +# mapping format is :, where ldap_attr +# is the attribute in the LDAP entry and user_attr is the +# Identity API attribute. (list value) +# Deprecated group/name - [ldap]/tenant_additional_attribute_mapping +#project_additional_attribute_mapping= + +# Search base for roles. (string value) +#role_tree_dn= + +# LDAP search filter for roles. (string value) +#role_filter= + +# LDAP objectclass for roles. (string value) +#role_objectclass=organizationalRole + +# LDAP attribute mapped to role id. (string value) +#role_id_attribute=cn + +# LDAP attribute mapped to role name. (string value) +#role_name_attribute=ou + +# LDAP attribute mapped to role membership. (string value) +#role_member_attribute=roleOccupant + +# List of attributes stripped off the role on update. (list +# value) +#role_attribute_ignore= + +# Allow role creation in LDAP backend. (boolean value) +#role_allow_create=true + +# Allow role update in LDAP backend. (boolean value) +#role_allow_update=true + +# Allow role deletion in LDAP backend. (boolean value) +#role_allow_delete=true + +# Additional attribute mappings for roles. Attribute mapping +# format is :, where ldap_attr is the +# attribute in the LDAP entry and user_attr is the Identity +# API attribute. (list value) +#role_additional_attribute_mapping= + +# Search base for groups. (string value) +#group_tree_dn= + +# LDAP search filter for groups. (string value) +#group_filter= + +# LDAP objectclass for groups. (string value) +#group_objectclass=groupOfNames + +# LDAP attribute mapped to group id. (string value) +#group_id_attribute=cn + +# LDAP attribute mapped to group name. (string value) +#group_name_attribute=ou + +# LDAP attribute mapped to show group membership. (string +# value) +#group_member_attribute=member + +# LDAP attribute mapped to group description. (string value) +#group_desc_attribute=description + +# List of attributes stripped off the group on update. (list +# value) +#group_attribute_ignore= + +# Allow group creation in LDAP backend. (boolean value) +#group_allow_create=true + +# Allow group update in LDAP backend. (boolean value) +#group_allow_update=true + +# Allow group deletion in LDAP backend. (boolean value) +#group_allow_delete=true + +# Additional attribute mappings for groups. Attribute mapping +# format is :, where ldap_attr is the +# attribute in the LDAP entry and user_attr is the Identity +# API attribute. (list value) +#group_additional_attribute_mapping= + +# CA certificate file path for communicating with LDAP +# servers. (string value) +#tls_cacertfile= + +# CA certificate directory path for communicating with LDAP +# servers. (string value) +#tls_cacertdir= + +# Enable TLS for communicating with LDAP servers. (boolean +# value) +#use_tls=false + +# Valid options for tls_req_cert are demand, never, and allow. +# (string value) +#tls_req_cert=demand + + +[matchmaker_ring] + +# +# Options defined in oslo.messaging +# + +# Matchmaker ring file (JSON). (string value) +# Deprecated group/name - [DEFAULT]/matchmaker_ringfile +#ringfile=/etc/oslo/matchmaker_ring.json + + +[memcache] + +# +# Options defined in keystone +# + +# Memcache servers in the format of "host:port". (list value) +#servers=localhost:11211 + +# Number of compare-and-set attempts to make when using +# compare-and-set in the token memcache back end. (integer +# value) +#max_compare_and_set_retry=16 + + +[oauth1] + +# +# Options defined in keystone +# + +# Credential backend driver. (string value) +#driver=keystone.contrib.oauth1.backends.sql.OAuth1 + +# Duration (in seconds) for the OAuth Request Token. (integer +# value) +#request_token_duration=28800 + +# Duration (in seconds) for the OAuth Access Token. (integer +# value) +#access_token_duration=86400 + + +[os_inherit] + +# +# Options defined in keystone +# + +# role-assignment inheritance to projects from owning domain +# can be optionally enabled. (boolean value) +#enabled=false + + +[paste_deploy] + +# +# Options defined in keystone +# + +# Name of the paste configuration file that defines the +# available pipelines. (string value) +#config_file=keystone-paste.ini + + +[policy] + +# +# Options defined in keystone +# + +# Policy backend driver. (string value) +#driver=keystone.policy.backends.sql.Policy + +# Maximum number of entities that will be returned in a policy +# collection. (integer value) +#list_limit= + + +[revoke] + +# +# Options defined in keystone +# + +# An implementation of the backend for persisting revocation +# events. (string value) +#driver=keystone.contrib.revoke.backends.kvs.Revoke + +# This value (calculated in seconds) is added to token +# expiration before a revocation event may be removed from the +# backend. (integer value) +#expiration_buffer=1800 + +# Toggle for revocation event cacheing. This has no effect +# unless global caching is enabled. (boolean value) +#caching=true + + +[signing] + +# +# Options defined in keystone +# + +# Deprecated in favor of provider in the [token] section. +# (string value) +#token_format= + +# Path of the certfile for token signing. For non-production +# environments, you may be interested in using `keystone- +# manage pki_setup` to generate self-signed certificates. +# (string value) +#certfile=/etc/keystone/ssl/certs/signing_cert.pem + +# Path of the keyfile for token signing. (string value) +#keyfile=/etc/keystone/ssl/private/signing_key.pem + +# Path of the CA for token signing. (string value) +#ca_certs=/etc/keystone/ssl/certs/ca.pem + +# Path of the CA key for token signing. (string value) +#ca_key=/etc/keystone/ssl/private/cakey.pem + +# Key size (in bits) for token signing cert (auto generated +# certificate). (integer value) +#key_size=2048 + +# Days the token signing cert is valid for (auto generated +# certificate). (integer value) +#valid_days=3650 + +# Certificate subject (auto generated certificate) for token +# signing. (string value) +#cert_subject=/C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com + + +[ssl] + +# +# Options defined in keystone +# + +# Toggle for SSL support on the Keystone eventlet servers. +# (boolean value) +#enable=false + +# Path of the certfile for SSL. For non-production +# environments, you may be interested in using `keystone- +# manage ssl_setup` to generate self-signed certificates. +# (string value) +#certfile=/etc/keystone/ssl/certs/keystone.pem + +# Path of the keyfile for SSL. (string value) +#keyfile=/etc/keystone/ssl/private/keystonekey.pem + +# Path of the ca cert file for SSL. (string value) +#ca_certs=/etc/keystone/ssl/certs/ca.pem + +# Path of the CA key file for SSL. (string value) +#ca_key=/etc/keystone/ssl/private/cakey.pem + +# Require client certificate. (boolean value) +#cert_required=false + +# SSL key length (in bits) (auto generated certificate). +# (integer value) +#key_size=1024 + +# Days the certificate is valid for once signed (auto +# generated certificate). (integer value) +#valid_days=3650 + +# SSL certificate subject (auto generated certificate). +# (string value) +#cert_subject=/C=US/ST=Unset/L=Unset/O=Unset/CN=keystone + + +[stats] + +# +# Options defined in keystone +# + +# Stats backend driver. (string value) +#driver=keystone.contrib.stats.backends.kvs.Stats + + +[token] + +# +# Options defined in keystone +# + +# External auth mechanisms that should add bind information to +# token, e.g., kerberos,x509. (list value) +#bind= + +# Enforcement policy on tokens presented to Keystone with bind +# information. One of disabled, permissive, strict, required +# or a specifically required bind mode, e.g., kerberos or x509 +# to require binding to that authentication. (string value) +#enforce_token_bind=permissive + +# Amount of time a token should remain valid (in seconds). +# (integer value) +#expiration=3600 + +# Controls the token construction, validation, and revocation +# operations. Core providers are +# "keystone.token.providers.[pkiz|pki|uuid].Provider". The +# default provider is pkiz. (string value) +#provider= + +# Token persistence backend driver. (string value) +#driver=keystone.token.backends.sql.Token + +# Toggle for token system cacheing. This has no effect unless +# global caching is enabled. (boolean value) +#caching=true + +# Time to cache the revocation list and the revocation events +# if revoke extension is enabled (in seconds). This has no +# effect unless global and token caching are enabled. (integer +# value) +#revocation_cache_time=3600 + +# Time to cache tokens (in seconds). This has no effect unless +# global and token caching are enabled. (integer value) +#cache_time= + +# Revoke token by token identifier. Setting revoke_by_id to +# true enables various forms of enumerating tokens, e.g. `list +# tokens for user`. These enumerations are processed to +# determine the list of tokens to revoke. Only disable if you +# are switching to using the Revoke extension with a backend +# other than KVS, which stores events in memory. (boolean +# value) +#revoke_by_id=true + +# The hash algorithm to use for PKI tokens. This can be set to +# any algorithm that hashlib supports. WARNING: Before +# changing this value, the auth_token middleware must be +# configured with the hash_algorithms, otherwise token +# revocation will not be processed correctly. (string value) +#hash_algorithm=md5 + + +[trust] + +# +# Options defined in keystone +# + +# Delegation and impersonation features can be optionally +# disabled. (boolean value) +#enabled=true + +# Trust backend driver. (string value) +#driver=keystone.trust.backends.sql.Trust + + diff --git a/openstack/etc/keystone/logging.conf b/openstack/etc/keystone/logging.conf new file mode 100644 index 00000000..21d43c8d --- /dev/null +++ b/openstack/etc/keystone/logging.conf @@ -0,0 +1,39 @@ +[loggers] +keys=root + +[formatters] +keys=normal,normal_with_name,debug + +[handlers] +keys=production,file,devel + +[logger_root] +level=WARNING +handlers=file + +[handler_production] +class=handlers.SysLogHandler +level=ERROR +formatter=normal_with_name +args=(('127.0.0.1', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER) + +[handler_file] +class=FileHandler +level=DEBUG +formatter=normal_with_name +args=('/var/log/keystone/keystone.log', 'a') + +[handler_devel] +class=StreamHandler +level=NOTSET +formatter=debug +args=(sys.stdout,) + +[formatter_normal] +format=%(asctime)s %(levelname)s %(message)s + +[formatter_normal_with_name] +format=(%(name)s): %(asctime)s %(levelname)s %(message)s + +[formatter_debug] +format=(%(name)s): %(asctime)s %(levelname)s %(module)s %(funcName)s %(message)s diff --git a/openstack/etc/keystone/policy.json b/openstack/etc/keystone/policy.json new file mode 100644 index 00000000..9c7e646e --- /dev/null +++ b/openstack/etc/keystone/policy.json @@ -0,0 +1,144 @@ +{ + "admin_required": "role:admin or is_admin:1", + "service_role": "role:service", + "service_or_admin": "rule:admin_required or rule:service_role", + "owner" : "user_id:%(user_id)s", + "admin_or_owner": "rule:admin_required or rule:owner", + + "default": "rule:admin_required", + + "identity:get_region": "", + "identity:list_regions": "", + "identity:create_region": "rule:admin_required", + "identity:update_region": "rule:admin_required", + "identity:delete_region": "rule:admin_required", + + "identity:get_service": "rule:admin_required", + "identity:list_services": "rule:admin_required", + "identity:create_service": "rule:admin_required", + "identity:update_service": "rule:admin_required", + "identity:delete_service": "rule:admin_required", + + "identity:get_endpoint": "rule:admin_required", + "identity:list_endpoints": "rule:admin_required", + "identity:create_endpoint": "rule:admin_required", + "identity:update_endpoint": "rule:admin_required", + "identity:delete_endpoint": "rule:admin_required", + + "identity:get_domain": "rule:admin_required", + "identity:list_domains": "rule:admin_required", + "identity:create_domain": "rule:admin_required", + "identity:update_domain": "rule:admin_required", + "identity:delete_domain": "rule:admin_required", + + "identity:get_project": "rule:admin_required", + "identity:list_projects": "rule:admin_required", + "identity:list_user_projects": "rule:admin_or_owner", + "identity:create_project": "rule:admin_required", + "identity:update_project": "rule:admin_required", + "identity:delete_project": "rule:admin_required", + + "identity:get_user": "rule:admin_required", + "identity:list_users": "rule:admin_required", + "identity:create_user": "rule:admin_required", + "identity:update_user": "rule:admin_required", + "identity:delete_user": "rule:admin_required", + "identity:change_password": "rule:admin_or_owner", + + "identity:get_group": "rule:admin_required", + "identity:list_groups": "rule:admin_required", + "identity:list_groups_for_user": "rule:admin_or_owner", + "identity:create_group": "rule:admin_required", + "identity:update_group": "rule:admin_required", + "identity:delete_group": "rule:admin_required", + "identity:list_users_in_group": "rule:admin_required", + "identity:remove_user_from_group": "rule:admin_required", + "identity:check_user_in_group": "rule:admin_required", + "identity:add_user_to_group": "rule:admin_required", + + "identity:get_credential": "rule:admin_required", + "identity:list_credentials": "rule:admin_required", + "identity:create_credential": "rule:admin_required", + "identity:update_credential": "rule:admin_required", + "identity:delete_credential": "rule:admin_required", + + "identity:ec2_get_credential": "rule:admin_or_owner", + "identity:ec2_list_credentials": "rule:admin_or_owner", + "identity:ec2_create_credential": "rule:admin_or_owner", + "identity:ec2_delete_credential": "rule:admin_required or (rule:owner and user_id:%(target.credential.user_id)s)", + + "identity:get_role": "rule:admin_required", + "identity:list_roles": "rule:admin_required", + "identity:create_role": "rule:admin_required", + "identity:update_role": "rule:admin_required", + "identity:delete_role": "rule:admin_required", + + "identity:check_grant": "rule:admin_required", + "identity:list_grants": "rule:admin_required", + "identity:create_grant": "rule:admin_required", + "identity:revoke_grant": "rule:admin_required", + + "identity:list_role_assignments": "rule:admin_required", + + "identity:get_policy": "rule:admin_required", + "identity:list_policies": "rule:admin_required", + "identity:create_policy": "rule:admin_required", + "identity:update_policy": "rule:admin_required", + "identity:delete_policy": "rule:admin_required", + + "identity:check_token": "rule:admin_required", + "identity:validate_token": "rule:service_or_admin", + "identity:validate_token_head": "rule:service_or_admin", + "identity:revocation_list": "rule:service_or_admin", + "identity:revoke_token": "rule:admin_or_owner", + + "identity:create_trust": "user_id:%(trust.trustor_user_id)s", + "identity:get_trust": "rule:admin_or_owner", + "identity:list_trusts": "", + "identity:list_roles_for_trust": "", + "identity:check_role_for_trust": "", + "identity:get_role_for_trust": "", + "identity:delete_trust": "", + + "identity:create_consumer": "rule:admin_required", + "identity:get_consumer": "rule:admin_required", + "identity:list_consumers": "rule:admin_required", + "identity:delete_consumer": "rule:admin_required", + "identity:update_consumer": "rule:admin_required", + + "identity:authorize_request_token": "rule:admin_required", + "identity:list_access_token_roles": "rule:admin_required", + "identity:get_access_token_role": "rule:admin_required", + "identity:list_access_tokens": "rule:admin_required", + "identity:get_access_token": "rule:admin_required", + "identity:delete_access_token": "rule:admin_required", + + "identity:list_projects_for_endpoint": "rule:admin_required", + "identity:add_endpoint_to_project": "rule:admin_required", + "identity:check_endpoint_in_project": "rule:admin_required", + "identity:list_endpoints_for_project": "rule:admin_required", + "identity:remove_endpoint_from_project": "rule:admin_required", + + "identity:create_identity_provider": "rule:admin_required", + "identity:list_identity_providers": "rule:admin_required", + "identity:get_identity_providers": "rule:admin_required", + "identity:update_identity_provider": "rule:admin_required", + "identity:delete_identity_provider": "rule:admin_required", + + "identity:create_protocol": "rule:admin_required", + "identity:update_protocol": "rule:admin_required", + "identity:get_protocol": "rule:admin_required", + "identity:list_protocols": "rule:admin_required", + "identity:delete_protocol": "rule:admin_required", + + "identity:create_mapping": "rule:admin_required", + "identity:get_mapping": "rule:admin_required", + "identity:list_mappings": "rule:admin_required", + "identity:delete_mapping": "rule:admin_required", + "identity:update_mapping": "rule:admin_required", + + "identity:list_projects_for_groups": "", + "identity:list_domains_for_groups": "", + + "identity:list_revoke_events": "" +} diff --git a/openstack/etc/logrotate.d/openstack-glance-api b/openstack/etc/logrotate.d/openstack-glance-api new file mode 100644 index 00000000..fa9b0881 --- /dev/null +++ b/openstack/etc/logrotate.d/openstack-glance-api @@ -0,0 +1,7 @@ +/var/log/glance/glance-api.log { + daily + missingok + compress + delaycompress + notifempty +} diff --git a/openstack/etc/logrotate.d/openstack-glance-registry b/openstack/etc/logrotate.d/openstack-glance-registry new file mode 100644 index 00000000..830fa793 --- /dev/null +++ b/openstack/etc/logrotate.d/openstack-glance-registry @@ -0,0 +1,7 @@ +/var/log/glance/glance-registry.log { + daily + missingok + compress + delaycompress + notifempty +} diff --git a/openstack/etc/logrotate.d/openstack-keystone b/openstack/etc/logrotate.d/openstack-keystone new file mode 100644 index 00000000..2709c72a --- /dev/null +++ b/openstack/etc/logrotate.d/openstack-keystone @@ -0,0 +1,8 @@ +/var/log/keystone/*.log { + daily + missingok + rotate 5 + compress + minsize 100k + copytruncate +} \ No newline at end of file diff --git a/openstack/etc/neutron/api-paste.ini b/openstack/etc/neutron/api-paste.ini new file mode 100644 index 00000000..24193fcd --- /dev/null +++ b/openstack/etc/neutron/api-paste.ini @@ -0,0 +1,30 @@ +[composite:neutron] +use = egg:Paste#urlmap +/: neutronversions +/v2.0: neutronapi_v2_0 + +[composite:neutronapi_v2_0] +use = call:neutron.auth:pipeline_factory +noauth = request_id catch_errors extensions neutronapiapp_v2_0 +keystone = request_id catch_errors authtoken keystonecontext extensions neutronapiapp_v2_0 + +[filter:request_id] +paste.filter_factory = neutron.openstack.common.middleware.request_id:RequestIdMiddleware.factory + +[filter:catch_errors] +paste.filter_factory = neutron.openstack.common.middleware.catch_errors:CatchErrorsMiddleware.factory + +[filter:keystonecontext] +paste.filter_factory = neutron.auth:NeutronKeystoneContext.factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory + +[filter:extensions] +paste.filter_factory = neutron.api.extensions:plugin_aware_extension_middleware_factory + +[app:neutronversions] +paste.app_factory = neutron.api.versions:Versions.factory + +[app:neutronapiapp_v2_0] +paste.app_factory = neutron.api.v2.router:APIRouter.factory diff --git a/openstack/etc/neutron/dhcp_agent.ini b/openstack/etc/neutron/dhcp_agent.ini new file mode 100644 index 00000000..de177b6f --- /dev/null +++ b/openstack/etc/neutron/dhcp_agent.ini @@ -0,0 +1,89 @@ +[DEFAULT] +# Show debugging output in log (sets DEBUG log level output) +debug = True +verbose = True + +# The DHCP agent will resync its state with Neutron to recover from any +# transient notification or rpc errors. The interval is number of +# seconds between attempts. +# resync_interval = 5 + +# The DHCP agent requires an interface driver be set. Choose the one that best +# matches your plugin. +# interface_driver = + +# Example of interface_driver option for OVS based plugins(OVS, Ryu, NEC, NVP, +# BigSwitch/Floodlight) +interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + +# Name of Open vSwitch bridge to use +# ovs_integration_bridge = br-int + +# Use veth for an OVS interface or not. +# Support kernels with limited namespace support +# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. +# ovs_use_veth = False + +# Example of interface_driver option for LinuxBridge +# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver + +# The agent can use other DHCP drivers. Dnsmasq is the simplest and requires +# no additional setup of the DHCP server. +dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq + +# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and +# iproute2 package that supports namespaces). +use_namespaces = True + +# The DHCP server can assist with providing metadata support on isolated +# networks. Setting this value to True will cause the DHCP server to append +# specific host routes to the DHCP request. The metadata service will only +# be activated when the subnet does not contain any router port. The guest +# instance must be configured to request host routes via DHCP (Option 121). +enable_isolated_metadata = True + +# Allows for serving metadata requests coming from a dedicated metadata +# access network whose cidr is 169.254.169.254/16 (or larger prefix), and +# is connected to a Neutron router from which the VMs send metadata +# request. In this case DHCP Option 121 will not be injected in VMs, as +# they will be able to reach 169.254.169.254 through a router. +# This option requires enable_isolated_metadata = True +# enable_metadata_network = False + +# Number of threads to use during sync process. Should not exceed connection +# pool size configured on server. +# num_sync_threads = 4 + +# Location to store DHCP server config files +# dhcp_confs = $state_path/dhcp + +# Domain to use for building the hostnames +# dhcp_domain = openstacklocal + +# Override the default dnsmasq settings with this file +# dnsmasq_config_file = + +# Comma-separated list of DNS servers which will be used by dnsmasq +# as forwarders. +# dnsmasq_dns_servers = + +# Limit number of leases to prevent a denial-of-service. +# dnsmasq_lease_max = 16777216 + +# Location to DHCP lease relay UNIX domain socket +# dhcp_lease_relay_socket = $state_path/dhcp/lease_relay + +# Location of Metadata Proxy UNIX domain socket +# metadata_proxy_socket = $state_path/metadata_proxy + +# dhcp_delete_namespaces, which is false by default, can be set to True if +# namespaces can be deleted cleanly on the host running the dhcp agent. +# Do not enable this until you understand the problem with the Linux iproute +# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and +# you are sure that your version of iproute does not suffer from the problem. +# If True, namespaces will be deleted when a dhcp server is disabled. +# dhcp_delete_namespaces = False + +# Timeout for ovs-vsctl commands. +# If the timeout expires, ovs commands will fail with ALARMCLOCK error. +# ovs_vsctl_timeout = 10 diff --git a/openstack/etc/neutron/fwaas_driver.ini b/openstack/etc/neutron/fwaas_driver.ini new file mode 100644 index 00000000..41f761ab --- /dev/null +++ b/openstack/etc/neutron/fwaas_driver.ini @@ -0,0 +1,3 @@ +[fwaas] +#driver = neutron.services.firewall.drivers.linux.iptables_fwaas.IptablesFwaasDriver +#enabled = True diff --git a/openstack/etc/neutron/l3_agent.ini b/openstack/etc/neutron/l3_agent.ini new file mode 100644 index 00000000..e29c88c4 --- /dev/null +++ b/openstack/etc/neutron/l3_agent.ini @@ -0,0 +1,103 @@ +[DEFAULT] +# Show debugging output in log (sets DEBUG log level output) +debug = True +verbose = True + +# L3 requires that an interface driver be set. Choose the one that best +# matches your plugin. +# interface_driver = + +# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC) +# that supports L3 agent +interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + +# Use veth for an OVS interface or not. +# Support kernels with limited namespace support +# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. +# ovs_use_veth = False + +# Example of interface_driver option for LinuxBridge +# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver + +# Allow overlapping IP (Must have kernel build with CONFIG_NET_NS=y and +# iproute2 package that supports namespaces). +use_namespaces = True + +# If use_namespaces is set as False then the agent can only configure one router. + +# This is done by setting the specific router_id. +# router_id = + +# When external_network_bridge is set, each L3 agent can be associated +# with no more than one external network. This value should be set to the UUID +# of that external network. To allow L3 agent support multiple external +# networks, both the external_network_bridge and gateway_external_network_id +# must be left empty. +# gateway_external_network_id = + +# Indicates that this L3 agent should also handle routers that do not have +# an external network gateway configured. This option should be True only +# for a single agent in a Neutron deployment, and may be False for all agents +# if all routers must have an external network gateway +# handle_internal_only_routers = True + +# Name of bridge used for external network traffic. This should be set to +# empty value for the linux bridge. when this parameter is set, each L3 agent +# can be associated with no more than one external network. +external_network_bridge = br-ex + +# TCP Port used by Neutron metadata server +# metadata_port = 9697 + +# Send this many gratuitous ARPs for HA setup. Set it below or equal to 0 +# to disable this feature. +# send_arp_for_ha = 3 + +# seconds between re-sync routers' data if needed +# periodic_interval = 40 + +# seconds to start to sync routers' data after +# starting agent +# periodic_fuzzy_delay = 5 + +# enable_metadata_proxy, which is true by default, can be set to False +# if the Nova metadata server is not available +# enable_metadata_proxy = True + +# Location of Metadata Proxy UNIX domain socket +# metadata_proxy_socket = $state_path/metadata_proxy + +# router_delete_namespaces, which is false by default, can be set to True if +# namespaces can be deleted cleanly on the host running the L3 agent. +# Do not enable this until you understand the problem with the Linux iproute +# utility mentioned in https://bugs.launchpad.net/neutron/+bug/1052535 and +# you are sure that your version of iproute does not suffer from the problem. +# If True, namespaces will be deleted when a router is destroyed. +# router_delete_namespaces = False + +# Timeout for ovs-vsctl commands. +# If the timeout expires, ovs commands will fail with ALARMCLOCK error. +# ovs_vsctl_timeout = 10 + +# The working mode for the agent. Allowed values are: +# - legacy: this preserves the existing behavior where the L3 agent is +# deployed on a centralized networking node to provide L3 services +# like DNAT, and SNAT. Use this mode if you do not want to adopt DVR. +# - dvr: this mode enables DVR functionality, and must be used for an L3 +# agent that runs on a compute host. +# - dvr_snat: this enables centralized SNAT support in conjunction with +# DVR. This mode must be used for an L3 agent running on a centralized +# node (or in single-host deployments, e.g. devstack). +# agent_mode = legacy + +# Location to store keepalived and all HA configurations +# ha_confs_path = $state_path/ha_confs + +# VRRP authentication type AH/PASS +# ha_vrrp_auth_type = PASS + +# VRRP authentication password +# ha_vrrp_auth_password = + +# The advertisement interval in seconds +# ha_vrrp_advert_int = 2 diff --git a/openstack/etc/neutron/lbaas_agent.ini b/openstack/etc/neutron/lbaas_agent.ini new file mode 100644 index 00000000..8d231b5c --- /dev/null +++ b/openstack/etc/neutron/lbaas_agent.ini @@ -0,0 +1,42 @@ +[DEFAULT] +# Show debugging output in log (sets DEBUG log level output). +# debug = False + +# The LBaaS agent will resync its state with Neutron to recover from any +# transient notification or rpc errors. The interval is number of +# seconds between attempts. +# periodic_interval = 10 + +# LBaas requires an interface driver be set. Choose the one that best +# matches your plugin. +# interface_driver = + +# Example of interface_driver option for OVS based plugins (OVS, Ryu, NEC, NVP, +# BigSwitch/Floodlight) +# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + +# Use veth for an OVS interface or not. +# Support kernels with limited namespace support +# (e.g. RHEL 6.5) so long as ovs_use_veth is set to True. +# ovs_use_veth = False + +# Example of interface_driver option for LinuxBridge +# interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver + +# The agent requires drivers to manage the loadbalancer. HAProxy is the opensource version. +# Multiple device drivers reflecting different service providers could be specified: +# device_driver = path.to.provider1.driver.Driver +# device_driver = path.to.provider2.driver.Driver +# Default is: +# device_driver = neutron.services.loadbalancer.drivers.haproxy.namespace_driver.HaproxyNSDriver + +[haproxy] +# Location to store config and state files +# loadbalancer_state_path = $state_path/lbaas + +# The user group +# user_group = nogroup + +# When delete and re-add the same vip, send this many gratuitous ARPs to flush +# the ARP cache in the Router. Set it below or equal to 0 to disable this feature. +# send_gratuitous_arp = 3 diff --git a/openstack/etc/neutron/metadata_agent.ini b/openstack/etc/neutron/metadata_agent.ini new file mode 100644 index 00000000..6a3d0102 --- /dev/null +++ b/openstack/etc/neutron/metadata_agent.ini @@ -0,0 +1,60 @@ +[DEFAULT] +# Show debugging output in log (sets DEBUG log level output) +debug = True +verbose = True + +# The Neutron user information for accessing the Neutron API. +auth_url = ##KEYSTONE_INTERNAL_URL## +auth_region = RegionOne +# Turn off verification of the certificate for ssl +# auth_insecure = False +# Certificate Authority public key (CA cert) file for ssl +# auth_ca_cert = +admin_tenant_name = service +admin_user = ##NEUTRON_SERVICE_USER## +admin_password = ##NEUTRON_SERVICE_PASSWORD## + +# Network service endpoint type to pull from the keystone catalog +# endpoint_type = adminURL + +# IP address used by Nova metadata server +nova_metadata_ip = ##NOVA_HOST## + +# TCP Port used by Nova metadata server +# nova_metadata_port = 8775 + +# Which protocol to use for requests to Nova metadata server, http or https +# nova_metadata_protocol = http + +# Whether insecure SSL connection should be accepted for Nova metadata server +# requests +# nova_metadata_insecure = False + +# Client certificate for nova api, needed when nova api requires client +# certificates +# nova_client_cert = + +# Private key for nova client certificate +# nova_client_priv_key = + +# When proxying metadata requests, Neutron signs the Instance-ID header with a +# shared secret to prevent spoofing. You may select any string for a secret, +# but it must match here and in the configuration used by the Nova Metadata +# Server. NOTE: Nova uses a different key: neutron_metadata_proxy_shared_secret +metadata_proxy_shared_secret = ##METADATA_PROXY_SHARED_SECRET## + +# Location of Metadata Proxy UNIX domain socket +# metadata_proxy_socket = $state_path/metadata_proxy + +# Number of separate worker processes for metadata server. Defaults to +# half the number of CPU cores +# metadata_workers = + +# Number of backlog requests to configure the metadata server socket with +# metadata_backlog = 4096 + +# URL to connect to the cache backend. +# default_ttl=0 parameter will cause cache entries to never expire. +# Otherwise default_ttl specifies time in seconds a cache entry is valid for. +# No cache is used in case no value is passed. +# cache_url = memory://?default_ttl=5 diff --git a/openstack/etc/neutron/metering_agent.ini b/openstack/etc/neutron/metering_agent.ini new file mode 100644 index 00000000..88826ce7 --- /dev/null +++ b/openstack/etc/neutron/metering_agent.ini @@ -0,0 +1,18 @@ +[DEFAULT] +# Show debugging output in log (sets DEBUG log level output) +# debug = True + +# Default driver: +# driver = neutron.services.metering.drivers.noop.noop_driver.NoopMeteringDriver +# Example of non-default driver +# driver = neutron.services.metering.drivers.iptables.iptables_driver.IptablesMeteringDriver + +# Interval between two metering measures +# measure_interval = 30 + +# Interval between two metering reports +# report_interval = 300 + +# interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver + +# use_namespaces = True diff --git a/openstack/etc/neutron/neutron.conf b/openstack/etc/neutron/neutron.conf new file mode 100644 index 00000000..1e832ccd --- /dev/null +++ b/openstack/etc/neutron/neutron.conf @@ -0,0 +1,642 @@ +[DEFAULT] +# Print more verbose output (set logging level to INFO instead of default WARNING level). +verbose = True + +# =========Start Global Config Option for Distributed L3 Router=============== +# Setting the "router_distributed" flag to "True" will default to the creation +# of distributed tenant routers. The admin can override this flag by specifying +# the type of the router on the create request (admin-only attribute). Default +# value is "False" to support legacy mode (centralized) routers. +# +# router_distributed = False +# +# ===========End Global Config Option for Distributed L3 Router=============== + +neutron_metadata_proxy_shared_secret=openstack +service_neutron_metadata_proxy=True + +# Print debugging output (set logging level to DEBUG instead of default WARNING level). +debug = True + +# Where to store Neutron state files. This directory must be writable by the +# user executing the agent. +state_path = /var/lib/neutron + +# Where to store lock files +lock_path = $state_path/lock + +# log_format = %(asctime)s %(levelname)8s [%(name)s] %(message)s +# log_date_format = %Y-%m-%d %H:%M:%S + +# use_syslog -> syslog +# log_file and log_dir -> log_dir/log_file +# (not log_file) and log_dir -> log_dir/{binary_name}.log +# use_stderr -> stderr +# (not user_stderr) and (not log_file) -> stdout +# publish_errors -> notification system + +# use_syslog = False +# syslog_log_facility = LOG_USER + +# use_stderr = True +# log_file = +# log_dir = + +# publish_errors = False + +# Address to bind the API server to +# bind_host = 0.0.0.0 + +# Port the bind the API server to +# bind_port = 9696 + +# Path to the extensions. Note that this can be a colon-separated list of +# paths. For example: +# api_extensions_path = extensions:/path/to/more/extensions:/even/more/extensions +# The __path__ of neutron.extensions is appended to this, so if your +# extensions are in there you don't need to specify them here +# api_extensions_path = + +# (StrOpt) Neutron core plugin entrypoint to be loaded from the +# neutron.core_plugins namespace. See setup.cfg for the entrypoint names of the +# plugins included in the neutron source distribution. For compatibility with +# previous versions, the class name of a plugin can be specified instead of its +# entrypoint name. +# +core_plugin = ml2 +# Example: core_plugin = ml2 + +# (ListOpt) List of service plugin entrypoints to be loaded from the +# neutron.service_plugins namespace. See setup.cfg for the entrypoint names of +# the plugins included in the neutron source distribution. For compatibility +# with previous versions, the class name of a plugin can be specified instead +# of its entrypoint name. +# +service_plugins = router +# Example: service_plugins = router,firewall,lbaas,vpnaas,metering + +# Paste configuration file +api_paste_config = api-paste.ini + +# The strategy to be used for auth. +# Supported values are 'keystone'(default), 'noauth'. +auth_strategy = keystone + +# Base MAC address. The first 3 octets will remain unchanged. If the +# 4h octet is not 00, it will also be used. The others will be +# randomly generated. +# 3 octet +# base_mac = fa:16:3e:00:00:00 +# 4 octet +# base_mac = fa:16:3e:4f:00:00 + +# DVR Base MAC address. The first 3 octets will remain unchanged. If the +# 4th octet is not 00, it will also be used. The others will be randomly +# generated. The 'dvr_base_mac' *must* be different from 'base_mac' to +# avoid mixing them up with MAC's allocated for tenant ports. +# A 4 octet example would be dvr_base_mac = fa:16:3f:4f:00:00 +# The default is 3 octet +# dvr_base_mac = fa:16:3f:00:00:00 + +# Maximum amount of retries to generate a unique MAC address +# mac_generation_retries = 16 + +# DHCP Lease duration (in seconds). Use -1 to +# tell dnsmasq to use infinite lease times. +# dhcp_lease_duration = 86400 + +# Allow sending resource operation notification to DHCP agent +# dhcp_agent_notification = True + +# Enable or disable bulk create/update/delete operations +# allow_bulk = True +# Enable or disable pagination +# allow_pagination = False +# Enable or disable sorting +# allow_sorting = False +# Enable or disable overlapping IPs for subnets +# Attention: the following parameter MUST be set to False if Neutron is +# being used in conjunction with nova security groups +allow_overlapping_ips = True +# Ensure that configured gateway is on subnet. For IPv6, validate only if +# gateway is not a link local address. Deprecated, to be removed during the +# K release, at which point the check will be mandatory. +# force_gateway_on_subnet = True + +# Default maximum number of items returned in a single response, +# value == infinite and value < 0 means no max limit, and value must +# be greater than 0. If the number of items requested is greater than +# pagination_max_limit, server will just return pagination_max_limit +# of number of items. +# pagination_max_limit = -1 + +# Maximum number of DNS nameservers per subnet +# max_dns_nameservers = 5 + +# Maximum number of host routes per subnet +# max_subnet_host_routes = 20 + +# Maximum number of fixed ips per port +# max_fixed_ips_per_port = 5 + +# Maximum number of routes per router +# max_routes = 30 + +# =========== items for agent management extension ============= +# Seconds to regard the agent as down; should be at least twice +# report_interval, to be sure the agent is down for good +# agent_down_time = 75 +# =========== end of items for agent management extension ===== + +# =========== items for agent scheduler extension ============= +# Driver to use for scheduling network to DHCP agent +# network_scheduler_driver = neutron.scheduler.dhcp_agent_scheduler.ChanceScheduler +# Driver to use for scheduling router to a default L3 agent +# router_scheduler_driver = neutron.scheduler.l3_agent_scheduler.ChanceScheduler +# Driver to use for scheduling a loadbalancer pool to an lbaas agent +# loadbalancer_pool_scheduler_driver = neutron.services.loadbalancer.agent_scheduler.ChanceScheduler + +# Allow auto scheduling networks to DHCP agent. It will schedule non-hosted +# networks to first DHCP agent which sends get_active_networks message to +# neutron server +# network_auto_schedule = True + +# Allow auto scheduling routers to L3 agent. It will schedule non-hosted +# routers to first L3 agent which sends sync_routers message to neutron server +# router_auto_schedule = True + +# Allow automatic rescheduling of routers from dead L3 agents with +# admin_state_up set to True to alive agents. +# allow_automatic_l3agent_failover = False + +# Number of DHCP agents scheduled to host a network. This enables redundant +# DHCP agents for configured networks. +# dhcp_agents_per_network = 1 + +# =========== end of items for agent scheduler extension ===== + +# =========== items for l3 extension ============== +# Enable high availability for virtual routers. +# l3_ha = False +# +# Maximum number of l3 agents which a HA router will be scheduled on. If it +# is set to 0 the router will be scheduled on every agent. +# max_l3_agents_per_router = 3 +# +# Minimum number of l3 agents which a HA router will be scheduled on. The +# default value is 2. +# min_l3_agents_per_router = 2 +# +# CIDR of the administrative network if HA mode is enabled +# l3_ha_net_cidr = 169.254.192.0/18 +# =========== end of items for l3 extension ======= + +# =========== WSGI parameters related to the API server ============== +# Number of separate worker processes to spawn. The default, 0, runs the +# worker thread in the current process. Greater than 0 launches that number of +# child processes as workers. The parent process manages them. +# api_workers = 0 + +# Number of separate RPC worker processes to spawn. The default, 0, runs the +# worker thread in the current process. Greater than 0 launches that number of +# child processes as RPC workers. The parent process manages them. +# This feature is experimental until issues are addressed and testing has been +# enabled for various plugins for compatibility. +# rpc_workers = 0 + +# Sets the value of TCP_KEEPIDLE in seconds to use for each server socket when +# starting API server. Not supported on OS X. +# tcp_keepidle = 600 + +# Number of seconds to keep retrying to listen +# retry_until_window = 30 + +# Number of backlog requests to configure the socket with. +# backlog = 4096 + +# Max header line to accommodate large tokens +# max_header_line = 16384 + +# Enable SSL on the API server +# use_ssl = False + +# Certificate file to use when starting API server securely +# ssl_cert_file = /path/to/certfile + +# Private key file to use when starting API server securely +# ssl_key_file = /path/to/keyfile + +# CA certificate file to use when starting API server securely to +# verify connecting clients. This is an optional parameter only required if +# API clients need to authenticate to the API server using SSL certificates +# signed by a trusted CA +# ssl_ca_file = /path/to/cafile +# ======== end of WSGI parameters related to the API server ========== + + +# ======== neutron nova interactions ========== +# Send notification to nova when port status is active. +notify_nova_on_port_status_changes = True + +# Send notifications to nova when port data (fixed_ips/floatingips) change +# so nova can update it's cache. +notify_nova_on_port_data_changes = True + +# URL for connection to nova (Only supports one nova region currently). +nova_url = http://onenode:8774/v2 + +# Name of nova region to use. Useful if keystone manages more than one region +nova_region_name = ##NOVA_REGION## + +# Username for connection to nova in admin context +nova_admin_username = ##NOVA_SERVICE_USER## + +# The uuid of the admin nova tenant +nova_admin_tenant_id = ##SERVICE_TENANT_ID## + +# Password for connection to nova in admin context. +nova_admin_password = ##NOVA_SERVICE_PASSWORD## + +# Authorization URL for connection to nova in admin context. +nova_admin_auth_url = ##KEYSTONE_ADMIN_URL## + +# CA file for novaclient to verify server certificates +# nova_ca_certificates_file = + +# Boolean to control ignoring SSL errors on the nova url +# nova_api_insecure = False + +# Number of seconds between sending events to nova if there are any events to send +# send_events_interval = 2 + +# ======== end of neutron nova interactions ========== + +# +# Options defined in oslo.messaging +# + +# Use durable queues in amqp. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_durable_queues +#amqp_durable_queues=false + +# Auto-delete queues in amqp. (boolean value) +#amqp_auto_delete=false + +# Size of RPC connection pool. (integer value) +#rpc_conn_pool_size=30 + +# Qpid broker hostname. (string value) +#qpid_hostname=localhost + +# Qpid broker port. (integer value) +#qpid_port=5672 + +# Qpid HA cluster host:port pairs. (list value) +#qpid_hosts=$qpid_hostname:$qpid_port + +# Username for Qpid connection. (string value) +#qpid_username= + +# Password for Qpid connection. (string value) +#qpid_password= + +# Space separated list of SASL mechanisms to use for auth. +# (string value) +#qpid_sasl_mechanisms= + +# Seconds between connection keepalive heartbeats. (integer +# value) +#qpid_heartbeat=60 + +# Transport to use, either 'tcp' or 'ssl'. (string value) +#qpid_protocol=tcp + +# Whether to disable the Nagle algorithm. (boolean value) +#qpid_tcp_nodelay=true + +# The qpid topology version to use. Version 1 is what was +# originally used by impl_qpid. Version 2 includes some +# backwards-incompatible changes that allow broker federation +# to work. Users should update to version 2 when they are +# able to take everything down, as it requires a clean break. +# (integer value) +#qpid_topology_version=1 + +# SSL version to use (valid only if SSL enabled). valid values +# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some +# distributions. (string value) +#kombu_ssl_version= + +# SSL key file (valid only if SSL enabled). (string value) +#kombu_ssl_keyfile= + +# SSL cert file (valid only if SSL enabled). (string value) +#kombu_ssl_certfile= + +# SSL certification authority file (valid only if SSL +# enabled). (string value) +#kombu_ssl_ca_certs= + +# How long to wait before reconnecting in response to an AMQP +# consumer cancel notification. (floating point value) +#kombu_reconnect_delay=1.0 + +# The RabbitMQ broker address where a single node is used. +# (string value) +rabbit_host=##RABBITMQ_HOST## + +# The RabbitMQ broker port where a single node is used. +# (integer value) +rabbit_port=##RABBITMQ_PORT## + +# RabbitMQ HA cluster host:port pairs. (list value) +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +rabbit_userid=##RABBITMQ_USER## + +# The RabbitMQ password. (string value) +rabbit_password=##RABBITMQ_PASSWORD## + +# the RabbitMQ login method (string value) +#rabbit_login_method=AMQPLAIN + +# The RabbitMQ virtual host. (string value) +#rabbit_virtual_host=/ + +# How frequently to retry connecting with RabbitMQ. (integer +# value) +#rabbit_retry_interval=1 + +# How long to backoff for between retries when connecting to +# RabbitMQ. (integer value) +#rabbit_retry_backoff=2 + +# Maximum number of RabbitMQ connection retries. Default is 0 +# (infinite retry count). (integer value) +#rabbit_max_retries=0 + +# Use HA queues in RabbitMQ (x-ha-policy: all). If you change +# this option, you must wipe the RabbitMQ database. (boolean +# value) +#rabbit_ha_queues=false + +# If passed, use a fake RabbitMQ provider. (boolean value) +#fake_rabbit=false + +# ZeroMQ bind address. Should be a wildcard (*), an ethernet +# interface, or IP. The "host" option should point or resolve +# to this address. (string value) +#rpc_zmq_bind_address=* + +# MatchMaker driver. (string value) +#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + +# ZeroMQ receiver listening port. (integer value) +#rpc_zmq_port=9501 + +# Number of ZeroMQ contexts, defaults to 1. (integer value) +#rpc_zmq_contexts=1 + +# Maximum number of ingress messages to locally buffer per +# topic. Default is unlimited. (integer value) +#rpc_zmq_topic_backlog= + +# Directory for holding IPC sockets. (string value) +#rpc_zmq_ipc_dir=/var/run/openstack + +# Name of this node. Must be a valid hostname, FQDN, or IP +# address. Must match "host" option, if running Nova. (string +# value) +#rpc_zmq_host=oslo + +# Seconds to wait before a cast expires (TTL). Only supported +# by impl_zmq. (integer value) +#rpc_cast_timeout=30 + +# Heartbeat frequency. (integer value) +#matchmaker_heartbeat_freq=300 + +# Heartbeat time-to-live. (integer value) +#matchmaker_heartbeat_ttl=600 + +# Size of RPC greenthread pool. (integer value) +#rpc_thread_pool_size=64 + +# Driver or drivers to handle sending notifications. (multi +# valued) +notification_driver=neutron.openstack.common.notifier.rpc_notifier + +# AMQP topic used for OpenStack notifications. (list value) +# Deprecated group/name - [rpc_notifier2]/topics +#notification_topics=notifications + +# Seconds to wait for a response from a call. (integer value) +#rpc_response_timeout=60 + +# A URL representing the messaging driver to use and its full +# configuration. If not set, we fall back to the rpc_backend +# option and driver specific configuration. (string value) +#transport_url= + +# The messaging driver to use, defaults to rabbit. Other +# drivers include qpid and zmq. (string value) +rpc_backend=rabbit + +# The default exchange under which topics are scoped. May be +# overridden by an exchange name specified in the +# transport_url option. (string value) +#control_exchange=openstack + + +[matchmaker_redis] + +# +# Options defined in oslo.messaging +# + +# Host to locate redis. (string value) +#host=localhost + +# Use this port to connect to redis host. (integer value) +#port=6379 + +# Password for Redis server (optional). (string value) +#password= + + +[matchmaker_ring] + +# +# Options defined in oslo.messaging +# + +# Matchmaker ring file (JSON). (string value) +# Deprecated group/name - [DEFAULT]/matchmaker_ringfile +#ringfile=/etc/oslo/matchmaker_ring.json + +[quotas] +# Default driver to use for quota checks +# quota_driver = neutron.db.quota_db.DbQuotaDriver + +# Resource name(s) that are supported in quota features +# quota_items = network,subnet,port + +# Default number of resource allowed per tenant. A negative value means +# unlimited. +# default_quota = -1 + +# Number of networks allowed per tenant. A negative value means unlimited. +# quota_network = 10 + +# Number of subnets allowed per tenant. A negative value means unlimited. +# quota_subnet = 10 + +# Number of ports allowed per tenant. A negative value means unlimited. +# quota_port = 50 + +# Number of security groups allowed per tenant. A negative value means +# unlimited. +# quota_security_group = 10 + +# Number of security group rules allowed per tenant. A negative value means +# unlimited. +# quota_security_group_rule = 100 + +# Number of vips allowed per tenant. A negative value means unlimited. +# quota_vip = 10 + +# Number of pools allowed per tenant. A negative value means unlimited. +# quota_pool = 10 + +# Number of pool members allowed per tenant. A negative value means unlimited. +# The default is unlimited because a member is not a real resource consumer +# on Openstack. However, on back-end, a member is a resource consumer +# and that is the reason why quota is possible. +# quota_member = -1 + +# Number of health monitors allowed per tenant. A negative value means +# unlimited. +# The default is unlimited because a health monitor is not a real resource +# consumer on Openstack. However, on back-end, a member is a resource consumer +# and that is the reason why quota is possible. +# quota_health_monitor = -1 + +# Number of routers allowed per tenant. A negative value means unlimited. +# quota_router = 10 + +# Number of floating IPs allowed per tenant. A negative value means unlimited. +# quota_floatingip = 50 + +# Number of firewalls allowed per tenant. A negative value means unlimited. +# quota_firewall = 1 + +# Number of firewall policies allowed per tenant. A negative value means +# unlimited. +# quota_firewall_policy = 1 + +# Number of firewall rules allowed per tenant. A negative value means +# unlimited. +# quota_firewall_rule = 100 + +[agent] +# Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real +# root filter facility. +# Change to "sudo" to skip the filtering and just run the comand directly +# root_helper = sudo +root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + +# =========== items for agent management extension ============= +# seconds between nodes reporting state to server; should be less than +# agent_down_time, best if it is half or less than agent_down_time +# report_interval = 30 + +# =========== end of items for agent management extension ===== + +[keystone_authtoken] +auth_uri = ##KEYSTONE_PUBLIC_URL## +identity_uri = ##IDENTITY_URI## +admin_tenant_name = service +admin_user = ##NEUTRON_SERVICE_USER## +admin_password = ##NEUTRON_SERVICE_PASSWORD## + +[database] +# This line MUST be changed to actually run the plugin. +# Example: +# connection = mysql://root:pass@localhost:3306/neutron +# Replace localhost above with the IP address of the database used by the +# main neutron server. (Leave it as is if the database runs on this host.) +# connection = sqlite:// +# NOTE: In deployment the [database] section and its connection attribute may +# be set in the corresponding core plugin '.ini' file. However, it is suggested +# to put the [database] section and its connection attribute in this +# configuration file. +#connection=sqlite:////var/lib/neutron/neutron.sqlite +connection=postgresql://##NEUTRON_DB_USER##:##NEUTRON_DB_PASSWORD##@onenode/neutron + +# Database engine for which script will be generated when using offline +# migration +# engine = + +# The SQLAlchemy connection string used to connect to the slave database +# slave_connection = + +# Database reconnection retry times - in event connectivity is lost +# set to -1 implies an infinite retry count +# max_retries = 10 + +# Database reconnection interval in seconds - if the initial connection to the +# database fails +# retry_interval = 10 + +# Minimum number of SQL connections to keep open in a pool +# min_pool_size = 1 + +# Maximum number of SQL connections to keep open in a pool +# max_pool_size = 10 + +# Timeout in seconds before idle sql connections are reaped +# idle_timeout = 3600 + +# If set, use this value for max_overflow with sqlalchemy +# max_overflow = 20 + +# Verbosity of SQL debugging information. 0=None, 100=Everything +# connection_debug = 0 + +# Add python stack traces to SQL as comment strings +# connection_trace = False + +# If set, use this value for pool_timeout with sqlalchemy +# pool_timeout = 10 + +[service_providers] +# Specify service providers (drivers) for advanced services like loadbalancer, VPN, Firewall. +# Must be in form: +# service_provider=::[:default] +# List of allowed service types includes LOADBALANCER, FIREWALL, VPN +# Combination of and must be unique; must also be unique +# This is multiline option, example for default provider: +# service_provider=LOADBALANCER:name:lbaas_plugin_driver_path:default +# example of non-default provider: +# service_provider=FIREWALL:name2:firewall_driver_path +# --- Reference implementations --- +service_provider=LOADBALANCER:Haproxy:neutron.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default +service_provider=VPN:openswan:neutron.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default +# In order to activate Radware's lbaas driver you need to uncomment the next line. +# If you want to keep the HA Proxy as the default lbaas driver, remove the attribute default from the line below. +# Otherwise comment the HA Proxy line +# service_provider = LOADBALANCER:Radware:neutron.services.loadbalancer.drivers.radware.driver.LoadBalancerDriver:default +# uncomment the following line to make the 'netscaler' LBaaS provider available. +# service_provider=LOADBALANCER:NetScaler:neutron.services.loadbalancer.drivers.netscaler.netscaler_driver.NetScalerPluginDriver +# Uncomment the following line (and comment out the OpenSwan VPN line) to enable Cisco's VPN driver. +# service_provider=VPN:cisco:neutron.services.vpn.service_drivers.cisco_ipsec.CiscoCsrIPsecVPNDriver:default +# Uncomment the line below to use Embrane heleos as Load Balancer service provider. +# service_provider=LOADBALANCER:Embrane:neutron.services.loadbalancer.drivers.embrane.driver.EmbraneLbaas:default +# Uncomment the line below to use the A10 Networks LBaaS driver. Requires 'pip install a10-neutron-lbaas'. +#service_provider = LOADBALANCER:A10Networks:neutron.services.loadbalancer.drivers.a10networks.driver_v1.ThunderDriver:default +# Uncomment the following line to test the LBaaS v2 API _WITHOUT_ a real backend +# service_provider = LOADBALANCER:LoggingNoop:neutron.services.loadbalancer.drivers.logging_noop.driver.LoggingNoopLoadBalancerDriver:default diff --git a/openstack/etc/neutron/plugins/bigswitch/restproxy.ini b/openstack/etc/neutron/plugins/bigswitch/restproxy.ini new file mode 100644 index 00000000..36e99bd7 --- /dev/null +++ b/openstack/etc/neutron/plugins/bigswitch/restproxy.ini @@ -0,0 +1,114 @@ +# Config file for neutron-proxy-plugin. + +[restproxy] +# All configuration for this plugin is in section '[restproxy]' +# +# The following parameters are supported: +# servers : [,]* (Error if not set) +# server_auth : (default: no auth) +# server_ssl : True | False (default: True) +# ssl_cert_directory : (default: /etc/neutron/plugins/bigswitch/ssl) +# no_ssl_validation : True | False (default: False) +# ssl_sticky : True | False (default: True) +# sync_data : True | False (default: False) +# auto_sync_on_failure : True | False (default: True) +# consistency_interval : (default: 60 seconds) +# server_timeout : (default: 10 seconds) +# neutron_id : (default: neutron-) +# add_meta_server_route : True | False (default: True) +# thread_pool_size : (default: 4) + +# A comma separated list of BigSwitch or Floodlight servers and port numbers. The plugin proxies the requests to the BigSwitch/Floodlight server, which performs the networking configuration. Note that only one server is needed per deployment, but you may wish to deploy multiple servers to support failover. +servers=127.0.0.1:8080 + +# The username and password for authenticating against the BigSwitch or Floodlight controller. +# server_auth=username:password + +# Use SSL when connecting to the BigSwitch or Floodlight controller. +# server_ssl=True + +# Directory which contains the ca_certs and host_certs to be used to validate +# controller certificates. +# ssl_cert_directory=/etc/neutron/plugins/bigswitch/ssl/ + +# If a certificate does not exist for a controller, trust and store the first +# certificate received for that controller and use it to validate future +# connections to that controller. +# ssl_sticky=True + +# Do not validate the controller certificates for SSL +# Warning: This will not provide protection against man-in-the-middle attacks +# no_ssl_validation=False + +# Sync data on connect +# sync_data=False + +# If neutron fails to create a resource because the backend controller +# doesn't know of a dependency, automatically trigger a full data +# synchronization to the controller. +# auto_sync_on_failure=True + +# Time between verifications that the backend controller +# database is consistent with Neutron. (0 to disable) +# consistency_interval = 60 + +# Maximum number of seconds to wait for proxy request to connect and complete. +# server_timeout=10 + +# User defined identifier for this Neutron deployment +# neutron_id = + +# Flag to decide if a route to the metadata server should be injected into the VM +# add_meta_server_route = True + +# Number of threads to use to handle large volumes of port creation requests +# thread_pool_size = 4 + +[nova] +# Specify the VIF_TYPE that will be controlled on the Nova compute instances +# options: ivs or ovs +# default: ovs +# vif_type = ovs + +# Overrides for vif types based on nova compute node host IDs +# Comma separated list of host IDs to fix to a specific VIF type +# The VIF type is taken from the end of the configuration item +# node_override_vif_ +# For example, the following would set the VIF type to IVS for +# host-id1 and host-id2 +# node_overrride_vif_ivs=host-id1,host-id2 + +[router] +# Specify the default router rules installed in newly created tenant routers +# Specify multiple times for multiple rules +# Format is ::: +# Optionally, a comma-separated list of nexthops may be included after +# Use an * to specify default for all tenants +# Default is any any allow for all tenants +# tenant_default_router_rule=*:any:any:permit + +# Maximum number of rules that a single router may have +# Default is 200 +# max_router_rules=200 + +[restproxyagent] + +# Specify the name of the bridge used on compute nodes +# for attachment. +# Default: br-int +# integration_bridge=br-int + +# Change the frequency of polling by the restproxy agent. +# Value is seconds +# Default: 5 +# polling_interval=5 + +# Virtual switch type on the compute node. +# Options: ovs or ivs +# Default: ovs +# virtual_switch_type = ovs + +[securitygroup] +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True diff --git a/openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README b/openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README new file mode 100644 index 00000000..e7e47a27 --- /dev/null +++ b/openstack/etc/neutron/plugins/bigswitch/ssl/ca_certs/README @@ -0,0 +1,3 @@ +Certificates in this folder will be used to +verify signatures for any controllers the plugin +connects to. diff --git a/openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README b/openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README new file mode 100644 index 00000000..8f5f5e77 --- /dev/null +++ b/openstack/etc/neutron/plugins/bigswitch/ssl/host_certs/README @@ -0,0 +1,6 @@ +Certificates in this folder must match the name +of the controller they should be used to authenticate +with a .pem extension. + +For example, the certificate for the controller +"192.168.0.1" should be named "192.168.0.1.pem". diff --git a/openstack/etc/neutron/plugins/brocade/brocade.ini b/openstack/etc/neutron/plugins/brocade/brocade.ini new file mode 100644 index 00000000..916e9e5d --- /dev/null +++ b/openstack/etc/neutron/plugins/brocade/brocade.ini @@ -0,0 +1,29 @@ +[switch] +# username = The SSH username to use +# password = The SSH password to use +# address = The address of the host to SSH to +# ostype = Should be NOS, but is unused otherwise +# +# Example: +# username = admin +# password = password +# address = 10.24.84.38 +# ostype = NOS + +[physical_interface] +# physical_interface = The network interface to use when creating a port +# +# Example: +# physical_interface = physnet1 + +[vlans] +# network_vlan_ranges = :nnnn:mmmm +# +# Example: +# network_vlan_ranges = physnet1:1000:2999 + +[linux_bridge] +# physical_interface_mappings = : +# +# Example: +# physical_interface_mappings = physnet1:em1 diff --git a/openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini b/openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini new file mode 100644 index 00000000..d99e8382 --- /dev/null +++ b/openstack/etc/neutron/plugins/cisco/cisco_cfg_agent.ini @@ -0,0 +1,15 @@ +[cfg_agent] +# (IntOpt) Interval in seconds for processing of service updates. +# That is when the config agent's process_services() loop executes +# and it lets each service helper to process its service resources. +# rpc_loop_interval = 10 + +# (StrOpt) Period-separated module path to the routing service helper class. +# routing_svc_helper_class = neutron.plugins.cisco.cfg_agent.service_helpers.routing_svc_helper.RoutingServiceHelper + +# (IntOpt) Timeout value in seconds for connecting to a hosting device. +# device_connection_timeout = 30 + +# (IntOpt) The time in seconds until a backlogged hosting device is +# presumed dead or booted to an error state. +# hosting_device_dead_timeout = 300 diff --git a/openstack/etc/neutron/plugins/cisco/cisco_plugins.ini b/openstack/etc/neutron/plugins/cisco/cisco_plugins.ini new file mode 100644 index 00000000..a93bc7f1 --- /dev/null +++ b/openstack/etc/neutron/plugins/cisco/cisco_plugins.ini @@ -0,0 +1,107 @@ +[cisco] + +# (StrOpt) A short prefix to prepend to the VLAN number when creating a +# VLAN interface. For example, if an interface is being created for +# VLAN 2001 it will be named 'q-2001' using the default prefix. +# +# vlan_name_prefix = q- +# Example: vlan_name_prefix = vnet- + +# (StrOpt) A short prefix to prepend to the VLAN number when creating a +# provider VLAN interface. For example, if an interface is being created +# for provider VLAN 3003 it will be named 'p-3003' using the default prefix. +# +# provider_vlan_name_prefix = p- +# Example: provider_vlan_name_prefix = PV- + +# (BoolOpt) A flag indicating whether Openstack networking should manage the +# creation and removal of VLAN interfaces for provider networks on the Nexus +# switches. If the flag is set to False then Openstack will not create or +# remove VLAN interfaces for provider networks, and the administrator needs +# to manage these interfaces manually or by external orchestration. +# +# provider_vlan_auto_create = True + +# (BoolOpt) A flag indicating whether Openstack networking should manage +# the adding and removing of provider VLANs from trunk ports on the Nexus +# switches. If the flag is set to False then Openstack will not add or +# remove provider VLANs from trunk ports, and the administrator needs to +# manage these operations manually or by external orchestration. +# +# provider_vlan_auto_trunk = True + +# (StrOpt) Period-separated module path to the model class to use for +# the Cisco neutron plugin. +# +# model_class = neutron.plugins.cisco.models.virt_phy_sw_v2.VirtualPhysicalSwitchModelV2 + +# (BoolOpt) A flag to enable Layer 3 support on the Nexus switches. +# Note: This feature is not supported on all models/versions of Cisco +# Nexus switches. To use this feature, all of the Nexus switches in the +# deployment must support it. +# nexus_l3_enable = False + +# (BoolOpt) A flag to enable round robin scheduling of routers for SVI. +# svi_round_robin = False + +# Cisco Nexus Switch configurations. +# Each switch to be managed by Openstack Neutron must be configured here. +# +# N1KV Format. +# [N1KV:] +# username= +# password= +# +# Example: +# [N1KV:2.2.2.2] +# username=admin +# password=mySecretPassword + +[cisco_n1k] + +# (StrOpt) Specify the name of the integration bridge to which the VIFs are +# attached. +# Default value: br-int +# integration_bridge = br-int + +# (StrOpt) Name of the policy profile to be associated with a port when no +# policy profile is specified during port creates. +# Default value: service_profile +# default_policy_profile = service_profile + +# (StrOpt) Name of the policy profile to be associated with a port owned by +# network node (dhcp, router). +# Default value: dhcp_pp +# network_node_policy_profile = dhcp_pp + +# (StrOpt) Name of the network profile to be associated with a network when no +# network profile is specified during network creates. Admin should pre-create +# a network profile with this name. +# Default value: default_network_profile +# default_network_profile = network_pool + +# (IntOpt) Time in seconds for which the plugin polls the VSM for updates in +# policy profiles. +# Default value: 60 +# poll_duration = 60 + +# (BoolOpt) Specify whether tenants are restricted from accessing all the +# policy profiles. +# Default value: False, indicating all tenants can access all policy profiles. +# +# restrict_policy_profiles = False + +# (IntOpt) Number of threads to use to make HTTP requests to the VSM. +# Default value: 4 +# http_pool_size = 4 + +# (IntOpt) Timeout duration in seconds for the http request +# Default value: 15 +# http_timeout = 15 + +# (BoolOpt) Specify whether tenants are restricted from accessing network +# profiles belonging to other tenants. +# Default value: True, indicating other tenants cannot access network +# profiles belonging to a tenant. +# +# restrict_network_profiles = True diff --git a/openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini b/openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini new file mode 100644 index 00000000..3ef271d2 --- /dev/null +++ b/openstack/etc/neutron/plugins/cisco/cisco_router_plugin.ini @@ -0,0 +1,76 @@ +[general] +#(IntOpt) Time in seconds between renewed scheduling attempts of non-scheduled routers +# backlog_processing_interval = 10 + +#(StrOpt) Name of the L3 admin tenant +# l3_admin_tenant = L3AdminTenant + +#(StrOpt) Name of management network for hosting device configuration +# management_network = osn_mgmt_nw + +#(StrOpt) Default security group applied on management port +# default_security_group = mgmt_sec_grp + +#(IntOpt) Seconds of no status update until a cfg agent is considered down +# cfg_agent_down_time = 60 + +#(StrOpt) Path to templates for hosting devices +# templates_path = /opt/stack/data/neutron/cisco/templates + +#(StrOpt) Path to config drive files for service VM instances +# service_vm_config_path = /opt/stack/data/neutron/cisco/config_drive + +#(BoolOpt) Ensure that Nova is running before attempting to create any VM +# ensure_nova_running = True + +[hosting_devices] +# Settings coupled to CSR1kv VM devices +# ------------------------------------- +#(StrOpt) Name of Glance image for CSR1kv +# csr1kv_image = csr1kv_openstack_img + +#(StrOpt) UUID of Nova flavor for CSR1kv +# csr1kv_flavor = 621 + +#(StrOpt) Plugging driver for CSR1kv +# csr1kv_plugging_driver = neutron.plugins.cisco.l3.plugging_drivers.n1kv_trunking_driver.N1kvTrunkingPlugDriver + +#(StrOpt) Hosting device driver for CSR1kv +# csr1kv_device_driver = neutron.plugins.cisco.l3.hosting_device_drivers.csr1kv_hd_driver.CSR1kvHostingDeviceDriver + +#(StrOpt) Config agent router service driver for CSR1kv +# csr1kv_cfgagent_router_driver = neutron.plugins.cisco.cfg_agent.device_drivers.csr1kv.csr1kv_routing_driver.CSR1kvRoutingDriver + +#(StrOpt) Configdrive template file for CSR1kv +# csr1kv_configdrive_template = csr1kv_cfg_template + +#(IntOpt) Booting time in seconds before a CSR1kv becomes operational +# csr1kv_booting_time = 420 + +#(StrOpt) Username to use for CSR1kv configurations +# csr1kv_username = stack + +#(StrOpt) Password to use for CSR1kv configurations +# csr1kv_password = cisco + +[n1kv] +# Settings coupled to inter-working with N1kv plugin +# -------------------------------------------------- +#(StrOpt) Name of N1kv port profile for management ports +# management_port_profile = osn_mgmt_pp + +#(StrOpt) Name of N1kv port profile for T1 ports (i.e., ports carrying traffic +# from VXLAN segmented networks). +# t1_port_profile = osn_t1_pp + +#(StrOpt) Name of N1kv port profile for T2 ports (i.e., ports carrying traffic +# from VLAN segmented networks). +# t2_port_profile = osn_t2_pp + +#(StrOpt) Name of N1kv network profile for T1 networks (i.e., trunk networks +# for VXLAN segmented traffic). +# t1_network_profile = osn_t1_np + +#(StrOpt) Name of N1kv network profile for T2 networks (i.e., trunk networks +# for VLAN segmented traffic). +# t2_network_profile = osn_t2_np diff --git a/openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini b/openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini new file mode 100644 index 00000000..0aee17eb --- /dev/null +++ b/openstack/etc/neutron/plugins/cisco/cisco_vpn_agent.ini @@ -0,0 +1,26 @@ +[cisco_csr_ipsec] +# Status check interval in seconds, for VPNaaS IPSec connections used on CSR +# status_check_interval = 60 + +# Cisco CSR management port information for REST access used by VPNaaS +# TODO(pcm): Remove once CSR is integrated in as a Neutron router. +# +# Format is: +# [cisco_csr_rest:] +# rest_mgmt = +# tunnel_ip = +# username = +# password = +# timeout = +# host = +# tunnel_if = +# +# where: +# public IP ----- Public IP address of router used with a VPN service (1:1 with CSR) +# tunnel IP ----- Public IP address of the CSR used for the IPSec tunnel +# mgmt port IP -- IP address of CSR for REST API access +# user ---------- Username for REST management port access to Cisco CSR +# password ------ Password for REST management port access to Cisco CSR +# timeout ------- REST request timeout to Cisco CSR (optional) +# hostname ------ Name of host where CSR is running as a VM +# tunnel I/F ---- CSR port name used for tunnels' IP address diff --git a/openstack/etc/neutron/plugins/embrane/heleos_conf.ini b/openstack/etc/neutron/plugins/embrane/heleos_conf.ini new file mode 100644 index 00000000..0ca9b46f --- /dev/null +++ b/openstack/etc/neutron/plugins/embrane/heleos_conf.ini @@ -0,0 +1,41 @@ +[heleos] +#configure the ESM management address +#in the first version of this plugin, only one ESM can be specified +#Example: +#esm_mgmt= + +#configure admin username and password +#admin_username= +#admin_password= + +#router image id +#Example: +#router_image=932ce713-e210-3d54-a0a5-518b0b5ee1b0 + +#mgmt shared security zone id +#defines the shared management security zone. Each tenant can have a private one configured through the ESM +#Example: +#mgmt_id=c0bc9b6c-f110-46cf-bb01-733bfe4b5a1a + +#in-band shared security zone id +#defines the shared in-band security zone. Each tenant can have a private one configured through the ESM +#Example: +#inband_id=a6b7999d-3806-4b04-81f6-e0c5c8271afc + +#oob-band shared security zone id +#defines the shared out-of-band security zone. Each tenant can have a private one configured through the ESM +#Example: +#oob_id=e7eda5cc-b977-46cb-9c14-cab43c1b7871 + +#dummy security zone id +#defines the dummy security zone ID. this security zone will be used by the DVAs with no neutron interfaces +#Example: +#dummy_utif_id=d9911310-25fc-4733-a2e0-c0eda024ef08 + +#resource pool id +#define the shared resource pool. Each tenant can have a private one configured through the ESM +#Example +#resource_pool_id= + +#define if the requests have to be executed asynchronously by the plugin or not +#async_requests= diff --git a/openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini b/openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini new file mode 100644 index 00000000..5eeec570 --- /dev/null +++ b/openstack/etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini @@ -0,0 +1,63 @@ +[hyperv] +# (StrOpt) Type of network to allocate for tenant networks. The +# default value 'local' is useful only for single-box testing and +# provides no connectivity between hosts. You MUST either change this +# to 'vlan' and configure network_vlan_ranges below or to 'flat'. +# Set to 'none' to disable creation of tenant networks. +# +# tenant_network_type = local +# Example: tenant_network_type = vlan + +# (ListOpt) Comma-separated list of +# [::] tuples enumerating ranges +# of VLAN IDs on named physical networks that are available for +# allocation. All physical networks listed are available for flat and +# VLAN provider network creation. Specified ranges of VLAN IDs are +# available for tenant network allocation if tenant_network_type is +# 'vlan'. If empty, only gre and local networks may be created. +# +# network_vlan_ranges = +# Example: network_vlan_ranges = physnet1:1000:2999 + +[agent] +# Agent's polling interval in seconds +# polling_interval = 2 + +# (ListOpt) Comma separated list of : +# where the physical networks can be expressed with wildcards, +# e.g.: ."*:external". +# The referred external virtual switches need to be already present on +# the Hyper-V server. +# If a given physical network name will not match any value in the list +# the plugin will look for a virtual switch with the same name. +# +# physical_network_vswitch_mappings = *:external +# Example: physical_network_vswitch_mappings = net1:external1,net2:external2 + +# (StrOpt) Private virtual switch name used for local networking. +# +# local_network_vswitch = private +# Example: local_network_vswitch = custom_vswitch + +# (BoolOpt) Enables metrics collections for switch ports by using Hyper-V's +# metric APIs. Collected data can by retrieved by other apps and services, +# e.g.: Ceilometer. Requires Hyper-V / Windows Server 2012 and above. +# +# enable_metrics_collection = False + +#----------------------------------------------------------------------------- +# Sample Configurations. +#----------------------------------------------------------------------------- +# +# Neutron server: +# +# [HYPERV] +# tenant_network_type = vlan +# network_vlan_ranges = default:2000:3999 +# +# Agent running on Hyper-V node: +# +# [AGENT] +# polling_interval = 2 +# physical_network_vswitch_mappings = *:external +# local_network_vswitch = private diff --git a/openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini b/openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini new file mode 100644 index 00000000..0fab5070 --- /dev/null +++ b/openstack/etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini @@ -0,0 +1,50 @@ +[sdnve] +# (ListOpt) The IP address of one (or more) SDN-VE controllers +# Default value is: controller_ips = 127.0.0.1 +# Example: controller_ips = 127.0.0.1,127.0.0.2 +# (StrOpt) The integration bridge for OF based implementation +# The default value for integration_bridge is None +# Example: integration_bridge = br-int +# (ListOpt) The interface mapping connecting the integration +# bridge to external network as a list of physical network names and +# interfaces: : +# Example: interface_mappings = default:eth2 +# (BoolOpt) Used to reset the integration bridge, if exists +# The default value for reset_bridge is True +# Example: reset_bridge = False +# (BoolOpt) Used to set the OVS controller as out-of-band +# The default value for out_of_band is True +# Example: out_of_band = False +# +# (BoolOpt) The fake controller for testing purposes +# Default value is: use_fake_controller = False +# (StrOpt) The port number for use with controller +# The default value for the port is 8443 +# Example: port = 8443 +# (StrOpt) The userid for use with controller +# The default value for the userid is admin +# Example: userid = sdnve_user +# (StrOpt) The password for use with controller +# The default value for the password is admin +# Example: password = sdnve_password +# +# (StrOpt) The default type of tenants (and associated resources) +# Available choices are: OVERLAY or OF +# The default value for tenant type is OVERLAY +# Example: default_tenant_type = OVERLAY +# (StrOpt) The string in tenant description that indicates +# Default value for OF tenants: of_signature = SDNVE-OF +# (StrOpt) The string in tenant description that indicates +# Default value for OVERLAY tenants: overlay_signature = SDNVE-OVERLAY + +[sdnve_agent] +# (IntOpt) Agent's polling interval in seconds +# polling_interval = 2 +# (StrOpt) What to use for root helper +# The default value: root_helper = 'sudo' +# (BoolOpt) Whether to use rpc or not +# The default value: rpc = True + +[securitygroup] +# The security group is not supported: +# firewall_driver = neutron.agent.firewall.NoopFirewallDriver diff --git a/openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini b/openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini new file mode 100644 index 00000000..94fe9803 --- /dev/null +++ b/openstack/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini @@ -0,0 +1,78 @@ +[vlans] +# (StrOpt) Type of network to allocate for tenant networks. The +# default value 'local' is useful only for single-box testing and +# provides no connectivity between hosts. You MUST change this to +# 'vlan' and configure network_vlan_ranges below in order for tenant +# networks to provide connectivity between hosts. Set to 'none' to +# disable creation of tenant networks. +# +# tenant_network_type = local +# Example: tenant_network_type = vlan + +# (ListOpt) Comma-separated list of +# [::] tuples enumerating ranges +# of VLAN IDs on named physical networks that are available for +# allocation. All physical networks listed are available for flat and +# VLAN provider network creation. Specified ranges of VLAN IDs are +# available for tenant network allocation if tenant_network_type is +# 'vlan'. If empty, only local networks may be created. +# +# network_vlan_ranges = +# Example: network_vlan_ranges = physnet1:1000:2999 + +[linux_bridge] +# (ListOpt) Comma-separated list of +# : tuples mapping physical +# network names to the agent's node-specific physical network +# interfaces to be used for flat and VLAN networks. All physical +# networks listed in network_vlan_ranges on the server should have +# mappings to appropriate interfaces on each agent. +# +# physical_interface_mappings = +# Example: physical_interface_mappings = physnet1:eth1 + +[vxlan] +# (BoolOpt) enable VXLAN on the agent +# VXLAN support can be enabled when agent is managed by ml2 plugin using +# linuxbridge mechanism driver. Useless if set while using linuxbridge plugin. +# enable_vxlan = False +# +# (IntOpt) use specific TTL for vxlan interface protocol packets +# ttl = +# +# (IntOpt) use specific TOS for vxlan interface protocol packets +# tos = +# +# (StrOpt) multicast group to use for broadcast emulation. +# This group must be the same on all the agents. +# vxlan_group = 224.0.0.1 +# +# (StrOpt) Local IP address to use for VXLAN endpoints (required) +# local_ip = +# +# (BoolOpt) Flag to enable l2population extension. This option should be used +# in conjunction with ml2 plugin l2population mechanism driver (in that case, +# both linuxbridge and l2population mechanism drivers should be loaded). +# It enables plugin to populate VXLAN forwarding table, in order to limit +# the use of broadcast emulation (multicast will be turned off if kernel and +# iproute2 supports unicast flooding - requires 3.11 kernel and iproute2 3.10) +# l2_population = False + +[agent] +# Agent's polling interval in seconds +# polling_interval = 2 + +# (BoolOpt) Enable server RPC compatibility with old (pre-havana) +# agents. +# +# rpc_support_old_agents = False +# Example: rpc_support_old_agents = True + +[securitygroup] +# Firewall driver for realizing neutron security group function +# firewall_driver = neutron.agent.firewall.NoopFirewallDriver +# Example: firewall_driver = neutron.agent.linux.iptables_firewall.IptablesFirewallDriver + +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True diff --git a/openstack/etc/neutron/plugins/metaplugin/metaplugin.ini b/openstack/etc/neutron/plugins/metaplugin/metaplugin.ini new file mode 100644 index 00000000..2b9bfa5e --- /dev/null +++ b/openstack/etc/neutron/plugins/metaplugin/metaplugin.ini @@ -0,0 +1,31 @@ +# Config file for Metaplugin + +[meta] +# Comma separated list of flavor:neutron_plugin for plugins to load. +# Extension method is searched in the list order and the first one is used. +plugin_list = 'ml2:neutron.plugins.ml2.plugin.Ml2Plugin,nvp:neutron.plugins.vmware.plugin.NsxPluginV2' + +# Comma separated list of flavor:neutron_plugin for L3 service plugins +# to load. +# This is intended for specifying L2 plugins which support L3 functions. +# If you use a router service plugin, set this blank. +l3_plugin_list = + +# Default flavor to use, when flavor:network is not specified at network +# creation. +default_flavor = 'nvp' + +# Default L3 flavor to use, when flavor:router is not specified at router +# creation. +# Ignored if 'l3_plugin_list' is blank. +default_l3_flavor = + +# Comma separated list of supported extension aliases. +supported_extension_aliases = 'provider,binding,agent,dhcp_agent_scheduler' + +# Comma separated list of method:flavor to select specific plugin for a method. +# This has priority over method search order based on 'plugin_list'. +extension_map = 'get_port_stats:nvp' + +# Specifies flavor for plugin to handle 'q-plugin' RPC requests. +rpc_flavor = 'ml2' diff --git a/openstack/etc/neutron/plugins/midonet/midonet.ini b/openstack/etc/neutron/plugins/midonet/midonet.ini new file mode 100644 index 00000000..6cc02117 --- /dev/null +++ b/openstack/etc/neutron/plugins/midonet/midonet.ini @@ -0,0 +1,19 @@ + +[midonet] +# MidoNet API server URI +# midonet_uri = http://127.0.0.1:8080/midonet-api + +# MidoNet admin username +# username = admin + +# MidoNet admin password +# password = passw0rd + +# ID of the project that MidoNet admin user belongs to +# project_id = 77777777-7777-7777-7777-777777777777 + +# Virtual provider router ID +# provider_router_id = 00112233-0011-0011-0011-001122334455 + +# Path to midonet host uuid file +# midonet_host_uuid_path = /etc/midolman/host_uuid.properties diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini new file mode 100644 index 00000000..58e5fe21 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf.ini @@ -0,0 +1,85 @@ +[ml2] +# (ListOpt) List of network type driver entrypoints to be loaded from +# the neutron.ml2.type_drivers namespace. +# +# type_drivers = local,flat,vlan,gre,vxlan +# Example: type_drivers = flat,vlan,gre,vxlan +type_drivers = flat,gre + +# (ListOpt) Ordered list of network_types to allocate as tenant +# networks. The default value 'local' is useful for single-box testing +# but provides no connectivity between hosts. +# +# tenant_network_types = local +# Example: tenant_network_types = vlan,gre,vxlan +tenant_network_types = gre + +# (ListOpt) Ordered list of networking mechanism driver entrypoints +# to be loaded from the neutron.ml2.mechanism_drivers namespace. +# mechanism_drivers = +# Example: mechanism_drivers = openvswitch,mlnx +# Example: mechanism_drivers = arista +# Example: mechanism_drivers = cisco,logger +# Example: mechanism_drivers = openvswitch,brocade +# Example: mechanism_drivers = linuxbridge,brocade +mechanism_drivers = openvswitch + +# (ListOpt) Ordered list of extension driver entrypoints +# to be loaded from the neutron.ml2.extension_drivers namespace. +# extension_drivers = +# Example: extension_drivers = anewextensiondriver + +[ml2_type_flat] +# (ListOpt) List of physical_network names with which flat networks +# can be created. Use * to allow flat networks with arbitrary +# physical_network names. +# +# flat_networks = +# Example:flat_networks = physnet1,physnet2 +# Example:flat_networks = * +flat_networks = External + +[ml2_type_vlan] +# (ListOpt) List of [::] tuples +# specifying physical_network names usable for VLAN provider and +# tenant networks, as well as ranges of VLAN tags on each +# physical_network available for allocation as tenant networks. +# +# network_vlan_ranges = +# Example: network_vlan_ranges = physnet1:1000:2999,physnet2 +#network_vlan_ranges = Physnet1:100:200 + +[ml2_type_gre] +# (ListOpt) Comma-separated list of : tuples enumerating ranges of GRE tunnel IDs that are available for tenant network allocation +tunnel_id_ranges = 1:1000 + +[ml2_type_vxlan] +# (ListOpt) Comma-separated list of : tuples enumerating +# ranges of VXLAN VNI IDs that are available for tenant network allocation. +# +# vni_ranges = + +# (StrOpt) Multicast group for the VXLAN interface. When configured, will +# enable sending all broadcast traffic to this multicast group. When left +# unconfigured, will disable multicast VXLAN mode. +# +# vxlan_group = +# Example: vxlan_group = 239.1.1.1 + +[securitygroup] +firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +enable_security_group = True + +# Use ipset to speed-up the iptables security groups. Enabling ipset support +# requires that ipset is installed on L2 agent node. +enable_ipset = True + +[ovs] +local_ip = onenode +enable_tunneling = True +bridge_mappings=External:br-ex,Physnet1:br-eth1 + +[agent] +tunnel_types = gre diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini new file mode 100644 index 00000000..abaf5bc7 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_arista.ini @@ -0,0 +1,100 @@ +# Defines configuration options specific for Arista ML2 Mechanism driver + +[ml2_arista] +# (StrOpt) EOS IP address. This is required field. If not set, all +# communications to Arista EOS will fail +# +# eapi_host = +# Example: eapi_host = 192.168.0.1 +# +# (StrOpt) EOS command API username. This is required field. +# if not set, all communications to Arista EOS will fail. +# +# eapi_username = +# Example: arista_eapi_username = admin +# +# (StrOpt) EOS command API password. This is required field. +# if not set, all communications to Arista EOS will fail. +# +# eapi_password = +# Example: eapi_password = my_password +# +# (StrOpt) Defines if hostnames are sent to Arista EOS as FQDNs +# ("node1.domain.com") or as short names ("node1"). This is +# optional. If not set, a value of "True" is assumed. +# +# use_fqdn = +# Example: use_fqdn = True +# +# (IntOpt) Sync interval in seconds between Neutron plugin and EOS. +# This field defines how often the synchronization is performed. +# This is an optional field. If not set, a value of 180 seconds +# is assumed. +# +# sync_interval = +# Example: sync_interval = 60 +# +# (StrOpt) Defines Region Name that is assigned to this OpenStack Controller. +# This is useful when multiple OpenStack/Neutron controllers are +# managing the same Arista HW clusters. Note that this name must +# match with the region name registered (or known) to keystone +# service. Authentication with Keysotne is performed by EOS. +# This is optional. If not set, a value of "RegionOne" is assumed. +# +# region_name = +# Example: region_name = RegionOne + + +[l3_arista] + +# (StrOpt) primary host IP address. This is required field. If not set, all +# communications to Arista EOS will fail. This is the host where +# primary router is created. +# +# primary_l3_host = +# Example: primary_l3_host = 192.168.10.10 +# +# (StrOpt) Primary host username. This is required field. +# if not set, all communications to Arista EOS will fail. +# +# primary_l3_host_username = +# Example: arista_primary_l3_username = admin +# +# (StrOpt) Primary host password. This is required field. +# if not set, all communications to Arista EOS will fail. +# +# primary_l3_host_password = +# Example: primary_l3_password = my_password +# +# (StrOpt) IP address of the second Arista switch paired as +# MLAG (Multi-chassis Link Aggregation) with the first. +# This is optional field, however, if mlag_config flag is set, +# then this is a required field. If not set, all +# communications to Arista EOS will fail. If mlag_config is set +# to False, then this field is ignored +# +# seconadary_l3_host = +# Example: seconadary_l3_host = 192.168.10.20 +# +# (BoolOpt) Defines if Arista switches are configured in MLAG mode +# If yes, all L3 configuration is pushed to both switches +# automatically. If this flag is set, ensure that secondary_l3_host +# is set to the second switch's IP. +# This flag is Optional. If not set, a value of "False" is assumed. +# +# mlag_config = +# Example: mlag_config = True +# +# (BoolOpt) Defines if the router is created in default VRF or a +# a specific VRF. This is optional. +# If not set, a value of "False" is assumed. +# +# Example: use_vrf = True +# +# (IntOpt) Sync interval in seconds between Neutron plugin and EOS. +# This field defines how often the synchronization is performed. +# This is an optional field. If not set, a value of 180 seconds +# is assumed. +# +# l3_sync_interval = +# Example: l3_sync_interval = 60 diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini new file mode 100644 index 00000000..67574110 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_brocade.ini @@ -0,0 +1,15 @@ +[ml2_brocade] +# username = +# password = +# address = +# ostype = NOS +# osversion = autodetect | n.n.n +# physical_networks = physnet1,physnet2 +# +# Example: +# username = admin +# password = password +# address = 10.24.84.38 +# ostype = NOS +# osversion = 4.1.1 +# physical_networks = physnet1,physnet2 diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini new file mode 100644 index 00000000..1b69100e --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_cisco.ini @@ -0,0 +1,118 @@ +[ml2_cisco] + +# (StrOpt) A short prefix to prepend to the VLAN number when creating a +# VLAN interface. For example, if an interface is being created for +# VLAN 2001 it will be named 'q-2001' using the default prefix. +# +# vlan_name_prefix = q- +# Example: vlan_name_prefix = vnet- + +# (BoolOpt) A flag to enable round robin scheduling of routers for SVI. +# svi_round_robin = False + +# +# (StrOpt) The name of the physical_network managed via the Cisco Nexus Switch. +# This string value must be present in the ml2_conf.ini network_vlan_ranges +# variable. +# +# managed_physical_network = +# Example: managed_physical_network = physnet1 + +# Cisco Nexus Switch configurations. +# Each switch to be managed by Openstack Neutron must be configured here. +# +# Cisco Nexus Switch Format. +# [ml2_mech_cisco_nexus:] +# = (1) +# ssh_port= (2) +# username= (3) +# password= (4) +# +# (1) For each host connected to a port on the switch, specify the hostname +# and the Nexus physical port (interface) it is connected to. +# Valid intf_type's are 'ethernet' and 'port-channel'. +# The default setting for is 'ethernet' and need not be +# added to this setting. +# (2) The TCP port for connecting via SSH to manage the switch. This is +# port number 22 unless the switch has been configured otherwise. +# (3) The username for logging into the switch to manage it. +# (4) The password for logging into the switch to manage it. +# +# Example: +# [ml2_mech_cisco_nexus:1.1.1.1] +# compute1=1/1 +# compute2=ethernet:1/2 +# compute3=port-channel:1 +# ssh_port=22 +# username=admin +# password=mySecretPassword + +[ml2_cisco_apic] + +# Hostname:port list of APIC controllers +# apic_hosts = 1.1.1.1:80, 1.1.1.2:8080, 1.1.1.3:80 + +# Username for the APIC controller +# apic_username = user + +# Password for the APIC controller +# apic_password = password + +# Whether use SSl for connecting to the APIC controller or not +# apic_use_ssl = True + +# How to map names to APIC: use_uuid or use_name +# apic_name_mapping = use_name + +# Names for APIC objects used by Neutron +# Note: When deploying multiple clouds against one APIC, +# these names must be unique between the clouds. +# apic_vmm_domain = openstack +# apic_vlan_ns_name = openstack_ns +# apic_node_profile = openstack_profile +# apic_entity_profile = openstack_entity +# apic_function_profile = openstack_function +# apic_app_profile_name = openstack_app +# Agent timers for State reporting and topology discovery +# apic_sync_interval = 30 +# apic_agent_report_interval = 30 +# apic_agent_poll_interval = 2 + +# Specify your network topology. +# This section indicates how your compute nodes are connected to the fabric's +# switches and ports. The format is as follows: +# +# [apic_switch:] +# , = +# +# You can have multiple sections, one for each switch in your fabric that is +# participating in Openstack. e.g. +# +# [apic_switch:17] +# ubuntu,ubuntu1 = 1/10 +# ubuntu2,ubuntu3 = 1/11 +# +# [apic_switch:18] +# ubuntu5,ubuntu6 = 1/1 +# ubuntu7,ubuntu8 = 1/2 + +# Describe external connectivity. +# In this section you can specify the external network configuration in order +# for the plugin to be able to teach the fabric how to route the internal +# traffic to the outside world. The external connectivity configuration +# format is as follows: +# +# [apic_external_network:] +# switch = +# port = +# encap = +# cidr_exposed = +# gateway_ip = +# +# An example follows: +# [apic_external_network:network_ext] +# switch=203 +# port=1/34 +# encap=vlan-100 +# cidr_exposed=10.10.40.2/16 +# gateway_ip=10.10.40.1 diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini new file mode 100644 index 00000000..6ee4a4e0 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini @@ -0,0 +1,52 @@ +# Defines Configuration options for FSL SDN OS Mechanism Driver +# Cloud Resource Discovery (CRD) authorization credentials +[ml2_fslsdn] +#(StrOpt) User name for authentication to CRD. +# e.g.: user12 +# +# crd_user_name = + +#(StrOpt) Password for authentication to CRD. +# e.g.: secret +# +# crd_password = + +#(StrOpt) Tenant name for CRD service. +# e.g.: service +# +# crd_tenant_name = + +#(StrOpt) CRD auth URL. +# e.g.: http://127.0.0.1:5000/v2.0/ +# +# crd_auth_url = + +#(StrOpt) URL for connecting to CRD Service. +# e.g.: http://127.0.0.1:9797 +# +# crd_url= + +#(IntOpt) Timeout value for connecting to CRD service +# in seconds, e.g.: 30 +# +# crd_url_timeout= + +#(StrOpt) Region name for connecting to CRD in +# admin context, e.g.: RegionOne +# +# crd_region_name= + +#(BoolOpt)If set, ignore any SSL validation issues (boolean value) +# e.g.: False +# +# crd_api_insecure= + +#(StrOpt)Authorization strategy for connecting to CRD in admin +# context, e.g.: keystone +# +# crd_auth_strategy= + +#(StrOpt)Location of CA certificates file to use for CRD client +# requests. +# +# crd_ca_certificates_file= diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini new file mode 100644 index 00000000..46139aed --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_mlnx.ini @@ -0,0 +1,4 @@ +[eswitch] +# (StrOpt) Type of Network Interface to allocate for VM: +# mlnx_direct or hostdev according to libvirt terminology +# vnic_type = mlnx_direct diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini new file mode 100644 index 00000000..dbbfcbd2 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_ncs.ini @@ -0,0 +1,28 @@ +# Defines configuration options specific to the Tail-f NCS Mechanism Driver + +[ml2_ncs] +# (StrOpt) Tail-f NCS HTTP endpoint for REST access to the OpenStack +# subtree. +# If this is not set then no HTTP requests will be made. +# +# url = +# Example: url = http://ncs/api/running/services/openstack + +# (StrOpt) Username for HTTP basic authentication to NCS. +# This is an optional parameter. If unspecified then no authentication is used. +# +# username = +# Example: username = admin + +# (StrOpt) Password for HTTP basic authentication to NCS. +# This is an optional parameter. If unspecified then no authentication is used. +# +# password = +# Example: password = admin + +# (IntOpt) Timeout in seconds to wait for NCS HTTP request completion. +# This is an optional parameter, default value is 10 seconds. +# +# timeout = +# Example: timeout = 15 + diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini new file mode 100644 index 00000000..9e88c1bb --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_odl.ini @@ -0,0 +1,30 @@ +# Configuration for the OpenDaylight MechanismDriver + +[ml2_odl] +# (StrOpt) OpenDaylight REST URL +# If this is not set then no HTTP requests will be made. +# +# url = +# Example: url = http://192.168.56.1:8080/controller/nb/v2/neutron + +# (StrOpt) Username for HTTP basic authentication to ODL. +# +# username = +# Example: username = admin + +# (StrOpt) Password for HTTP basic authentication to ODL. +# +# password = +# Example: password = admin + +# (IntOpt) Timeout in seconds to wait for ODL HTTP request completion. +# This is an optional parameter, default value is 10 seconds. +# +# timeout = 10 +# Example: timeout = 15 + +# (IntOpt) Timeout in minutes to wait for a Tomcat session timeout. +# This is an optional parameter, default value is 30 minutes. +# +# session_timeout = 30 +# Example: session_timeout = 60 diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini new file mode 100644 index 00000000..4a94b987 --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_ofa.ini @@ -0,0 +1,13 @@ +# Defines configuration options specific to the OpenFlow Agent Mechanism Driver + +[ovs] +# Please refer to configuration options to the OpenvSwitch + +[agent] +# (IntOpt) Number of seconds to retry acquiring an Open vSwitch datapath. +# This is an optional parameter, default value is 60 seconds. +# +# get_datapath_retry_times = +# Example: get_datapath_retry_times = 30 + +# Please refer to configuration options to the OpenvSwitch else the above. diff --git a/openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini b/openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini new file mode 100644 index 00000000..f9522e7f --- /dev/null +++ b/openstack/etc/neutron/plugins/ml2/ml2_conf_sriov.ini @@ -0,0 +1,31 @@ +# Defines configuration options for SRIOV NIC Switch MechanismDriver +# and Agent + +[ml2_sriov] +# (ListOpt) Comma-separated list of +# supported Vendor PCI Devices, in format vendor_id:product_id +# +# supported_pci_vendor_devs = 15b3:1004, 8086:10ca +# Example: supported_pci_vendor_devs = 15b3:1004 +# +# (BoolOpt) Requires running SRIOV neutron agent for port binding +# agent_required = False + +[sriov_nic] +# (ListOpt) Comma-separated list of : +# tuples mapping physical network names to the agent's node-specific +# physical network device interfaces of SR-IOV physical function to be used +# for VLAN networks. All physical networks listed in network_vlan_ranges on +# the server should have mappings to appropriate interfaces on each agent. +# +# physical_device_mappings = +# Example: physical_device_mappings = physnet1:eth1 +# +# (ListOpt) Comma-separated list of : +# tuples, mapping network_device to the agent's node-specific list of virtual +# functions that should not be used for virtual networking. +# vfs_to_exclude is a semicolon-separated list of virtual +# functions to exclude from network_device. The network_device in the +# mapping should appear in the physical_device_mappings list. +# exclude_devices = +# Example: exclude_devices = eth1:0000:07:00.2; 0000:07:00.3 diff --git a/openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini b/openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini new file mode 100644 index 00000000..b1225111 --- /dev/null +++ b/openstack/etc/neutron/plugins/mlnx/mlnx_conf.ini @@ -0,0 +1,79 @@ +[mlnx] +# (StrOpt) Type of network to allocate for tenant networks. The +# default value is 'vlan' You MUST configure network_vlan_ranges below +# in order for tenant networks to provide connectivity between hosts. +# Set to 'none' to disable creation of tenant networks. +# +# tenant_network_type = vlan +# Example: tenant_network_type = vlan + +# (ListOpt) Comma-separated list of +# [::] tuples enumerating ranges +# of VLAN IDs on named physical networks that are available for +# allocation. All physical networks listed are available for flat and +# VLAN provider network creation. Specified ranges of VLAN IDs are +# available for tenant network allocation if tenant_network_type is +# 'vlan'. If empty, only local networks may be created. +# +# network_vlan_ranges = +# Example: network_vlan_ranges = default:1:100 + +# (ListOpt) Comma-separated list of +# : tuples mapping physical +# network names to physical network types. All physical +# networks listed in network_vlan_ranges should have +# mappings to appropriate physical network type. +# Type of the physical network can be either eth (Ethernet) or +# ib (InfiniBand). If empty, physical network eth type is assumed. +# +# physical_network_type_mappings = +# Example: physical_network_type_mappings = default:eth + +# (StrOpt) Type of the physical network, can be either 'eth' or 'ib' +# The default value is 'eth' +# physical_network_type = eth + +[eswitch] +# (ListOpt) Comma-separated list of +# : tuples mapping physical +# network names to the agent's node-specific physical network +# interfaces to be used for flat and VLAN networks. All physical +# networks listed in network_vlan_ranges on the server should have +# mappings to appropriate interfaces on each agent. +# +# physical_interface_mappings = +# Example: physical_interface_mappings = default:eth2 + +# (StrOpt) Type of Network Interface to allocate for VM: +# direct or hosdev according to libvirt terminology +# vnic_type = mlnx_direct + +# (StrOpt) Eswitch daemon end point connection url +# daemon_endpoint = 'tcp://127.0.0.1:60001' + +# The number of milliseconds the agent will wait for +# response on request to daemon +# request_timeout = 3000 + +# The number of retries the agent will send request +# to daemon before giving up +# retries = 3 + +# The backoff rate multiplier for waiting period between retries +# on request to daemon, i.e. value of 2 will double +# the request timeout each retry +# backoff_rate = 2 + +[agent] +# Agent's polling interval in seconds +# polling_interval = 2 + +# (BoolOpt) Enable server RPC compatibility with old (pre-havana) +# agents. +# +# rpc_support_old_agents = False + +[securitygroup] +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True diff --git a/openstack/etc/neutron/plugins/nec/nec.ini b/openstack/etc/neutron/plugins/nec/nec.ini new file mode 100644 index 00000000..798a5a61 --- /dev/null +++ b/openstack/etc/neutron/plugins/nec/nec.ini @@ -0,0 +1,63 @@ +# Sample Configurations + +[ovs] +# Do not change this parameter unless you have a good reason to. +# This is the name of the OVS integration bridge. There is one per hypervisor. +# The integration bridge acts as a virtual "patch port". All VM VIFs are +# attached to this bridge and then "patched" according to their network +# connectivity. +# integration_bridge = br-int + +[agent] +# Agent's polling interval in seconds +# polling_interval = 2 + +[securitygroup] +# Firewall driver for realizing neutron security group function +firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver + +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True + +[ofc] +# Specify OpenFlow Controller Host, Port and Driver to connect. +# host = 127.0.0.1 +# port = 8888 + +# Base URL of OpenFlow Controller REST API. +# It is prepended to a path of each API request. +# path_prefix = + +# Drivers are in neutron/plugins/nec/drivers/ . +# driver = trema + +# PacketFilter is available when it's enabled in this configuration +# and supported by the driver. +# enable_packet_filter = true + +# Support PacketFilter on OFC router interface +# support_packet_filter_on_ofc_router = true + +# Use SSL to connect +# use_ssl = false + +# Key file +# key_file = + +# Certificate file +# cert_file = + +# Disable SSL certificate verification +# insecure_ssl = false + +# Maximum attempts per OFC API request. NEC plugin retries +# API request to OFC when OFC returns ServiceUnavailable (503). +# The value must be greater than 0. +# api_max_attempts = 3 + +[provider] +# Default router provider to use. +# default_router_provider = l3-agent +# List of enabled router providers. +# router_providers = l3-agent,openflow diff --git a/openstack/etc/neutron/plugins/nuage/nuage_plugin.ini b/openstack/etc/neutron/plugins/nuage/nuage_plugin.ini new file mode 100644 index 00000000..aad37bd5 --- /dev/null +++ b/openstack/etc/neutron/plugins/nuage/nuage_plugin.ini @@ -0,0 +1,41 @@ +# Please fill in the correct data for all the keys below and uncomment key-value pairs +[restproxy] +# (StrOpt) Default Network partition in which VSD will +# orchestrate network resources using openstack +# +#default_net_partition_name = + +# (StrOpt) Nuage provided uri for initial authorization to +# access VSD +# +#auth_resource = /auth + +# (StrOpt) IP Address and Port of VSD +# +#server = ip:port + +# (StrOpt) Organization name in which VSD will orchestrate +# network resources using openstack +# +#organization = org + +# (StrOpt) Username and password of VSD for authentication +# +#serverauth = uname:pass + +# (BoolOpt) Boolean for SSL connection with VSD server +# +#serverssl = True + +# (StrOpt) Nuage provided base uri to reach out to VSD +# +#base_uri = /base + +[syncmanager] +# (BoolOpt) Boolean to enable sync between openstack and VSD +# +#enable_sync = False + +# (IntOpt) Sync interval in seconds between openstack and VSD +# +#sync_interval = 0 \ No newline at end of file diff --git a/openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini b/openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini new file mode 100644 index 00000000..a1c05d97 --- /dev/null +++ b/openstack/etc/neutron/plugins/oneconvergence/nvsdplugin.ini @@ -0,0 +1,35 @@ +[nvsd] +# Configure the NVSD controller. The plugin proxies the api calls using +# to NVSD controller which implements the required functionality. + +# IP address of NVSD controller api server +# nvsd_ip = + +# Port number of NVSD controller api server +# nvsd_port = 8082 + +# Authentication credentials to access the api server +# nvsd_user = +# nvsd_passwd = + +# API request timeout in seconds +# request_timeout = + +# Maximum number of retry attempts to login to the NVSD controller +# Specify 0 to retry until success (default) +# nvsd_retries = 0 + +[securitygroup] +# Specify firewall_driver option, if neutron security groups are disabled, +# then NoopFirewallDriver otherwise OVSHybridIptablesFirewallDriver. +# firewall_driver = neutron.agent.firewall.NoopFirewallDriver + +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True + +[agent] +# root_helper = sudo /usr/local/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + +[database] +# connection = mysql://root:@127.0.0.1/?charset=utf8 diff --git a/openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini b/openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini new file mode 100644 index 00000000..629f1fc4 --- /dev/null +++ b/openstack/etc/neutron/plugins/opencontrail/contrailplugin.ini @@ -0,0 +1,26 @@ +# OpenContrail is an Apache 2.0-licensed project that is built using +# standards-based protocols and provides all the necessary components for +# network virtualization–SDN controller, virtual router, analytics engine, +# and published northbound APIs +# For more information visit: http://opencontrail.org + +# Opencontrail plugin specific configuration +[CONTRAIL] +# (StrOpt) IP address to connect to opencontrail controller. +# Uncomment this line for specifying the IP address of the opencontrail +# Api-Server. +# Default value is local host(127.0.0.1). +# api_server_ip='127.0.0.1' + +# (IntOpt) port to connect to opencontrail controller. +# Uncomment this line for the specifying the Port of the opencontrail +# Api-Server. +# Default value is 8082 +# api_server_port=8082 + +# (DictOpt) enable opencontrail extensions +# Opencontrail in future would support extension such as ipam, policy, +# these extensions can be configured as shown below. Plugin will then +# load the specified extensions. +# Default value is None, it wont load any extension +# contrail_extensions=ipam:,policy: diff --git a/openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini b/openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini new file mode 100644 index 00000000..232ca71d --- /dev/null +++ b/openstack/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini @@ -0,0 +1,141 @@ +[ovs] +# (BoolOpt) Set to True in the server and the agents to enable support +# for GRE or VXLAN networks. Requires kernel support for OVS patch ports and +# GRE or VXLAN tunneling. +# +# WARNING: This option will be deprecated in the Icehouse release, at which +# point setting tunnel_types will be required to enable tunneling. +# +# enable_tunneling = False + +# Do not change this parameter unless you have a good reason to. +# This is the name of the OVS integration bridge. There is one per hypervisor. +# The integration bridge acts as a virtual "patch bay". All VM VIFs are +# attached to this bridge and then "patched" according to their network +# connectivity. +# +# integration_bridge = br-int + +# Only used for the agent if tunnel_id_ranges is not empty for +# the server. In most cases, the default value should be fine. +# +# tunnel_bridge = br-tun + +# Peer patch port in integration bridge for tunnel bridge +# int_peer_patch_port = patch-tun + +# Peer patch port in tunnel bridge for integration bridge +# tun_peer_patch_port = patch-int + +# Uncomment this line for the agent if tunnel_id_ranges is not +# empty for the server. Set local-ip to be the local IP address of +# this hypervisor. +# +# local_ip = + +# (ListOpt) Comma-separated list of : tuples +# mapping physical network names to the agent's node-specific OVS +# bridge names to be used for flat and VLAN networks. The length of +# bridge names should be no more than 11. Each bridge must +# exist, and should have a physical network interface configured as a +# port. All physical networks configured on the server should have +# mappings to appropriate bridges on each agent. +# +# bridge_mappings = +# Example: bridge_mappings = physnet1:br-eth1 + +# (BoolOpt) Use veths instead of patch ports to interconnect the integration +# bridge to physical networks. Support kernel without ovs patch port support +# so long as it is set to True. +# use_veth_interconnection = False + +[agent] +# Agent's polling interval in seconds +# polling_interval = 2 + +# Minimize polling by monitoring ovsdb for interface changes +# minimize_polling = True + +# When minimize_polling = True, the number of seconds to wait before +# respawning the ovsdb monitor after losing communication with it +# ovsdb_monitor_respawn_interval = 30 + +# (ListOpt) The types of tenant network tunnels supported by the agent. +# Setting this will enable tunneling support in the agent. This can be set to +# either 'gre' or 'vxlan'. If this is unset, it will default to [] and +# disable tunneling support in the agent. +# You can specify as many values here as your compute hosts supports. +# +# tunnel_types = +# Example: tunnel_types = gre +# Example: tunnel_types = vxlan +# Example: tunnel_types = vxlan, gre + +# (IntOpt) The port number to utilize if tunnel_types includes 'vxlan'. By +# default, this will make use of the Open vSwitch default value of '4789' if +# not specified. +# +# vxlan_udp_port = +# Example: vxlan_udp_port = 8472 + +# (IntOpt) This is the MTU size of veth interfaces. +# Do not change unless you have a good reason to. +# The default MTU size of veth interfaces is 1500. +# This option has no effect if use_veth_interconnection is False +# veth_mtu = +# Example: veth_mtu = 1504 + +# (BoolOpt) Flag to enable l2-population extension. This option should only be +# used in conjunction with ml2 plugin and l2population mechanism driver. It'll +# enable plugin to populate remote ports macs and IPs (using fdb_add/remove +# RPC calbbacks instead of tunnel_sync/update) on OVS agents in order to +# optimize tunnel management. +# +# l2_population = False + +# Enable local ARP responder. Requires OVS 2.1. This is only used by the l2 +# population ML2 MechanismDriver. +# +# arp_responder = False + +# (BoolOpt) Set or un-set the don't fragment (DF) bit on outgoing IP packet +# carrying GRE/VXLAN tunnel. The default value is True. +# +# dont_fragment = True + +# (BoolOpt) Set to True on L2 agents to enable support +# for distributed virtual routing. +# +# enable_distributed_routing = False + +[securitygroup] +# Firewall driver for realizing neutron security group function. +# firewall_driver = neutron.agent.firewall.NoopFirewallDriver +# Example: firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver + +# Controls if neutron security group is enabled or not. +# It should be false when you use nova security group. +# enable_security_group = True + +#----------------------------------------------------------------------------- +# Sample Configurations. +#----------------------------------------------------------------------------- +# +# 1. With VLANs on eth1. +# [ovs] +# integration_bridge = br-int +# bridge_mappings = default:br-eth1 +# +# 2. With GRE tunneling. +# [ovs] +# integration_bridge = br-int +# tunnel_bridge = br-tun +# local_ip = 10.0.0.3 +# +# 3. With VXLAN tunneling. +# [ovs] +# integration_bridge = br-int +# tunnel_bridge = br-tun +# local_ip = 10.0.0.3 +# [agent] +# tunnel_types = vxlan diff --git a/openstack/etc/neutron/plugins/plumgrid/plumgrid.ini b/openstack/etc/neutron/plugins/plumgrid/plumgrid.ini new file mode 100644 index 00000000..bfe8062a --- /dev/null +++ b/openstack/etc/neutron/plugins/plumgrid/plumgrid.ini @@ -0,0 +1,14 @@ +# Config file for Neutron PLUMgrid Plugin + +[plumgriddirector] +# This line should be pointing to the PLUMgrid Director, +# for the PLUMgrid platform. +# director_server= +# director_server_port= +# Authentification parameters for the Director. +# These are the admin credentials to manage and control +# the PLUMgrid Director server. +# username= +# password= +# servertimeout=5 +# driver= diff --git a/openstack/etc/neutron/plugins/vmware/nsx.ini b/openstack/etc/neutron/plugins/vmware/nsx.ini new file mode 100644 index 00000000..a9bf5c5e --- /dev/null +++ b/openstack/etc/neutron/plugins/vmware/nsx.ini @@ -0,0 +1,203 @@ +[DEFAULT] +# User name for NSX controller +# nsx_user = admin + +# Password for NSX controller +# nsx_password = admin + +# Time before aborting a request on an unresponsive controller (Seconds) +# http_timeout = 75 + +# Maximum number of times a particular request should be retried +# retries = 2 + +# Maximum number of times a redirect response should be followed +# redirects = 2 + +# Comma-separated list of NSX controller endpoints (:). When port +# is omitted, 443 is assumed. This option MUST be specified, e.g.: +# nsx_controllers = xx.yy.zz.ww:443, aa.bb.cc.dd, ee.ff.gg.hh.ee:80 + +# UUID of the pre-existing default NSX Transport zone to be used for creating +# tunneled isolated "Neutron" networks. This option MUST be specified, e.g.: +# default_tz_uuid = 1e8e52cf-fa7f-46b0-a14a-f99835a9cb53 + +# (Optional) UUID for the default l3 gateway service to use with this cluster. +# To be specified if planning to use logical routers with external gateways. +# default_l3_gw_service_uuid = + +# (Optional) UUID for the default l2 gateway service to use with this cluster. +# To be specified for providing a predefined gateway tenant for connecting their networks. +# default_l2_gw_service_uuid = + +# (Optional) UUID for the default service cluster. A service cluster is introduced to +# represent a group of gateways and it is needed in order to use Logical Services like +# dhcp and metadata in the logical space. NOTE: If agent_mode is set to 'agentless' this +# config parameter *MUST BE* set to a valid pre-existent service cluster uuid. +# default_service_cluster_uuid = + +# Name of the default interface name to be used on network-gateway. This value +# will be used for any device associated with a network gateway for which an +# interface name was not specified +# default_interface_name = breth0 + +# Reconnect connection to nsx if not used within this amount of time. +# conn_idle_timeout = 900 + +[quotas] +# number of network gateways allowed per tenant, -1 means unlimited +# quota_network_gateway = 5 + +[vcns] +# URL for VCNS manager +# manager_uri = https://management_ip + +# User name for VCNS manager +# user = admin + +# Password for VCNS manager +# password = default + +# (Optional) Datacenter ID for Edge deployment +# datacenter_moid = + +# (Optional) Deployment Container ID for NSX Edge deployment +# If not specified, either a default global container will be used, or +# the resource pool and datastore specified below will be used +# deployment_container_id = + +# (Optional) Resource pool ID for NSX Edge deployment +# resource_pool_id = + +# (Optional) Datastore ID for NSX Edge deployment +# datastore_id = + +# (Required) UUID of logic switch for physical network connectivity +# external_network = + +# (Optional) Asynchronous task status check interval +# default is 2000 (millisecond) +# task_status_check_interval = 2000 + +[nsx] +# Maximum number of ports for each bridged logical switch +# The recommended value for this parameter varies with NSX version +# Please use: +# NSX 2.x -> 64 +# NSX 3.0, 3.1 -> 5000 +# NSX 3.2 -> 10000 +# max_lp_per_bridged_ls = 5000 + +# Maximum number of ports for each overlay (stt, gre) logical switch +# max_lp_per_overlay_ls = 256 + +# Number of connections to each controller node. +# default is 10 +# concurrent_connections = 10 + +# Number of seconds a generation id should be valid for (default -1 meaning do not time out) +# nsx_gen_timeout = -1 + +# Acceptable values for 'metadata_mode' are: +# - 'access_network': this enables a dedicated connection to the metadata +# proxy for metadata server access via Neutron router. +# - 'dhcp_host_route': this enables host route injection via the dhcp agent. +# This option is only useful if running on a host that does not support +# namespaces otherwise access_network should be used. +# metadata_mode = access_network + +# The default network transport type to use (stt, gre, bridge, ipsec_gre, or ipsec_stt) +# default_transport_type = stt + +# Specifies in which mode the plugin needs to operate in order to provide DHCP and +# metadata proxy services to tenant instances. If 'agent' is chosen (default) +# the NSX plugin relies on external RPC agents (i.e. dhcp and metadata agents) to +# provide such services. In this mode, the plugin supports API extensions 'agent' +# and 'dhcp_agent_scheduler'. If 'agentless' is chosen (experimental in Icehouse), +# the plugin will use NSX logical services for DHCP and metadata proxy. This +# simplifies the deployment model for Neutron, in that the plugin no longer requires +# the RPC agents to operate. When 'agentless' is chosen, the config option metadata_mode +# becomes ineffective. The 'agentless' mode is supported from NSX 4.2 or above. +# Furthermore, a 'combined' mode is also provided and is used to support existing +# deployments that want to adopt the agentless mode going forward. With this mode, +# existing networks keep being served by the existing infrastructure (thus preserving +# backward compatibility, whereas new networks will be served by the new infrastructure. +# Migration tools are provided to 'move' one network from one model to another; with +# agent_mode set to 'combined', option 'network_auto_schedule' in neutron.conf is +# ignored, as new networks will no longer be scheduled to existing dhcp agents. +# agent_mode = agent + +# Specifies which mode packet replication should be done in. If set to service +# a service node is required in order to perform packet replication. This can +# also be set to source if one wants replication to be performed locally (NOTE: +# usually only useful for testing if one does not want to deploy a service node). +# In order to leverage distributed routers, replication_mode should be set to +# "service". +# replication_mode = service + +[nsx_sync] +# Interval in seconds between runs of the status synchronization task. +# The plugin will aim at resynchronizing operational status for all +# resources in this interval, and it should be therefore large enough +# to ensure the task is feasible. Otherwise the plugin will be +# constantly synchronizing resource status, ie: a new task is started +# as soon as the previous is completed. +# If this value is set to 0, the state synchronization thread for this +# Neutron instance will be disabled. +# state_sync_interval = 10 + +# Random additional delay between two runs of the state synchronization task. +# An additional wait time between 0 and max_random_sync_delay seconds +# will be added on top of state_sync_interval. +# max_random_sync_delay = 0 + +# Minimum delay, in seconds, between two status synchronization requests for NSX. +# Depending on chunk size, controller load, and other factors, state +# synchronization requests might be pretty heavy. This means the +# controller might take time to respond, and its load might be quite +# increased by them. This parameter allows to specify a minimum +# interval between two subsequent requests. +# The value for this parameter must never exceed state_sync_interval. +# If this does, an error will be raised at startup. +# min_sync_req_delay = 1 + +# Minimum number of resources to be retrieved from NSX in a single status +# synchronization request. +# The actual size of the chunk will increase if the number of resources is such +# that using the minimum chunk size will cause the interval between two +# requests to be less than min_sync_req_delay +# min_chunk_size = 500 + +# Enable this option to allow punctual state synchronization on show +# operations. In this way, show operations will always fetch the operational +# status of the resource from the NSX backend, and this might have +# a considerable impact on overall performance. +# always_read_status = False + +[nsx_lsn] +# Pull LSN information from NSX in case it is missing from the local +# data store. This is useful to rebuild the local store in case of +# server recovery +# sync_on_missing_data = False + +[nsx_dhcp] +# (Optional) Comma separated list of additional dns servers. Default is an empty list +# extra_domain_name_servers = + +# Domain to use for building the hostnames +# domain_name = openstacklocal + +# Default DHCP lease time +# default_lease_time = 43200 + +[nsx_metadata] +# IP address used by Metadata server +# metadata_server_address = 127.0.0.1 + +# TCP Port used by Metadata server +# metadata_server_port = 8775 + +# When proxying metadata requests, Neutron signs the Instance-ID header with a +# shared secret to prevent spoofing. You may select any string for a secret, +# but it MUST match with the configuration used by the Metadata server +# metadata_shared_secret = diff --git a/openstack/etc/neutron/policy.json b/openstack/etc/neutron/policy.json new file mode 100644 index 00000000..3f692281 --- /dev/null +++ b/openstack/etc/neutron/policy.json @@ -0,0 +1,138 @@ +{ + "context_is_admin": "role:admin", + "admin_or_owner": "rule:context_is_admin or tenant_id:%(tenant_id)s", + "admin_or_network_owner": "rule:context_is_admin or tenant_id:%(network:tenant_id)s", + "admin_only": "rule:context_is_admin", + "regular_user": "", + "shared": "field:networks:shared=True", + "shared_firewalls": "field:firewalls:shared=True", + "external": "field:networks:router:external=True", + "default": "rule:admin_or_owner", + + "create_subnet": "rule:admin_or_network_owner", + "get_subnet": "rule:admin_or_owner or rule:shared", + "update_subnet": "rule:admin_or_network_owner", + "delete_subnet": "rule:admin_or_network_owner", + + "create_network": "", + "get_network": "rule:admin_or_owner or rule:shared or rule:external", + "get_network:router:external": "rule:regular_user", + "get_network:segments": "rule:admin_only", + "get_network:provider:network_type": "rule:admin_only", + "get_network:provider:physical_network": "rule:admin_only", + "get_network:provider:segmentation_id": "rule:admin_only", + "get_network:queue_id": "rule:admin_only", + "create_network:shared": "rule:admin_only", + "create_network:router:external": "rule:admin_only", + "create_network:segments": "rule:admin_only", + "create_network:provider:network_type": "rule:admin_only", + "create_network:provider:physical_network": "rule:admin_only", + "create_network:provider:segmentation_id": "rule:admin_only", + "update_network": "rule:admin_or_owner", + "update_network:segments": "rule:admin_only", + "update_network:shared": "rule:admin_only", + "update_network:provider:network_type": "rule:admin_only", + "update_network:provider:physical_network": "rule:admin_only", + "update_network:provider:segmentation_id": "rule:admin_only", + "update_network:router:external": "rule:admin_only", + "delete_network": "rule:admin_or_owner", + + "create_port": "", + "create_port:mac_address": "rule:admin_or_network_owner", + "create_port:fixed_ips": "rule:admin_or_network_owner", + "create_port:port_security_enabled": "rule:admin_or_network_owner", + "create_port:binding:host_id": "rule:admin_only", + "create_port:binding:profile": "rule:admin_only", + "create_port:mac_learning_enabled": "rule:admin_or_network_owner", + "get_port": "rule:admin_or_owner", + "get_port:queue_id": "rule:admin_only", + "get_port:binding:vif_type": "rule:admin_only", + "get_port:binding:vif_details": "rule:admin_only", + "get_port:binding:host_id": "rule:admin_only", + "get_port:binding:profile": "rule:admin_only", + "update_port": "rule:admin_or_owner", + "update_port:fixed_ips": "rule:admin_or_network_owner", + "update_port:port_security_enabled": "rule:admin_or_network_owner", + "update_port:binding:host_id": "rule:admin_only", + "update_port:binding:profile": "rule:admin_only", + "update_port:mac_learning_enabled": "rule:admin_or_network_owner", + "delete_port": "rule:admin_or_owner", + + "get_router:ha": "rule:admin_only", + "create_router": "rule:regular_user", + "create_router:external_gateway_info:enable_snat": "rule:admin_only", + "create_router:distributed": "rule:admin_only", + "create_router:ha": "rule:admin_only", + "get_router": "rule:admin_or_owner", + "get_router:distributed": "rule:admin_only", + "update_router:external_gateway_info:enable_snat": "rule:admin_only", + "update_router:distributed": "rule:admin_only", + "update_router:ha": "rule:admin_only", + "delete_router": "rule:admin_or_owner", + + "add_router_interface": "rule:admin_or_owner", + "remove_router_interface": "rule:admin_or_owner", + + "create_firewall": "", + "get_firewall": "rule:admin_or_owner", + "create_firewall:shared": "rule:admin_only", + "get_firewall:shared": "rule:admin_only", + "update_firewall": "rule:admin_or_owner", + "update_firewall:shared": "rule:admin_only", + "delete_firewall": "rule:admin_or_owner", + + "create_firewall_policy": "", + "get_firewall_policy": "rule:admin_or_owner or rule:shared_firewalls", + "create_firewall_policy:shared": "rule:admin_or_owner", + "update_firewall_policy": "rule:admin_or_owner", + "delete_firewall_policy": "rule:admin_or_owner", + + "create_firewall_rule": "", + "get_firewall_rule": "rule:admin_or_owner or rule:shared_firewalls", + "update_firewall_rule": "rule:admin_or_owner", + "delete_firewall_rule": "rule:admin_or_owner", + + "create_qos_queue": "rule:admin_only", + "get_qos_queue": "rule:admin_only", + + "update_agent": "rule:admin_only", + "delete_agent": "rule:admin_only", + "get_agent": "rule:admin_only", + + "create_dhcp-network": "rule:admin_only", + "delete_dhcp-network": "rule:admin_only", + "get_dhcp-networks": "rule:admin_only", + "create_l3-router": "rule:admin_only", + "delete_l3-router": "rule:admin_only", + "get_l3-routers": "rule:admin_only", + "get_dhcp-agents": "rule:admin_only", + "get_l3-agents": "rule:admin_only", + "get_loadbalancer-agent": "rule:admin_only", + "get_loadbalancer-pools": "rule:admin_only", + + "create_floatingip": "rule:regular_user", + "update_floatingip": "rule:admin_or_owner", + "delete_floatingip": "rule:admin_or_owner", + "get_floatingip": "rule:admin_or_owner", + + "create_network_profile": "rule:admin_only", + "update_network_profile": "rule:admin_only", + "delete_network_profile": "rule:admin_only", + "get_network_profiles": "", + "get_network_profile": "", + "update_policy_profiles": "rule:admin_only", + "get_policy_profiles": "", + "get_policy_profile": "", + + "create_metering_label": "rule:admin_only", + "delete_metering_label": "rule:admin_only", + "get_metering_label": "rule:admin_only", + + "create_metering_label_rule": "rule:admin_only", + "delete_metering_label_rule": "rule:admin_only", + "get_metering_label_rule": "rule:admin_only", + + "get_service_provider": "rule:regular_user", + "get_lsn": "rule:admin_only", + "create_lsn": "rule:admin_only" +} diff --git a/openstack/etc/neutron/rootwrap.conf b/openstack/etc/neutron/rootwrap.conf new file mode 100644 index 00000000..ab5f4393 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.conf @@ -0,0 +1,34 @@ +# Configuration for neutron-rootwrap +# This file should be owned by (and only-writeable by) the root user + +[DEFAULT] +# List of directories to load filter definitions from (separated by ','). +# These directories MUST all be only writeable by root ! +filters_path=/etc/neutron/rootwrap.d,/usr/share/neutron/rootwrap + +# List of directories to search executables in, in case filters do not +# explicitely specify a full path (separated by ',') +# If not specified, defaults to system PATH environment variable. +# These directories MUST all be only writeable by root ! +exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin + +# Enable logging to syslog +# Default value is False +use_syslog=False + +# Which syslog facility to use. +# Valid values include auth, authpriv, syslog, local0, local1... +# Default value is 'syslog' +syslog_log_facility=syslog + +# Which messages to log. +# INFO means log all usage +# ERROR means only log unsuccessful attempts +syslog_log_level=ERROR + +[xenapi] +# XenAPI configuration is only required by the L2 agent if it is to +# target a XenServer/XCP compute host's dom0. +xenapi_connection_url= +xenapi_connection_username=root +xenapi_connection_password= diff --git a/openstack/etc/neutron/rootwrap.d/cisco-apic.filters b/openstack/etc/neutron/rootwrap.d/cisco-apic.filters new file mode 100644 index 00000000..69e4afcc --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/cisco-apic.filters @@ -0,0 +1,16 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# cisco-apic filters +lldpctl: CommandFilter, lldpctl, root + +# ip_lib filters +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root diff --git a/openstack/etc/neutron/rootwrap.d/debug.filters b/openstack/etc/neutron/rootwrap.d/debug.filters new file mode 100644 index 00000000..b61d9601 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/debug.filters @@ -0,0 +1,14 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# This is needed because we should ping +# from inside a namespace which requires root +ping: RegExpFilter, ping, root, ping, -w, \d+, -c, \d+, [0-9\.]+ +ping6: RegExpFilter, ping6, root, ping6, -w, \d+, -c, \d+, [0-9A-Fa-f:]+ diff --git a/openstack/etc/neutron/rootwrap.d/dhcp.filters b/openstack/etc/neutron/rootwrap.d/dhcp.filters new file mode 100644 index 00000000..0712ec13 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/dhcp.filters @@ -0,0 +1,35 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# dhcp-agent +dnsmasq: EnvFilter, dnsmasq, root, NEUTRON_NETWORK_ID= +# dhcp-agent uses kill as well, that's handled by the generic KillFilter +# it looks like these are the only signals needed, per +# neutron/agent/linux/dhcp.py +kill_dnsmasq: KillFilter, root, /sbin/dnsmasq, -9, -HUP +kill_dnsmasq_usr: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP + +ovs-vsctl: CommandFilter, ovs-vsctl, root +ivs-ctl: CommandFilter, ivs-ctl, root +mm-ctl: CommandFilter, mm-ctl, root +dhcp_release: CommandFilter, dhcp_release, root + +# metadata proxy +metadata_proxy: CommandFilter, neutron-ns-metadata-proxy, root +# If installed from source (say, by devstack), the prefix will be +# /usr/local instead of /usr/bin. +metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root +# RHEL invocation of the metadata proxy will report /usr/bin/python +kill_metadata: KillFilter, root, python, -9 +kill_metadata7: KillFilter, root, python2.7, -9 + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root diff --git a/openstack/etc/neutron/rootwrap.d/ipset-firewall.filters b/openstack/etc/neutron/rootwrap.d/ipset-firewall.filters new file mode 100644 index 00000000..52c66373 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/ipset-firewall.filters @@ -0,0 +1,12 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] +# neutron/agent/linux/iptables_firewall.py +# "ipset", "-A", ... +ipset: CommandFilter, ipset, root diff --git a/openstack/etc/neutron/rootwrap.d/iptables-firewall.filters b/openstack/etc/neutron/rootwrap.d/iptables-firewall.filters new file mode 100644 index 00000000..b8a6ab5b --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/iptables-firewall.filters @@ -0,0 +1,21 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# neutron/agent/linux/iptables_manager.py +# "iptables-save", ... +iptables-save: CommandFilter, iptables-save, root +iptables-restore: CommandFilter, iptables-restore, root +ip6tables-save: CommandFilter, ip6tables-save, root +ip6tables-restore: CommandFilter, ip6tables-restore, root + +# neutron/agent/linux/iptables_manager.py +# "iptables", "-A", ... +iptables: CommandFilter, iptables, root +ip6tables: CommandFilter, ip6tables, root diff --git a/openstack/etc/neutron/rootwrap.d/l3.filters b/openstack/etc/neutron/rootwrap.d/l3.filters new file mode 100644 index 00000000..be69b32c --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/l3.filters @@ -0,0 +1,48 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# arping +arping: CommandFilter, arping, root + +# l3_agent +sysctl: CommandFilter, sysctl, root +route: CommandFilter, route, root +radvd: CommandFilter, radvd, root + +# metadata proxy +metadata_proxy: CommandFilter, neutron-ns-metadata-proxy, root +# If installed from source (say, by devstack), the prefix will be +# /usr/local instead of /usr/bin. +metadata_proxy_local: CommandFilter, /usr/local/bin/neutron-ns-metadata-proxy, root +# RHEL invocation of the metadata proxy will report /usr/bin/python +kill_metadata: KillFilter, root, python, -9 +kill_metadata7: KillFilter, root, python2.7, -9 +kill_radvd_usr: KillFilter, root, /usr/sbin/radvd, -9, -HUP +kill_radvd: KillFilter, root, /sbin/radvd, -9, -HUP + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root + +# ovs_lib (if OVSInterfaceDriver is used) +ovs-vsctl: CommandFilter, ovs-vsctl, root + +# iptables_manager +iptables-save: CommandFilter, iptables-save, root +iptables-restore: CommandFilter, iptables-restore, root +ip6tables-save: CommandFilter, ip6tables-save, root +ip6tables-restore: CommandFilter, ip6tables-restore, root + +# Keepalived +keepalived: CommandFilter, keepalived, root +kill_keepalived: KillFilter, root, /usr/sbin/keepalived, -HUP, -15, -9 + +# l3 agent to delete floatingip's conntrack state +conntrack: CommandFilter, conntrack, root diff --git a/openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters b/openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters new file mode 100644 index 00000000..b4e1ecba --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/lbaas-haproxy.filters @@ -0,0 +1,26 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# haproxy +haproxy: CommandFilter, haproxy, root + +# lbaas-agent uses kill as well, that's handled by the generic KillFilter +kill_haproxy_usr: KillFilter, root, /usr/sbin/haproxy, -9, -HUP + +ovs-vsctl: CommandFilter, ovs-vsctl, root +mm-ctl: CommandFilter, mm-ctl, root + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root +route: CommandFilter, route, root + +# arping +arping: CommandFilter, arping, root diff --git a/openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters b/openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters new file mode 100644 index 00000000..03df3959 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/linuxbridge-plugin.filters @@ -0,0 +1,19 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# linuxbridge-agent +# unclear whether both variants are necessary, but I'm transliterating +# from the old mechanism +brctl: CommandFilter, brctl, root +bridge: CommandFilter, bridge, root + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root diff --git a/openstack/etc/neutron/rootwrap.d/nec-plugin.filters b/openstack/etc/neutron/rootwrap.d/nec-plugin.filters new file mode 100644 index 00000000..89c4cfe3 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/nec-plugin.filters @@ -0,0 +1,12 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# nec_neutron_agent +ovs-vsctl: CommandFilter, ovs-vsctl, root diff --git a/openstack/etc/neutron/rootwrap.d/ofagent.filters b/openstack/etc/neutron/rootwrap.d/ofagent.filters new file mode 100644 index 00000000..11e42564 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/ofagent.filters @@ -0,0 +1,16 @@ +# neutron-rootwrap command filters for nodes on which +# neutron-ofagent-agent is expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# ovs_lib +ovs-vsctl: CommandFilter, ovs-vsctl, root + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root diff --git a/openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters b/openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters new file mode 100644 index 00000000..b63a83b9 --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/openvswitch-plugin.filters @@ -0,0 +1,22 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +# openvswitch-agent +# unclear whether both variants are necessary, but I'm transliterating +# from the old mechanism +ovs-vsctl: CommandFilter, ovs-vsctl, root +ovs-ofctl: CommandFilter, ovs-ofctl, root +kill_ovsdb_client: KillFilter, root, /usr/bin/ovsdb-client, -9 +ovsdb-client: CommandFilter, ovsdb-client, root +xe: CommandFilter, xe, root + +# ip_lib +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root diff --git a/openstack/etc/neutron/rootwrap.d/vpnaas.filters b/openstack/etc/neutron/rootwrap.d/vpnaas.filters new file mode 100644 index 00000000..7848136b --- /dev/null +++ b/openstack/etc/neutron/rootwrap.d/vpnaas.filters @@ -0,0 +1,13 @@ +# neutron-rootwrap command filters for nodes on which neutron is +# expected to control network +# +# This file should be owned by (and only-writeable by) the root user + +# format seems to be +# cmd-name: filter-name, raw-command, user, args + +[Filters] + +ip: IpFilter, ip, root +ip_exec: IpNetnsExecFilter, ip, root +openswan: CommandFilter, ipsec, root diff --git a/openstack/etc/neutron/vpn_agent.ini b/openstack/etc/neutron/vpn_agent.ini new file mode 100644 index 00000000..c3089df9 --- /dev/null +++ b/openstack/etc/neutron/vpn_agent.ini @@ -0,0 +1,14 @@ +[DEFAULT] +# VPN-Agent configuration file +# Note vpn-agent inherits l3-agent, so you can use configs on l3-agent also + +[vpnagent] +# vpn device drivers which vpn agent will use +# If we want to use multiple drivers, we need to define this option multiple times. +# vpn_device_driver=neutron.services.vpn.device_drivers.ipsec.OpenSwanDriver +# vpn_device_driver=neutron.services.vpn.device_drivers.cisco_ipsec.CiscoCsrIPsecDriver +# vpn_device_driver=another_driver + +[ipsec] +# Status check interval +# ipsec_status_check_interval=60 diff --git a/openstack/etc/nova/api-paste.ini b/openstack/etc/nova/api-paste.ini new file mode 100644 index 00000000..2a825a5b --- /dev/null +++ b/openstack/etc/nova/api-paste.ini @@ -0,0 +1,118 @@ +############ +# Metadata # +############ +[composite:metadata] +use = egg:Paste#urlmap +/: meta + +[pipeline:meta] +pipeline = ec2faultwrap logrequest metaapp + +[app:metaapp] +paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory + +####### +# EC2 # +####### + +[composite:ec2] +use = egg:Paste#urlmap +/services/Cloud: ec2cloud + +[composite:ec2cloud] +use = call:nova.api.auth:pipeline_factory +noauth = ec2faultwrap logrequest ec2noauth cloudrequest validator ec2executor +keystone = ec2faultwrap logrequest ec2keystoneauth cloudrequest validator ec2executor + +[filter:ec2faultwrap] +paste.filter_factory = nova.api.ec2:FaultWrapper.factory + +[filter:logrequest] +paste.filter_factory = nova.api.ec2:RequestLogging.factory + +[filter:ec2lockout] +paste.filter_factory = nova.api.ec2:Lockout.factory + +[filter:ec2keystoneauth] +paste.filter_factory = nova.api.ec2:EC2KeystoneAuth.factory + +[filter:ec2noauth] +paste.filter_factory = nova.api.ec2:NoAuth.factory + +[filter:cloudrequest] +controller = nova.api.ec2.cloud.CloudController +paste.filter_factory = nova.api.ec2:Requestify.factory + +[filter:authorizer] +paste.filter_factory = nova.api.ec2:Authorizer.factory + +[filter:validator] +paste.filter_factory = nova.api.ec2:Validator.factory + +[app:ec2executor] +paste.app_factory = nova.api.ec2:Executor.factory + +############# +# OpenStack # +############# + +[composite:osapi_compute] +use = call:nova.api.openstack.urlmap:urlmap_factory +/: oscomputeversions +/v1.1: openstack_compute_api_v2 +/v2: openstack_compute_api_v2 +/v3: openstack_compute_api_v3 + +[composite:openstack_compute_api_v2] +use = call:nova.api.auth:pipeline_factory +noauth = compute_req_id faultwrap sizelimit noauth ratelimit osapi_compute_app_v2 +keystone = compute_req_id faultwrap sizelimit authtoken keystonecontext ratelimit osapi_compute_app_v2 +keystone_nolimit = compute_req_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v2 + +[composite:openstack_compute_api_v3] +use = call:nova.api.auth:pipeline_factory_v3 +noauth = request_id faultwrap sizelimit noauth_v3 osapi_compute_app_v3 +keystone = request_id faultwrap sizelimit authtoken keystonecontext osapi_compute_app_v3 + +[filter:request_id] +paste.filter_factory = nova.openstack.common.middleware.request_id:RequestIdMiddleware.factory + +[filter:compute_req_id] +paste.filter_factory = nova.api.compute_req_id:ComputeReqIdMiddleware.factory + +[filter:faultwrap] +paste.filter_factory = nova.api.openstack:FaultWrapper.factory + +[filter:noauth] +paste.filter_factory = nova.api.openstack.auth:NoAuthMiddleware.factory + +[filter:noauth_v3] +paste.filter_factory = nova.api.openstack.auth:NoAuthMiddlewareV3.factory + +[filter:ratelimit] +paste.filter_factory = nova.api.openstack.compute.limits:RateLimitingMiddleware.factory + +[filter:sizelimit] +paste.filter_factory = nova.api.sizelimit:RequestBodySizeLimiter.factory + +[app:osapi_compute_app_v2] +paste.app_factory = nova.api.openstack.compute:APIRouter.factory + +[app:osapi_compute_app_v3] +paste.app_factory = nova.api.openstack.compute:APIRouterV3.factory + +[pipeline:oscomputeversions] +pipeline = faultwrap oscomputeversionapp + +[app:oscomputeversionapp] +paste.app_factory = nova.api.openstack.compute.versions:Versions.factory + +########## +# Shared # +########## + +[filter:keystonecontext] +paste.filter_factory = nova.api.auth:NovaKeystoneContext.factory + +[filter:authtoken] +paste.filter_factory = keystonemiddleware.auth_token:filter_factory diff --git a/openstack/etc/nova/cells.json b/openstack/etc/nova/cells.json new file mode 100644 index 00000000..cc74930d --- /dev/null +++ b/openstack/etc/nova/cells.json @@ -0,0 +1,26 @@ +{ + "parent": { + "name": "parent", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": true + }, + "cell1": { + "name": "cell1", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit1.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": false + }, + "cell2": { + "name": "cell2", + "api_url": "http://api.example.com:8774", + "transport_url": "rabbit://rabbit2.example.com", + "weight_offset": 0.0, + "weight_scale": 1.0, + "is_parent": false + } +} diff --git a/openstack/etc/nova/logging.conf b/openstack/etc/nova/logging.conf new file mode 100644 index 00000000..5482a040 --- /dev/null +++ b/openstack/etc/nova/logging.conf @@ -0,0 +1,81 @@ +[loggers] +keys = root, nova + +[handlers] +keys = stderr, stdout, watchedfile, syslog, null + +[formatters] +keys = context, default + +[logger_root] +level = WARNING +handlers = null + +[logger_nova] +level = INFO +handlers = stderr +qualname = nova + +[logger_amqp] +level = WARNING +handlers = stderr +qualname = amqp + +[logger_amqplib] +level = WARNING +handlers = stderr +qualname = amqplib + +[logger_sqlalchemy] +level = WARNING +handlers = stderr +qualname = sqlalchemy +# "level = INFO" logs SQL queries. +# "level = DEBUG" logs SQL queries and results. +# "level = WARNING" logs neither. (Recommended for production systems.) + +[logger_boto] +level = WARNING +handlers = stderr +qualname = boto + +[logger_suds] +level = INFO +handlers = stderr +qualname = suds + +[logger_eventletwsgi] +level = WARNING +handlers = stderr +qualname = eventlet.wsgi.server + +[handler_stderr] +class = StreamHandler +args = (sys.stderr,) +formatter = context + +[handler_stdout] +class = StreamHandler +args = (sys.stdout,) +formatter = context + +[handler_watchedfile] +class = handlers.WatchedFileHandler +args = ('nova.log',) +formatter = context + +[handler_syslog] +class = handlers.SysLogHandler +args = ('/dev/log', handlers.SysLogHandler.LOG_USER) +formatter = context + +[handler_null] +class = nova.openstack.common.log.NullHandler +formatter = default +args = () + +[formatter_context] +class = nova.openstack.common.log.ContextFormatter + +[formatter_default] +format = %(message)s diff --git a/openstack/etc/nova/nova-compute.conf b/openstack/etc/nova/nova-compute.conf new file mode 100644 index 00000000..1ef5590c --- /dev/null +++ b/openstack/etc/nova/nova-compute.conf @@ -0,0 +1,4 @@ +[DEFAULT] +compute_driver=libvirt.LibvirtDriver +[libvirt] +virt_type=qemu diff --git a/openstack/etc/nova/nova.conf b/openstack/etc/nova/nova.conf new file mode 100644 index 00000000..b703591f --- /dev/null +++ b/openstack/etc/nova/nova.conf @@ -0,0 +1,631 @@ +# Full list of options available at: http://wiki.openstack.org/NovaConfigOptions +[DEFAULT] + +# LOG/STATE +verbose=True +logdir=/var/log/nova + +### nova.availability_zones ### +############################### +# availability_zone to show internal services under (string value) +#internal_service_availability_zone=internal + +# default compute node availability_zone (string value) +#default_availability_zone=nova + +### nova.crypto ### +################### +# Filename of root CA (string value) +#ca_file=cacert.pem + +# Filename of private key (string value) +#key_file=private/cakey.pem + +# Filename of root Certificate Revocation List (string value) +#crl_file=crl.pem + +# Where we keep our keys (string value) +#keys_path=$state_path/keys + +# Where we keep our root CA (string value) +#ca_path=$state_path/CA + +# Should we use a CA for each project? (boolean value) +#use_project_ca=false + +# Subject for certificate for users, %s for project, user, +# timestamp (string value) +#user_cert_subject=/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s + +# Subject for certificate for projects, %s for project, +# timestamp (string value) +#project_cert_subject=/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s + +### nova.exception ### +# make exception message format errors fatal (boolean value) +#fatal_exception_format_errors=false + +### nova.manager ### +# Some periodic tasks can be run in a separate process. Should +# we run them here? (boolean value) +#run_external_periodic_tasks=true + +############################# +# Mandatory general options # +############################# +# ip address of this host (string value) +my_ip=##NOVA_HOST## +#use_ipv6=false + + +######## +# APIs # +######## +# Selects the type of APIs you want to activate. +# Each API will bind on a specific port. +# Compute nodes should run only the metadata API, +# a nova API endpoint node should run osapi_compute. +# If you want to use nova-volume you can also enable +# osapi_volume, but if you want to run cinder, do not +# activate it. +# The list of API is: ec2,osapi_compute,metadata,osapi_volume +enabled_apis=ec2,osapi_compute,metadata + +# NOVA API # +# # # # # # +#osapi_compute_listen="0.0.0.0" +#osapi_compute_listen_port=8774 + +#api_paste_config=api-paste.ini + +# Allows use of instance password during server creation +#enable_instance_password=true + + +# Name of this node. This can be an opaque identifier. It is +# not necessarily a hostname, FQDN, or IP address. However, +# the node name must be valid within an AMQP key, and if using +# ZeroMQ, a valid hostname, FQDN, or IP address (string value) +#host="firefly-2.local" + +####################### +# Nova API extentions # +####################### +# osapi compute extension to load (multi valued) +osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions + +# Specify list of extensions to load when using +# osapi_compute_extension option with +# nova.api.openstack.compute.contrib.select_extensions (list value) +#osapi_compute_ext_list="" + +# Permit instance snapshot operations. (boolean value) +#allow_instance_snapshots=true + +# S3 # +# # # +s3_host=$my_ip +#s3_port=3333 + +# EC2 API # +# # # # # # +#ec2_host="$my_ip" +ec2_dmz_host="$my_ip" +#ec2_private_dns_show_ip=True +#ec2_path="/services/Cloud" +#ec2_port=8773 +# the protocol to use when connecting to the ec2 api server (http, https) (string value) +#ec2_scheme=http + +# port and IP for ec2 api to listen +#ec2_listen="0.0.0.0" +#ec2_listen_port=8773 + +# Metadata API # +# # # # # # # # +#metadata_host=$my_ip +#metadata_port=8775 +#metadata_listen=0.0.0.0 + +######## +# MISC # +######## +#resume_guests_state_on_host_boot=false +#instance_name_template="instance-%08x" +# Inject the admin password at boot time, without an agent. +#libvirt_inject_password=false + +######## +# LOGS # +######## +#log-date-format="%Y-%m-%d %H:%M:%S" +#debug=false + +########## +# SYSTEM # +########## +state_path=/var/lib/nova +lock_path=/var/lock/nova +rootwrap_config=/etc/nova/rootwrap.conf +#memcached_servers= + +################## +# AUTHENTICATION # +################## +auth_strategy=keystone +# Seconds for auth tokens to linger + +############# +# SCHEDULER # +############# +compute_scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler +#scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler +scheduler_default_filters=AggregateInstanceExtraSpecsFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter + +#################### +# VOLUMES / CINDER # +#################### +# The full class name of the volume API class to use (string value) +#volume_api_class=nova.volume.cinder.API + +# Allow to perform insecure SSL requests to cinder (boolean value) +#cinder_api_insecure=false + +# Allow attach between instance and volume in different +# availability zones. (boolean value) +#cinder_cross_az_attach=true + +# Libvirt handlers for remote volumes. (list value) +#libvirt_volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver + +############ +# RABBITMQ # +############ +rabbit_host = ##RABBITMQ_HOST## +#fake_rabbit=false +#rabbit_virtual_host=/ +rabbit_userid = ##RABBITMQ_USER## +rabbit_password = ##RABBITMQ_PASSWORD## +rabbit_port = ##RABBITMQ_PORT## +rabbit_use_ssl=false +#rabbit_retry_interval=1 +# The messaging module to use, defaults to kombu (works for rabbit). +# You can also use qpid: nova.rpc.impl_qpid +rpc_backend = nova.openstack.common.rpc.impl_kombu + +########## +# GLANCE # +########## +host=##GLANCE_HOST## +port=9292 +protocol=http + +# A list of the glance api servers available to nova. Prefix +# with https:// for ssl-based glance api servers. +# ([hostname|ip]:port) (list value) +api_servers=$glance_host:$glance_port +#api_servers=localhost:9292 + +# Allow to perform insecure SSL (https) requests to glance (boolean value) +#api_insecure=false + +# Cache glance images locally +#cache_images=true +# Number retries when downloading an image from glance (integer value) +#num_retries=0 + +#image_service=nova.image.glance.GlanceImageService + +############################### +# Type of network APIs to use # +############################### +# The full class name of the network API class to use (string value) +# Possible values are: +# nova.network.api.API (if you wish to use nova-network) +# nova.network.neutronv2.api.API (if you want to use Neutron) +network_api_class=nova.network.neutronv2.api.API + +# Type of security group API. Possible values are: +# nova (if you are using nova-network) +# neutron (if you use neutron) +security_group_api = neutron + +# Driver used to create ethernet devices. (string value) +# When using linux net, use: nova.network.linux_net.LinuxBridgeInterfaceDriver +# for Neutron, use: nova.network.linux_net.LinuxOVSInterfaceDriver +linuxnet_interface_driver=nova.network.linux_net.LinuxOVSInterfaceDriver + +# Firewall type to use. (defaults to hypervisor specific iptables driver) (string value) +# For linux net, use: nova.virt.libvirt.firewall.IptablesFirewallDriver +# For Neutron and OVS, use: nova.virt.firewall.NoopFirewallDriver (since this is handled by Neutron) +###firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver +firewall_driver=nova.virt.firewall.NoopFirewallDriver + +####################### +# NETWORK (linux net) # +####################### +#network_manager=nova.network.manager.VlanManager +network_manager=nova.network.manager.FlatDHCPManager +#force_dhcp_release=false +force_dhcp_release=True +#dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf +dhcpbridge_flagfile=/etc/nova/nova.conf +#dhcpbridge=$bindir/nova-dhcpbridge +#dhcp_lease_time=120 +# Firewall driver (defaults to hypervisor specific iptables driver) (string value) +firewall_driver=nova.virt.libvirt.firewall.IptablesFirewallDriver +# Interface for public IP addresses (default: eth0) (string value) +#public_interface=br-ext +public_interface=eth0 +# vlans will bridge into this interface if set (default: ) (string value) +# FlatDhcp will bridge into this interface if set (default: ) (string value) +#vlan_interface=eth1 +vlan_interface=eth0 +# Bridge for simple network instances (default: ) (string value) +flat_network_bridge=br100 +# FlatDhcp will bridge into this interface if set (default: ) (string value) +flat_interface=eth0 + +# set it to the /32 of your metadata server if you have just one +# It is a cidr in case there are multiple services that you want +# to keep using the internal private ips. +# A list of dmz range that should be accepted (list value) +#dmz_cidr=169.254.169.254/32 +# Name of Open vSwitch bridge used with linuxnet (string value) +#linuxnet_ovs_integration_bridge="br-int" +#routing_source_ip="$my_ip" +# Only first nic of vm will get default gateway from dhcp server +#use_single_default_gateway=false + +########### +# Neutron # +########### +# This is the URL of your neutron server: +neutron_url=##NEUTRON_PUBLIC_URL## +neutron_auth_strategy=keystone +neutron_admin_tenant_name=service +neutron_admin_username=##NEUTRON_SERVICE_USER## +neutron_admin_password=##NEUTRON_SERVICE_PASSWORD## +# This is the URL of your Keystone server +neutron_admin_auth_url=##KEYSTONE_ADMIN_URL## + +# What's below is only needed for nova-compute. + +# Set flag to indicate Neutron will proxy metadata requests +# and resolve instance ids. This is needed to use neutron-metadata-agent +# (instead of the metadata server of nova-api, +# which doesn't work with neutron) (boolean value) +service_neutron_metadata_proxy=True + +# Shared secret to validate proxies Neutron metadata requests +# This password should match what is in /etc/neutron/metadata_agent.ini +# (string value) +neutron_metadata_proxy_shared_secret= ##METADATA_PROXY_SHARED_SECRET## + +################# +# NOVNC CONSOLE # +################# +# By default with the Debian package, the spicehtml5 console is the default. To +# enable the NoVNC mode, enable the switch below, disable SPICE in this +# nova.conf file as well (see far below), then edit +# /etc/default/nova-consoleproxy to switch to NoVNC, shutdown the SPICE with +# /etc/init.d/nova-spicehtml5proxy stop, and finally start nova-novncproxy. +# Do not forget to restart Nova daemons and restart your VMs if you want to use +# NoVNC form now on (VMs video card needs to be attached to a console type, and +# they can accept only one video card at a time). +vnc_enabled=True +novncproxy_base_url=##NOVA_NOVNCPROXY_BASE_URL## +# Change vncserver_proxyclient_address and vncserver_listen to match each compute host +vncserver_proxyclient_address=##NOVA_HOST## +vncserver_listen=##NOVA_HOST## +vnc_keymap="en-us" + +###################################### +# nova-xenvncproxy (eg: xvpvncproxy) # +###################################### +# See NoVNC comments above for switching away from SPICE to XVP +#xvpvncproxy_host="0.0.0.0" +#xvpvncproxy_port=6081 + +######### +# QUOTA # +######### +# number of instances allowed per project (integer value) +#quota_instances=10 +# number of instance cores allowed per project (integer value) +#quota_cores=20 +# megabytes of instance ram allowed per project (integer value) +#quota_ram=51200 +# number of floating ips allowed per project (integer value) +#quota_floating_ips=10 +# number of metadata items allowed per instance (integer value) +#quota_metadata_items=128 +# number of injected files allowed (integer value) +#quota_injected_files=5 +# number of bytes allowed per injected file (integer value) +#quota_injected_file_content_bytes=10240 +# number of bytes allowed per injected file path (integer value) +#quota_injected_file_path_bytes=255 +# number of security groups per project (integer value) +#quota_security_groups=10 +# number of security rules per security group (integer value) +#quota_security_group_rules=20 +# number of key pairs per user (integer value) +#quota_key_pairs=100 +# number of seconds until a reservation expires (integer value) +#reservation_expire=86400 +# count of reservations until usage is refreshed (integer value) +#until_refresh=0 +# number of seconds between subsequent usage refreshes (integer value) +#max_age=0 +# default driver to use for quota checks (string value) +#quota_driver=nova.quota.DbQuotaDriver + +############ +# DATABASE # +############ +[database] +connection=postgresql://##NOVA_DB_USER##:##NOVA_DB_PASSWORD##@onenode/nova + +############# +# CONDUCTOR # +############# +[conductor] +# Perform nova-conductor operations locally (boolean value) +# use_local enabled for one node. For multinode this should be disabled. +use_local=true +# the topic conductor nodes listen on (string value) +#topic=conductor +# full class name for the Manager for conductor (string value) +#manager=nova.conductor.manager.ConductorManager + +######### +# CELLS # +######### +[cells] +# Cells communication driver to use (string value) +#driver=nova.cells.rpc_driver.CellsRPCDriver + +# Number of seconds after an instance was updated or deleted +# to continue to update cells (integer value) +#instance_updated_at_threshold=3600 + +# Number of instances to update per periodic task run (integer +# value) +#instance_update_num_instances=1 + +# Maximum number of hops for cells routing. (integer value) +#max_hop_count=10 + +# Cells scheduler to use (string value) +#scheduler=nova.cells.scheduler.CellsScheduler + +# Enable cell functionality (boolean value) +#enable=false + +# the topic cells nodes listen on (string value) +#topic=cells + +# Manager for cells (string value) +#manager=nova.cells.manager.CellsManager + +# name of this cell (string value) +#name=nova + +# Key/Multi-value list with the capabilities of the cell (list +# value) +#capabilities=hypervisor=xenserver;kvm,os=linux;windows + +# Seconds to wait for response from a call to a cell. (integer +# value) +#call_timeout=60 + +# Percentage of cell capacity to hold in reserve. Affects both +# memory and disk utilization (floating point value) +#reserve_percent=10.0 + +# Type of cell: api or compute (string value) +#cell_type= + +# Base queue name to use when communicating between cells. +# Various topics by message type will be appended to this. +# (string value) +#rpc_driver_queue_base=cells.intercell + +# Filter classes the cells scheduler should use. An entry of +# "nova.cells.filters.all_filters"maps to all cells filters +# included with nova. (list value) +#scheduler_filter_classes=nova.cells.filters.all_filters + +# Weigher classes the cells scheduler should use. An entry of +# "nova.cells.weights.all_weighers"maps to all cell weighers +# included with nova. (list value) +#scheduler_weight_classes=nova.cells.weights.all_weighers + +# How many retries when no cells are available. (integer +# value) +#scheduler_retries=10 + +# How often to retry in seconds when no cells are available. +# (integer value) +#scheduler_retry_delay=2 + +# Seconds between getting fresh cell info from db. (integer +# value) +#db_check_interval=60 + +# Multiplier used to weigh mute children. (The value should +# be negative.) (floating point value) +#mute_weight_multiplier=-10.0 + +# Weight value assigned to mute children. (The value should +# be positive.) (floating point value) +#mute_weight_value=1000.0 + +# Number of seconds after which a lack of capability and +# capacity updates signals the child cell is to be treated as +# a mute. (integer value) +#mute_child_interval=300 + +# Multiplier used for weighing ram. Negative numbers mean to +# stack vs spread. (floating point value) +#ram_weight_multiplier=10.0 + +############# +# BAREMETAL # +############# +[baremetal] +# The backend to use for bare-metal database (string value) +#db_backend=sqlalchemy + +# The SQLAlchemy connection string used to connect to the +# bare-metal database (string value) +#sql_connection=sqlite:///$state_path/baremetal_$sqlite_db + +# Whether baremetal compute injects password or not (boolean value) +#inject_password=true + +# Template file for injected network (string value) +#injected_network_template=$pybasedir/nova/virt/baremetal/interfaces.template + +# Baremetal VIF driver. (string value) +#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver + +# Baremetal volume driver. (string value) +#volume_driver=nova.virt.baremetal.volume_driver.LibvirtVolumeDriver + +# a list of additional capabilities corresponding to +# instance_type_extra_specs for this compute host to +# advertise. Valid entries are name=value, pairs For example, +# "key1:val1, key2:val2" (list value) +#instance_type_extra_specs= + +# Baremetal driver back-end (pxe or tilera) (string value) +#driver=nova.virt.baremetal.pxe.PXE + +# Baremetal power management method (string value) +#power_manager=nova.virt.baremetal.ipmi.IPMI + +# Baremetal compute node's tftp root path (string value) +#tftp_root=/tftpboot + +# path to baremetal terminal program (string value) +#terminal=shellinaboxd + +# path to baremetal terminal SSL cert(PEM) (string value) +#terminal_cert_dir= + +# path to directory stores pidfiles of baremetal_terminal +# (string value) +#terminal_pid_dir=$state_path/baremetal/console + +# maximal number of retries for IPMI operations (integer +# value) +#ipmi_power_retry=5 + +# Default kernel image ID used in deployment phase (string +# value) +#deploy_kernel= + +# Default ramdisk image ID used in deployment phase (string +# value) +#deploy_ramdisk= + +# Template file for injected network config (string value) +#net_config_template=$pybasedir/nova/virt/baremetal/net-dhcp.ubuntu.template + +# additional append parameters for baremetal PXE boot (string +# value) +#pxe_append_params= + +# Template file for PXE configuration (string value) +#pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template + +# Timeout for PXE deployments. Default: 0 (unlimited) (integer +# value) +#pxe_deploy_timeout=0 + +# ip or name to virtual power host (string value) +#virtual_power_ssh_host= + +# base command to use for virtual power(vbox,virsh) (string +# value) +#virtual_power_type=vbox + +# user to execute virtual power commands as (string value) +#virtual_power_host_user= + +# password for virtual power host_user (string value) +#virtual_power_host_pass= + +# Do not set this out of dev/test environments. If a node does +# not have a fixed PXE IP address, volumes are exported with +# globally opened ACL (boolean value) +#use_unsafe_iscsi=false + +# iSCSI IQN prefix used in baremetal volume connections. +# (string value) +#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal + +########## +# VMWARE # +########## +[vmware] +# Name of Integration Bridge (string value) +#integration_bridge=br-int + +######### +# SPICE # +######### +[spice] +# location of spice html5 console proxy, in the form +# "http://www.example.com:6082/spice_auto.html" (string value) +#html5proxy_base_url=http://localhost:6082/spice_auto.html + +# IP address on which instance spice server should listen (string value) +#server_listen=0.0.0.0 + +# the address to which proxy clients (like nova-spicehtml5proxy) should connect (string value) +#server_proxyclient_address=$my_ip + +# enable spice related features (boolean value) +#enabled=true +enabled=false + +# enable spice guest agent support (boolean value) +#agent_enabled=true + +# keymap for spice (string value) +#keymap=en-us + +###################### +# Keystone authtoken # +###################### +[keystone_authtoken] +identity_uri = ##IDENTITY_URI## +auth_uri = ##KEYSTONE_INTERNAL_URL## +auth_port = 35357 +auth_protocol = http +admin_tenant_name = service +admin_user = ##NOVA_SERVICE_USER## +admin_password = ##NOVA_SERVICE_PASSWORD## +auth_version = v2.0 + +########### +# COMPUTE # +########### +compute_driver=libvirt.LibvirtDriver +instance_name_template=instance-%08x +api_paste_config=/etc/nova/api-paste.ini + +# COMPUTE/APIS: if you have separate configs for separate services +# # this flag is required for both nova-api and nova-compute +allow_resize_to_same_host=True + +############ +## LIBVIRT # +############ +[libvirt] +# Actual testing hardware does not support hardware acceleration +# so in this step we will configure libvirt to use qemu instead of KVM +virt_type=qemu diff --git a/openstack/etc/nova/nova.conf.example b/openstack/etc/nova/nova.conf.example new file mode 100644 index 00000000..999574ca --- /dev/null +++ b/openstack/etc/nova/nova.conf.example @@ -0,0 +1,3698 @@ + + +[DEFAULT] + +# +# Options defined in oslo.messaging +# + +# Use durable queues in amqp. (boolean value) +# Deprecated group/name - [DEFAULT]/rabbit_durable_queues +#amqp_durable_queues=false + +# Auto-delete queues in amqp. (boolean value) +#amqp_auto_delete=false + +# Size of RPC connection pool. (integer value) +#rpc_conn_pool_size=30 + +# Modules of exceptions that are permitted to be recreated +# upon receiving exception data from an rpc call. (list value) +#allowed_rpc_exception_modules=oslo.messaging.exceptions,nova.exception,cinder.exception,exceptions + +# Qpid broker hostname. (string value) +#qpid_hostname=localhost + +# Qpid broker port. (integer value) +#qpid_port=5672 + +# Qpid HA cluster host:port pairs. (list value) +#qpid_hosts=$qpid_hostname:$qpid_port + +# Username for Qpid connection. (string value) +#qpid_username= + +# Password for Qpid connection. (string value) +#qpid_password= + +# Space separated list of SASL mechanisms to use for auth. +# (string value) +#qpid_sasl_mechanisms= + +# Seconds between connection keepalive heartbeats. (integer +# value) +#qpid_heartbeat=60 + +# Transport to use, either 'tcp' or 'ssl'. (string value) +#qpid_protocol=tcp + +# Whether to disable the Nagle algorithm. (boolean value) +#qpid_tcp_nodelay=true + +# The qpid topology version to use. Version 1 is what was +# originally used by impl_qpid. Version 2 includes some +# backwards-incompatible changes that allow broker federation +# to work. Users should update to version 2 when they are +# able to take everything down, as it requires a clean break. +# (integer value) +#qpid_topology_version=1 + +# SSL version to use (valid only if SSL enabled). valid values +# are TLSv1, SSLv23 and SSLv3. SSLv2 may be available on some +# distributions. (string value) +#kombu_ssl_version= + +# SSL key file (valid only if SSL enabled). (string value) +#kombu_ssl_keyfile= + +# SSL cert file (valid only if SSL enabled). (string value) +#kombu_ssl_certfile= + +# SSL certification authority file (valid only if SSL +# enabled). (string value) +#kombu_ssl_ca_certs= + +# How long to wait before reconnecting in response to an AMQP +# consumer cancel notification. (floating point value) +#kombu_reconnect_delay=1.0 + +# The RabbitMQ broker address where a single node is used. +# (string value) +#rabbit_host=localhost + +# The RabbitMQ broker port where a single node is used. +# (integer value) +#rabbit_port=5672 + +# RabbitMQ HA cluster host:port pairs. (list value) +#rabbit_hosts=$rabbit_host:$rabbit_port + +# Connect over SSL for RabbitMQ. (boolean value) +#rabbit_use_ssl=false + +# The RabbitMQ userid. (string value) +#rabbit_userid=guest + +# The RabbitMQ password. (string value) +#rabbit_password=guest + +# the RabbitMQ login method (string value) +#rabbit_login_method=AMQPLAIN + +# The RabbitMQ virtual host. (string value) +#rabbit_virtual_host=/ + +# How frequently to retry connecting with RabbitMQ. (integer +# value) +#rabbit_retry_interval=1 + +# How long to backoff for between retries when connecting to +# RabbitMQ. (integer value) +#rabbit_retry_backoff=2 + +# Maximum number of RabbitMQ connection retries. Default is 0 +# (infinite retry count). (integer value) +#rabbit_max_retries=0 + +# Use HA queues in RabbitMQ (x-ha-policy: all). If you change +# this option, you must wipe the RabbitMQ database. (boolean +# value) +#rabbit_ha_queues=false + +# If passed, use a fake RabbitMQ provider. (boolean value) +#fake_rabbit=false + +# ZeroMQ bind address. Should be a wildcard (*), an ethernet +# interface, or IP. The "host" option should point or resolve +# to this address. (string value) +#rpc_zmq_bind_address=* + +# MatchMaker driver. (string value) +#rpc_zmq_matchmaker=oslo.messaging._drivers.matchmaker.MatchMakerLocalhost + +# ZeroMQ receiver listening port. (integer value) +#rpc_zmq_port=9501 + +# Number of ZeroMQ contexts, defaults to 1. (integer value) +#rpc_zmq_contexts=1 + +# Maximum number of ingress messages to locally buffer per +# topic. Default is unlimited. (integer value) +#rpc_zmq_topic_backlog= + +# Directory for holding IPC sockets. (string value) +#rpc_zmq_ipc_dir=/var/run/openstack + +# Name of this node. Must be a valid hostname, FQDN, or IP +# address. Must match "host" option, if running Nova. (string +# value) +#rpc_zmq_host=nova + +# Seconds to wait before a cast expires (TTL). Only supported +# by impl_zmq. (integer value) +#rpc_cast_timeout=30 + +# Heartbeat frequency. (integer value) +#matchmaker_heartbeat_freq=300 + +# Heartbeat time-to-live. (integer value) +#matchmaker_heartbeat_ttl=600 + +# Host to locate redis. (string value) +#host=127.0.0.1 + +# Use this port to connect to redis host. (integer value) +#port=6379 + +# Password for Redis server (optional). (string value) +#password= + +# Size of RPC greenthread pool. (integer value) +#rpc_thread_pool_size=64 + +# Driver or drivers to handle sending notifications. (multi +# valued) +#notification_driver= + +# AMQP topic used for OpenStack notifications. (list value) +# Deprecated group/name - [rpc_notifier2]/topics +#notification_topics=notifications + +# Seconds to wait for a response from a call. (integer value) +#rpc_response_timeout=60 + +# A URL representing the messaging driver to use and its full +# configuration. If not set, we fall back to the rpc_backend +# option and driver specific configuration. (string value) +#transport_url= + +# The messaging driver to use, defaults to rabbit. Other +# drivers include qpid and zmq. (string value) +#rpc_backend=rabbit + +# The default exchange under which topics are scoped. May be +# overridden by an exchange name specified in the +# transport_url option. (string value) +#control_exchange=openstack + + +# +# Options defined in nova.availability_zones +# + +# The availability_zone to show internal services under +# (string value) +#internal_service_availability_zone=internal + +# Default compute node availability_zone (string value) +#default_availability_zone=nova + + +# +# Options defined in nova.crypto +# + +# Filename of root CA (string value) +#ca_file=cacert.pem + +# Filename of private key (string value) +#key_file=private/cakey.pem + +# Filename of root Certificate Revocation List (string value) +#crl_file=crl.pem + +# Where we keep our keys (string value) +#keys_path=$state_path/keys + +# Where we keep our root CA (string value) +#ca_path=$state_path/CA + +# Should we use a CA for each project? (boolean value) +#use_project_ca=false + +# Subject for certificate for users, %s for project, user, +# timestamp (string value) +#user_cert_subject=/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=%.16s-%.16s-%s + +# Subject for certificate for projects, %s for project, +# timestamp (string value) +#project_cert_subject=/C=US/ST=California/O=OpenStack/OU=NovaDev/CN=project-ca-%.16s-%s + + +# +# Options defined in nova.exception +# + +# Make exception message format errors fatal (boolean value) +#fatal_exception_format_errors=false + + +# +# Options defined in nova.netconf +# + +# IP address of this host (string value) +#my_ip=10.0.0.1 + +# Name of this node. This can be an opaque identifier. It is +# not necessarily a hostname, FQDN, or IP address. However, +# the node name must be valid within an AMQP key, and if using +# ZeroMQ, a valid hostname, FQDN, or IP address (string value) +#host=nova + +# Use IPv6 (boolean value) +#use_ipv6=false + + +# +# Options defined in nova.notifications +# + +# If set, send compute.instance.update notifications on +# instance state changes. Valid values are None for no +# notifications, "vm_state" for notifications on VM state +# changes, or "vm_and_task_state" for notifications on VM and +# task state changes. (string value) +#notify_on_state_change= + +# If set, send api.fault notifications on caught exceptions in +# the API service. (boolean value) +#notify_api_faults=false + +# Default notification level for outgoing notifications +# (string value) +#default_notification_level=INFO + +# Default publisher_id for outgoing notifications (string +# value) +#default_publisher_id= + + +# +# Options defined in nova.paths +# + +# Directory where the nova python module is installed (string +# value) +#pybasedir=/usr/lib/python/site-packages + +# Directory where nova binaries are installed (string value) +#bindir=/usr/local/bin + +# Top-level directory for maintaining nova's state (string +# value) +#state_path=$pybasedir + + +# +# Options defined in nova.policy +# + +# JSON file representing policy (string value) +#policy_file=policy.json + +# Rule checked when requested rule is not found (string value) +#policy_default_rule=default + + +# +# Options defined in nova.quota +# + +# Number of instances allowed per project (integer value) +#quota_instances=10 + +# Number of instance cores allowed per project (integer value) +#quota_cores=20 + +# Megabytes of instance RAM allowed per project (integer +# value) +#quota_ram=51200 + +# Number of floating IPs allowed per project (integer value) +#quota_floating_ips=10 + +# Number of fixed IPs allowed per project (this should be at +# least the number of instances allowed) (integer value) +#quota_fixed_ips=-1 + +# Number of metadata items allowed per instance (integer +# value) +#quota_metadata_items=128 + +# Number of injected files allowed (integer value) +#quota_injected_files=5 + +# Number of bytes allowed per injected file (integer value) +#quota_injected_file_content_bytes=10240 + +# Number of bytes allowed per injected file path (integer +# value) +#quota_injected_file_path_bytes=255 + +# Number of security groups per project (integer value) +#quota_security_groups=10 + +# Number of security rules per security group (integer value) +#quota_security_group_rules=20 + +# Number of key pairs per user (integer value) +#quota_key_pairs=100 + +# Number of seconds until a reservation expires (integer +# value) +#reservation_expire=86400 + +# Count of reservations until usage is refreshed (integer +# value) +#until_refresh=0 + +# Number of seconds between subsequent usage refreshes +# (integer value) +#max_age=0 + +# Default driver to use for quota checks (string value) +#quota_driver=nova.quota.DbQuotaDriver + + +# +# Options defined in nova.service +# + +# Seconds between nodes reporting state to datastore (integer +# value) +#report_interval=10 + +# Enable periodic tasks (boolean value) +#periodic_enable=true + +# Range of seconds to randomly delay when starting the +# periodic task scheduler to reduce stampeding. (Disable by +# setting to 0) (integer value) +#periodic_fuzzy_delay=60 + +# A list of APIs to enable by default (list value) +#enabled_apis=ec2,osapi_compute,metadata + +# A list of APIs with enabled SSL (list value) +#enabled_ssl_apis= + +# The IP address on which the EC2 API will listen. (string +# value) +#ec2_listen=0.0.0.0 + +# The port on which the EC2 API will listen. (integer value) +#ec2_listen_port=8773 + +# Number of workers for EC2 API service. The default will be +# equal to the number of CPUs available. (integer value) +#ec2_workers= + +# The IP address on which the OpenStack API will listen. +# (string value) +#osapi_compute_listen=0.0.0.0 + +# The port on which the OpenStack API will listen. (integer +# value) +#osapi_compute_listen_port=8774 + +# Number of workers for OpenStack API service. The default +# will be the number of CPUs available. (integer value) +#osapi_compute_workers= + +# OpenStack metadata service manager (string value) +#metadata_manager=nova.api.manager.MetadataManager + +# The IP address on which the metadata API will listen. +# (string value) +#metadata_listen=0.0.0.0 + +# The port on which the metadata API will listen. (integer +# value) +#metadata_listen_port=8775 + +# Number of workers for metadata service. The default will be +# the number of CPUs available. (integer value) +#metadata_workers= + +# Full class name for the Manager for compute (string value) +#compute_manager=nova.compute.manager.ComputeManager + +# Full class name for the Manager for console proxy (string +# value) +#console_manager=nova.console.manager.ConsoleProxyManager + +# Manager for console auth (string value) +#consoleauth_manager=nova.consoleauth.manager.ConsoleAuthManager + +# Full class name for the Manager for cert (string value) +#cert_manager=nova.cert.manager.CertManager + +# Full class name for the Manager for network (string value) +#network_manager=nova.network.manager.VlanManager + +# Full class name for the Manager for scheduler (string value) +#scheduler_manager=nova.scheduler.manager.SchedulerManager + +# Maximum time since last check-in for up service (integer +# value) +#service_down_time=60 + + +# +# Options defined in nova.test +# + +# File name of clean sqlite db (string value) +#sqlite_clean_db=clean.sqlite + + +# +# Options defined in nova.utils +# + +# Whether to log monkey patching (boolean value) +#monkey_patch=false + +# List of modules/decorators to monkey patch (list value) +#monkey_patch_modules=nova.api.ec2.cloud:nova.notifications.notify_decorator,nova.compute.api:nova.notifications.notify_decorator + +# Length of generated instance admin passwords (integer value) +#password_length=12 + +# Time period to generate instance usages for. Time period +# must be hour, day, month or year (string value) +#instance_usage_audit_period=month + +# Path to the rootwrap configuration file to use for running +# commands as root (string value) +#rootwrap_config=/etc/nova/rootwrap.conf + +# Explicitly specify the temporary working directory (string +# value) +#tempdir= + + +# +# Options defined in nova.wsgi +# + +# File name for the paste.deploy config for nova-api (string +# value) +#api_paste_config=api-paste.ini + +# A python format string that is used as the template to +# generate log lines. The following values can be formatted +# into it: client_ip, date_time, request_line, status_code, +# body_length, wall_seconds. (string value) +#wsgi_log_format=%(client_ip)s "%(request_line)s" status: %(status_code)s len: %(body_length)s time: %(wall_seconds).7f + +# CA certificate file to use to verify connecting clients +# (string value) +#ssl_ca_file= + +# SSL certificate of API server (string value) +#ssl_cert_file= + +# SSL private key of API server (string value) +#ssl_key_file= + +# Sets the value of TCP_KEEPIDLE in seconds for each server +# socket. Not supported on OS X. (integer value) +#tcp_keepidle=600 + +# Size of the pool of greenthreads used by wsgi (integer +# value) +#wsgi_default_pool_size=1000 + +# Maximum line size of message headers to be accepted. +# max_header_line may need to be increased when using large +# tokens (typically those generated by the Keystone v3 API +# with big service catalogs). (integer value) +#max_header_line=16384 + + +# +# Options defined in nova.api.auth +# + +# Whether to use per-user rate limiting for the api. This +# option is only used by v2 api. Rate limiting is removed from +# v3 api. (boolean value) +#api_rate_limit=false + +# The strategy to use for auth: noauth or keystone. (string +# value) +#auth_strategy=noauth + +# Treat X-Forwarded-For as the canonical remote address. Only +# enable this if you have a sanitizing proxy. (boolean value) +#use_forwarded_for=false + + +# +# Options defined in nova.api.ec2 +# + +# Number of failed auths before lockout. (integer value) +#lockout_attempts=5 + +# Number of minutes to lockout if triggered. (integer value) +#lockout_minutes=15 + +# Number of minutes for lockout window. (integer value) +#lockout_window=15 + +# URL to get token from ec2 request. (string value) +#keystone_ec2_url=http://localhost:5000/v2.0/ec2tokens + +# Return the IP address as private dns hostname in describe +# instances (boolean value) +#ec2_private_dns_show_ip=false + +# Validate security group names according to EC2 specification +# (boolean value) +#ec2_strict_validation=true + +# Time in seconds before ec2 timestamp expires (integer value) +#ec2_timestamp_expiry=300 + + +# +# Options defined in nova.api.ec2.cloud +# + +# The IP address of the EC2 API server (string value) +#ec2_host=$my_ip + +# The internal IP address of the EC2 API server (string value) +#ec2_dmz_host=$my_ip + +# The port of the EC2 API server (integer value) +#ec2_port=8773 + +# The protocol to use when connecting to the EC2 API server +# (http, https) (string value) +#ec2_scheme=http + +# The path prefix used to call the ec2 API server (string +# value) +#ec2_path=/services/Cloud + +# List of region=fqdn pairs separated by commas (list value) +#region_list= + + +# +# Options defined in nova.api.metadata.base +# + +# List of metadata versions to skip placing into the config +# drive (string value) +#config_drive_skip_versions=1.0 2007-01-19 2007-03-01 2007-08-29 2007-10-10 2007-12-15 2008-02-01 2008-09-01 + +# Driver to use for vendor data (string value) +#vendordata_driver=nova.api.metadata.vendordata_json.JsonFileVendorData + + +# +# Options defined in nova.api.metadata.handler +# + +# Set flag to indicate Neutron will proxy metadata requests +# and resolve instance ids. (boolean value) +#service_neutron_metadata_proxy=false + +# Shared secret to validate proxies Neutron metadata requests +# (string value) +#neutron_metadata_proxy_shared_secret= + + +# +# Options defined in nova.api.metadata.vendordata_json +# + +# File to load json formatted vendor data from (string value) +#vendordata_jsonfile_path= + + +# +# Options defined in nova.api.openstack.common +# + +# The maximum number of items returned in a single response +# from a collection resource (integer value) +#osapi_max_limit=1000 + +# Base URL that will be presented to users in links to the +# OpenStack Compute API (string value) +#osapi_compute_link_prefix= + +# Base URL that will be presented to users in links to glance +# resources (string value) +#osapi_glance_link_prefix= + + +# +# Options defined in nova.api.openstack.compute +# + +# Permit instance snapshot operations. (boolean value) +#allow_instance_snapshots=true + + +# +# Options defined in nova.api.openstack.compute.contrib +# + +# Specify list of extensions to load when using +# osapi_compute_extension option with +# nova.api.openstack.compute.contrib.select_extensions (list +# value) +#osapi_compute_ext_list= + + +# +# Options defined in nova.api.openstack.compute.contrib.fping +# + +# Full path to fping. (string value) +#fping_path=/usr/sbin/fping + + +# +# Options defined in nova.api.openstack.compute.contrib.os_tenant_networks +# + +# Enables or disables quota checking for tenant networks +# (boolean value) +#enable_network_quota=false + +# Control for checking for default networks (string value) +#use_neutron_default_nets=False + +# Default tenant id when creating neutron networks (string +# value) +#neutron_default_tenant_id=default + + +# +# Options defined in nova.api.openstack.compute.extensions +# + +# osapi compute extension to load (multi valued) +#osapi_compute_extension=nova.api.openstack.compute.contrib.standard_extensions + + +# +# Options defined in nova.api.openstack.compute.plugins.v3.hide_server_addresses +# + +# List of instance states that should hide network info (list +# value) +#osapi_hide_server_address_states=building + + +# +# Options defined in nova.api.openstack.compute.servers +# + +# Enables returning of the instance password by the relevant +# server API calls such as create, rebuild or rescue, If the +# hypervisor does not support password injection then the +# password returned will not be correct (boolean value) +#enable_instance_password=true + + +# +# Options defined in nova.api.sizelimit +# + +# The maximum body size per each osapi request(bytes) (integer +# value) +#osapi_max_request_body_size=114688 + + +# +# Options defined in nova.cert.rpcapi +# + +# The topic cert nodes listen on (string value) +#cert_topic=cert + + +# +# Options defined in nova.cloudpipe.pipelib +# + +# Image ID used when starting up a cloudpipe vpn server +# (string value) +#vpn_image_id=0 + +# Flavor for vpn instances (string value) +#vpn_flavor=m1.tiny + +# Template for cloudpipe instance boot script (string value) +#boot_script_template=$pybasedir/nova/cloudpipe/bootscript.template + +# Network to push into openvpn config (string value) +#dmz_net=10.0.0.0 + +# Netmask to push into openvpn config (string value) +#dmz_mask=255.255.255.0 + +# Suffix to add to project name for vpn key and secgroups +# (string value) +#vpn_key_suffix=-vpn + + +# +# Options defined in nova.cmd.novnc +# + +# Record sessions to FILE.[session_number] (boolean value) +#record=false + +# Become a daemon (background process) (boolean value) +#daemon=false + +# Disallow non-encrypted connections (boolean value) +#ssl_only=false + +# Source is ipv6 (boolean value) +#source_is_ipv6=false + +# SSL certificate file (string value) +#cert=self.pem + +# SSL key file (if separate from cert) (string value) +#key= + +# Run webserver on same port. Serve files from DIR. (string +# value) +#web=/usr/share/spice-html5 + + +# +# Options defined in nova.cmd.novncproxy +# + +# Host on which to listen for incoming requests (string value) +#novncproxy_host=0.0.0.0 + +# Port on which to listen for incoming requests (integer +# value) +#novncproxy_port=6080 + + +# +# Options defined in nova.cmd.spicehtml5proxy +# + +# Host on which to listen for incoming requests (string value) +#spicehtml5proxy_host=0.0.0.0 + +# Port on which to listen for incoming requests (integer +# value) +#spicehtml5proxy_port=6082 + + +# +# Options defined in nova.compute.api +# + +# Allow destination machine to match source for resize. Useful +# when testing in single-host environments. (boolean value) +#allow_resize_to_same_host=false + +# Allow migrate machine to the same host. Useful when testing +# in single-host environments. (boolean value) +#allow_migrate_to_same_host=false + +# Availability zone to use when user doesn't specify one +# (string value) +#default_schedule_zone= + +# These are image properties which a snapshot should not +# inherit from an instance (list value) +#non_inheritable_image_properties=cache_in_nova,bittorrent + +# Kernel image that indicates not to use a kernel, but to use +# a raw disk image instead (string value) +#null_kernel=nokernel + +# When creating multiple instances with a single request using +# the os-multiple-create API extension, this template will be +# used to build the display name for each instance. The +# benefit is that the instances end up with different +# hostnames. To restore legacy behavior of every instance +# having the same name, set this option to "%(name)s". Valid +# keys for the template are: name, uuid, count. (string value) +#multi_instance_display_name_template=%(name)s-%(uuid)s + +# Maximum number of devices that will result in a local image +# being created on the hypervisor node. Setting this to 0 +# means nova will allow only boot from volume. A negative +# number means unlimited. (integer value) +#max_local_block_devices=3 + + +# +# Options defined in nova.compute.flavors +# + +# Default flavor to use for the EC2 API only. The Nova API +# does not support a default flavor. (string value) +#default_flavor=m1.small + + +# +# Options defined in nova.compute.manager +# + +# Console proxy host to use to connect to instances on this +# host. (string value) +#console_host=nova + +# Name of network to use to set access IPs for instances +# (string value) +#default_access_ip_network_name= + +# Whether to batch up the application of IPTables rules during +# a host restart and apply all at the end of the init phase +# (boolean value) +#defer_iptables_apply=false + +# Where instances are stored on disk (string value) +#instances_path=$state_path/instances + +# Generate periodic compute.instance.exists notifications +# (boolean value) +#instance_usage_audit=false + +# Number of 1 second retries needed in live_migration (integer +# value) +#live_migration_retry_count=30 + +# Whether to start guests that were running before the host +# rebooted (boolean value) +#resume_guests_state_on_host_boot=false + +# Number of times to retry network allocation on failures +# (integer value) +#network_allocate_retries=0 + +# The number of times to attempt to reap an instance's files. +# (integer value) +#maximum_instance_delete_attempts=5 + +# Interval to pull network bandwidth usage info. Not supported +# on all hypervisors. Set to 0 to disable. (integer value) +#bandwidth_poll_interval=600 + +# Interval to sync power states between the database and the +# hypervisor (integer value) +#sync_power_state_interval=600 + +# Number of seconds between instance info_cache self healing +# updates (integer value) +#heal_instance_info_cache_interval=60 + +# Interval in seconds for reclaiming deleted instances +# (integer value) +#reclaim_instance_interval=0 + +# Interval in seconds for gathering volume usages (integer +# value) +#volume_usage_poll_interval=0 + +# Interval in seconds for polling shelved instances to offload +# (integer value) +#shelved_poll_interval=3600 + +# Time in seconds before a shelved instance is eligible for +# removing from a host. -1 never offload, 0 offload when +# shelved (integer value) +#shelved_offload_time=0 + +# Interval in seconds for retrying failed instance file +# deletes (integer value) +#instance_delete_interval=300 + +# Action to take if a running deleted instance is +# detected.Valid options are 'noop', 'log', 'shutdown', or +# 'reap'. Set to 'noop' to take no action. (string value) +#running_deleted_instance_action=reap + +# Number of seconds to wait between runs of the cleanup task. +# (integer value) +#running_deleted_instance_poll_interval=1800 + +# Number of seconds after being deleted when a running +# instance should be considered eligible for cleanup. (integer +# value) +#running_deleted_instance_timeout=0 + +# Automatically hard reboot an instance if it has been stuck +# in a rebooting state longer than N seconds. Set to 0 to +# disable. (integer value) +#reboot_timeout=0 + +# Amount of time in seconds an instance can be in BUILD before +# going into ERROR status.Set to 0 to disable. (integer value) +#instance_build_timeout=0 + +# Automatically unrescue an instance after N seconds. Set to 0 +# to disable. (integer value) +#rescue_timeout=0 + +# Automatically confirm resizes after N seconds. Set to 0 to +# disable. (integer value) +#resize_confirm_window=0 + + +# +# Options defined in nova.compute.monitors +# + +# Monitor classes available to the compute which may be +# specified more than once. (multi valued) +#compute_available_monitors=nova.compute.monitors.all_monitors + +# A list of monitors that can be used for getting compute +# metrics. (list value) +#compute_monitors= + + +# +# Options defined in nova.compute.resource_tracker +# + +# Amount of disk in MB to reserve for the host (integer value) +#reserved_host_disk_mb=0 + +# Amount of memory in MB to reserve for the host (integer +# value) +#reserved_host_memory_mb=512 + +# Class that will manage stats for the local compute host +# (string value) +#compute_stats_class=nova.compute.stats.Stats + + +# +# Options defined in nova.compute.rpcapi +# + +# The topic compute nodes listen on (string value) +#compute_topic=compute + + +# +# Options defined in nova.conductor.tasks.live_migrate +# + +# Number of times to retry live-migration before failing. If +# == -1, try until out of hosts. If == 0, only try once, no +# retries. (integer value) +#migrate_max_retries=-1 + + +# +# Options defined in nova.console.manager +# + +# Driver to use for the console proxy (string value) +#console_driver=nova.console.xvp.XVPConsoleProxy + +# Stub calls to compute worker for tests (boolean value) +#stub_compute=false + +# Publicly visible name for this console host (string value) +#console_public_hostname=nova + + +# +# Options defined in nova.console.rpcapi +# + +# The topic console proxy nodes listen on (string value) +#console_topic=console + + +# +# Options defined in nova.console.vmrc +# + +# Port for VMware VMRC connections (integer value) +#console_vmrc_port=443 + +# Number of retries for retrieving VMRC information (integer +# value) +#console_vmrc_error_retries=10 + + +# +# Options defined in nova.console.xvp +# + +# XVP conf template (string value) +#console_xvp_conf_template=$pybasedir/nova/console/xvp.conf.template + +# Generated XVP conf file (string value) +#console_xvp_conf=/etc/xvp.conf + +# XVP master process pid file (string value) +#console_xvp_pid=/var/run/xvp.pid + +# XVP log file (string value) +#console_xvp_log=/var/log/xvp.log + +# Port for XVP to multiplex VNC connections on (integer value) +#console_xvp_multiplex_port=5900 + + +# +# Options defined in nova.consoleauth +# + +# The topic console auth proxy nodes listen on (string value) +#consoleauth_topic=consoleauth + + +# +# Options defined in nova.consoleauth.manager +# + +# How many seconds before deleting tokens (integer value) +#console_token_ttl=600 + + +# +# Options defined in nova.db.api +# + +# Services to be added to the available pool on create +# (boolean value) +#enable_new_services=true + +# Template string to be used to generate instance names +# (string value) +#instance_name_template=instance-%08x + +# Template string to be used to generate snapshot names +# (string value) +#snapshot_name_template=snapshot-%s + + +# +# Options defined in nova.db.base +# + +# The driver to use for database access (string value) +#db_driver=nova.db + + +# +# Options defined in nova.db.sqlalchemy.api +# + +# When set, compute API will consider duplicate hostnames +# invalid within the specified scope, regardless of case. +# Should be empty, "project" or "global". (string value) +#osapi_compute_unique_server_name_scope= + + +# +# Options defined in nova.image.glance +# + +# Default glance hostname or IP address (string value) +#glance_host=$my_ip + +# Default glance port (integer value) +#glance_port=9292 + +# Default protocol to use when connecting to glance. Set to +# https for SSL. (string value) +#glance_protocol=http + +# A list of the glance api servers available to nova. Prefix +# with https:// for ssl-based glance api servers. +# ([hostname|ip]:port) (list value) +#glance_api_servers=$glance_host:$glance_port + +# Allow to perform insecure SSL (https) requests to glance +# (boolean value) +#glance_api_insecure=false + +# Number of retries when downloading an image from glance +# (integer value) +#glance_num_retries=0 + +# A list of url scheme that can be downloaded directly via the +# direct_url. Currently supported schemes: [file]. (list +# value) +#allowed_direct_url_schemes= + + +# +# Options defined in nova.image.s3 +# + +# Parent directory for tempdir used for image decryption +# (string value) +#image_decryption_dir=/tmp + +# Hostname or IP for OpenStack to use when accessing the S3 +# api (string value) +#s3_host=$my_ip + +# Port used when accessing the S3 api (integer value) +#s3_port=3333 + +# Access key to use for S3 server for images (string value) +#s3_access_key=notchecked + +# Secret key to use for S3 server for images (string value) +#s3_secret_key=notchecked + +# Whether to use SSL when talking to S3 (boolean value) +#s3_use_ssl=false + +# Whether to affix the tenant id to the access key when +# downloading from S3 (boolean value) +#s3_affix_tenant=false + + +# +# Options defined in nova.ipv6.api +# + +# Backend to use for IPv6 generation (string value) +#ipv6_backend=rfc2462 + + +# +# Options defined in nova.network +# + +# The full class name of the network API class to use (string +# value) +#network_api_class=nova.network.api.API + + +# +# Options defined in nova.network.driver +# + +# Driver to use for network creation (string value) +#network_driver=nova.network.linux_net + + +# +# Options defined in nova.network.floating_ips +# + +# Default pool for floating IPs (string value) +#default_floating_pool=nova + +# Autoassigning floating IP to VM (boolean value) +#auto_assign_floating_ip=false + +# Full class name for the DNS Manager for floating IPs (string +# value) +#floating_ip_dns_manager=nova.network.noop_dns_driver.NoopDNSDriver + +# Full class name for the DNS Manager for instance IPs (string +# value) +#instance_dns_manager=nova.network.noop_dns_driver.NoopDNSDriver + +# Full class name for the DNS Zone for instance IPs (string +# value) +#instance_dns_domain= + + +# +# Options defined in nova.network.ldapdns +# + +# URL for LDAP server which will store DNS entries (string +# value) +#ldap_dns_url=ldap://ldap.example.com:389 + +# User for LDAP DNS (string value) +#ldap_dns_user=uid=admin,ou=people,dc=example,dc=org + +# Password for LDAP DNS (string value) +#ldap_dns_password=password + +# Hostmaster for LDAP DNS driver Statement of Authority +# (string value) +#ldap_dns_soa_hostmaster=hostmaster@example.org + +# DNS Servers for LDAP DNS driver (multi valued) +#ldap_dns_servers=dns.example.org + +# Base DN for DNS entries in LDAP (string value) +#ldap_dns_base_dn=ou=hosts,dc=example,dc=org + +# Refresh interval (in seconds) for LDAP DNS driver Statement +# of Authority (string value) +#ldap_dns_soa_refresh=1800 + +# Retry interval (in seconds) for LDAP DNS driver Statement of +# Authority (string value) +#ldap_dns_soa_retry=3600 + +# Expiry interval (in seconds) for LDAP DNS driver Statement +# of Authority (string value) +#ldap_dns_soa_expiry=86400 + +# Minimum interval (in seconds) for LDAP DNS driver Statement +# of Authority (string value) +#ldap_dns_soa_minimum=7200 + + +# +# Options defined in nova.network.linux_net +# + +# Location of flagfiles for dhcpbridge (multi valued) +#dhcpbridge_flagfile=/etc/nova/nova-dhcpbridge.conf + +# Location to keep network config files (string value) +#networks_path=$state_path/networks + +# Interface for public IP addresses (string value) +#public_interface=eth0 + +# MTU setting for network interface (integer value) +#network_device_mtu= + +# Location of nova-dhcpbridge (string value) +#dhcpbridge=$bindir/nova-dhcpbridge + +# Public IP of network host (string value) +#routing_source_ip=$my_ip + +# Lifetime of a DHCP lease in seconds (integer value) +#dhcp_lease_time=120 + +# If set, uses specific DNS server for dnsmasq. Can be +# specified multiple times. (multi valued) +#dns_server= + +# If set, uses the dns1 and dns2 from the network ref. as dns +# servers. (boolean value) +#use_network_dns_servers=false + +# A list of dmz range that should be accepted (list value) +#dmz_cidr= + +# Traffic to this range will always be snatted to the fallback +# ip, even if it would normally be bridged out of the node. +# Can be specified multiple times. (multi valued) +#force_snat_range= + +# Override the default dnsmasq settings with this file (string +# value) +#dnsmasq_config_file= + +# Driver used to create ethernet devices. (string value) +#linuxnet_interface_driver=nova.network.linux_net.LinuxBridgeInterfaceDriver + +# Name of Open vSwitch bridge used with linuxnet (string +# value) +#linuxnet_ovs_integration_bridge=br-int + +# Send gratuitous ARPs for HA setup (boolean value) +#send_arp_for_ha=false + +# Send this many gratuitous ARPs for HA setup (integer value) +#send_arp_for_ha_count=3 + +# Use single default gateway. Only first nic of vm will get +# default gateway from dhcp server (boolean value) +#use_single_default_gateway=false + +# An interface that bridges can forward to. If this is set to +# all then all traffic will be forwarded. Can be specified +# multiple times. (multi valued) +#forward_bridge_interface=all + +# The IP address for the metadata API server (string value) +#metadata_host=$my_ip + +# The port for the metadata API port (integer value) +#metadata_port=8775 + +# Regular expression to match iptables rule that should always +# be on the top. (string value) +#iptables_top_regex= + +# Regular expression to match iptables rule that should always +# be on the bottom. (string value) +#iptables_bottom_regex= + +# The table that iptables to jump to when a packet is to be +# dropped. (string value) +#iptables_drop_action=DROP + +# Amount of time, in seconds, that ovs_vsctl should wait for a +# response from the database. 0 is to wait forever. (integer +# value) +#ovs_vsctl_timeout=120 + +# If passed, use fake network devices and addresses (boolean +# value) +#fake_network=false + + +# +# Options defined in nova.network.manager +# + +# Bridge for simple network instances (string value) +#flat_network_bridge= + +# DNS server for simple network (string value) +#flat_network_dns=8.8.4.4 + +# Whether to attempt to inject network setup into guest +# (boolean value) +#flat_injected=false + +# FlatDhcp will bridge into this interface if set (string +# value) +#flat_interface= + +# First VLAN for private networks (integer value) +#vlan_start=100 + +# VLANs will bridge into this interface if set (string value) +#vlan_interface= + +# Number of networks to support (integer value) +#num_networks=1 + +# Public IP for the cloudpipe VPN servers (string value) +#vpn_ip=$my_ip + +# First Vpn port for private networks (integer value) +#vpn_start=1000 + +# Number of addresses in each private subnet (integer value) +#network_size=256 + +# Fixed IPv6 address block (string value) +#fixed_range_v6=fd00::/48 + +# Default IPv4 gateway (string value) +#gateway= + +# Default IPv6 gateway (string value) +#gateway_v6= + +# Number of addresses reserved for vpn clients (integer value) +#cnt_vpn_clients=0 + +# Seconds after which a deallocated IP is disassociated +# (integer value) +#fixed_ip_disassociate_timeout=600 + +# Number of attempts to create unique mac address (integer +# value) +#create_unique_mac_address_attempts=5 + +# If True, skip using the queue and make local calls (boolean +# value) +#fake_call=false + +# If True, unused gateway devices (VLAN and bridge) are +# deleted in VLAN network mode with multi hosted networks +# (boolean value) +#teardown_unused_network_gateway=false + +# If True, send a dhcp release on instance termination +# (boolean value) +#force_dhcp_release=true + +# If True in multi_host mode, all compute hosts share the same +# dhcp address. The same IP address used for DHCP will be +# added on each nova-network node which is only visible to the +# vms on the same host. (boolean value) +#share_dhcp_address=false + +# If True, when a DNS entry must be updated, it sends a fanout +# cast to all network hosts to update their DNS entries in +# multi host mode (boolean value) +#update_dns_entries=false + +# Number of seconds to wait between runs of updates to DNS +# entries. (integer value) +#dns_update_periodic_interval=-1 + +# Domain to use for building the hostnames (string value) +#dhcp_domain=novalocal + +# Indicates underlying L3 management library (string value) +#l3_lib=nova.network.l3.LinuxNetL3 + + +# +# Options defined in nova.network.neutronv2.api +# + +# URL for connecting to neutron (string value) +#neutron_url=http://127.0.0.1:9696 + +# Timeout value for connecting to neutron in seconds (integer +# value) +#neutron_url_timeout=30 + +# Username for connecting to neutron in admin context (string +# value) +#neutron_admin_username= + +# Password for connecting to neutron in admin context (string +# value) +#neutron_admin_password= + +# Tenant id for connecting to neutron in admin context (string +# value) +#neutron_admin_tenant_id= + +# Tenant name for connecting to neutron in admin context. This +# option is mutually exclusive with neutron_admin_tenant_id. +# Note that with Keystone V3 tenant names are only unique +# within a domain. (string value) +#neutron_admin_tenant_name= + +# Region name for connecting to neutron in admin context +# (string value) +#neutron_region_name= + +# Authorization URL for connecting to neutron in admin context +# (string value) +#neutron_admin_auth_url=http://localhost:5000/v2.0 + +# If set, ignore any SSL validation issues (boolean value) +#neutron_api_insecure=false + +# Authorization strategy for connecting to neutron in admin +# context (string value) +#neutron_auth_strategy=keystone + +# Name of Integration Bridge used by Open vSwitch (string +# value) +#neutron_ovs_bridge=br-int + +# Number of seconds before querying neutron for extensions +# (integer value) +#neutron_extension_sync_interval=600 + +# Location of CA certificates file to use for neutron client +# requests. (string value) +#neutron_ca_certificates_file= + + +# +# Options defined in nova.network.rpcapi +# + +# The topic network nodes listen on (string value) +#network_topic=network + +# Default value for multi_host in networks. Also, if set, some +# rpc network calls will be sent directly to host. (boolean +# value) +#multi_host=false + + +# +# Options defined in nova.network.security_group.openstack_driver +# + +# The full class name of the security API class (string value) +#security_group_api=nova + + +# +# Options defined in nova.objectstore.s3server +# + +# Path to S3 buckets (string value) +#buckets_path=$state_path/buckets + +# IP address for S3 API to listen (string value) +#s3_listen=0.0.0.0 + +# Port for S3 API to listen (integer value) +#s3_listen_port=3333 + + +# +# Options defined in nova.openstack.common.eventlet_backdoor +# + +# Enable eventlet backdoor. Acceptable values are 0, , +# and :, where 0 results in listening on a random +# tcp port number; results in listening on the +# specified port number (and not enabling backdoor if that +# port is in use); and : results in listening on +# the smallest unused port number within the specified range +# of port numbers. The chosen port is displayed in the +# service's log file. (string value) +#backdoor_port= + + +# +# Options defined in nova.openstack.common.lockutils +# + +# Whether to disable inter-process locks (boolean value) +#disable_process_locking=false + +# Directory to use for lock files. (string value) +#lock_path= + + +# +# Options defined in nova.openstack.common.log +# + +# Print debugging output (set logging level to DEBUG instead +# of default WARNING level). (boolean value) +#debug=false + +# Print more verbose output (set logging level to INFO instead +# of default WARNING level). (boolean value) +#verbose=false + +# Log output to standard error (boolean value) +#use_stderr=true + +# Format string to use for log messages with context (string +# value) +#logging_context_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [%(request_id)s %(user_identity)s] %(instance)s%(message)s + +# Format string to use for log messages without context +# (string value) +#logging_default_format_string=%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s [-] %(instance)s%(message)s + +# Data to append to log format when level is DEBUG (string +# value) +#logging_debug_format_suffix=%(funcName)s %(pathname)s:%(lineno)d + +# Prefix each line of exception output with this format +# (string value) +#logging_exception_prefix=%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s + +# List of logger=LEVEL pairs (list value) +#default_log_levels=amqp=WARN,amqplib=WARN,boto=WARN,qpid=WARN,sqlalchemy=WARN,suds=INFO,oslo.messaging=INFO,iso8601=WARN,requests.packages.urllib3.connectionpool=WARN + +# Publish error events (boolean value) +#publish_errors=false + +# Make deprecations fatal (boolean value) +#fatal_deprecations=false + +# If an instance is passed with the log message, format it +# like this (string value) +#instance_format="[instance: %(uuid)s] " + +# If an instance UUID is passed with the log message, format +# it like this (string value) +#instance_uuid_format="[instance: %(uuid)s] " + +# The name of logging configuration file. It does not disable +# existing loggers, but just appends specified logging +# configuration to any other existing logging options. Please +# see the Python logging module documentation for details on +# logging configuration files. (string value) +# Deprecated group/name - [DEFAULT]/log_config +#log_config_append= + +# DEPRECATED. A logging.Formatter log message format string +# which may use any of the available logging.LogRecord +# attributes. This option is deprecated. Please use +# logging_context_format_string and +# logging_default_format_string instead. (string value) +#log_format= + +# Format string for %%(asctime)s in log records. Default: +# %(default)s (string value) +#log_date_format=%Y-%m-%d %H:%M:%S + +# (Optional) Name of log file to output to. If no default is +# set, logging will go to stdout. (string value) +# Deprecated group/name - [DEFAULT]/logfile +#log_file= + +# (Optional) The base directory used for relative --log-file +# paths (string value) +# Deprecated group/name - [DEFAULT]/logdir +#log_dir= + +# Use syslog for logging. Existing syslog format is DEPRECATED +# during I, and then will be changed in J to honor RFC5424 +# (boolean value) +#use_syslog=false + +# (Optional) Use syslog rfc5424 format for logging. If +# enabled, will add APP-NAME (RFC5424) before the MSG part of +# the syslog message. The old format without APP-NAME is +# deprecated in I, and will be removed in J. (boolean value) +#use_syslog_rfc_format=false + +# Syslog facility to receive log lines (string value) +#syslog_log_facility=LOG_USER + + +# +# Options defined in nova.openstack.common.memorycache +# + +# Memcached servers or None for in process cache. (list value) +#memcached_servers= + + +# +# Options defined in nova.openstack.common.periodic_task +# + +# Some periodic tasks can be run in a separate process. Should +# we run them here? (boolean value) +#run_external_periodic_tasks=true + + +# +# Options defined in nova.pci.pci_request +# + +# An alias for a PCI passthrough device requirement. This +# allows users to specify the alias in the extra_spec for a +# flavor, without needing to repeat all the PCI property +# requirements. For example: pci_alias = { "name": +# "QuicAssist", "product_id": "0443", "vendor_id": "8086", +# "device_type": "ACCEL" } defines an alias for the Intel +# QuickAssist card. (multi valued) (multi valued) +#pci_alias= + + +# +# Options defined in nova.pci.pci_whitelist +# + +# White list of PCI devices available to VMs. For example: +# pci_passthrough_whitelist = [{"vendor_id": "8086", +# "product_id": "0443"}] (multi valued) +#pci_passthrough_whitelist= + + +# +# Options defined in nova.scheduler.driver +# + +# The scheduler host manager class to use (string value) +#scheduler_host_manager=nova.scheduler.host_manager.HostManager + +# Maximum number of attempts to schedule an instance (integer +# value) +#scheduler_max_attempts=3 + + +# +# Options defined in nova.scheduler.filter_scheduler +# + +# New instances will be scheduled on a host chosen randomly +# from a subset of the N best hosts. This property defines the +# subset size that a host is chosen from. A value of 1 chooses +# the first host returned by the weighing functions. This +# value must be at least 1. Any value less than 1 will be +# ignored, and 1 will be used instead (integer value) +#scheduler_host_subset_size=1 + + +# +# Options defined in nova.scheduler.filters.aggregate_image_properties_isolation +# + +# Force the filter to consider only keys matching the given +# namespace. (string value) +#aggregate_image_properties_isolation_namespace= + +# The separator used between the namespace and keys (string +# value) +#aggregate_image_properties_isolation_separator=. + + +# +# Options defined in nova.scheduler.filters.core_filter +# + +# Virtual CPU to physical CPU allocation ratio which affects +# all CPU filters. This configuration specifies a global ratio +# for CoreFilter. For AggregateCoreFilter, it will fall back +# to this configuration value if no per-aggregate setting +# found. (floating point value) +#cpu_allocation_ratio=16.0 + + +# +# Options defined in nova.scheduler.filters.disk_filter +# + +# Virtual disk to physical disk allocation ratio (floating +# point value) +#disk_allocation_ratio=1.0 + + +# +# Options defined in nova.scheduler.filters.io_ops_filter +# + +# Ignore hosts that have too many +# builds/resizes/snaps/migrations (integer value) +#max_io_ops_per_host=8 + + +# +# Options defined in nova.scheduler.filters.isolated_hosts_filter +# + +# Images to run on isolated host (list value) +#isolated_images= + +# Host reserved for specific images (list value) +#isolated_hosts= + +# Whether to force isolated hosts to run only isolated images +# (boolean value) +#restrict_isolated_hosts_to_isolated_images=true + + +# +# Options defined in nova.scheduler.filters.num_instances_filter +# + +# Ignore hosts that have too many instances (integer value) +#max_instances_per_host=50 + + +# +# Options defined in nova.scheduler.filters.ram_filter +# + +# Virtual ram to physical ram allocation ratio which affects +# all ram filters. This configuration specifies a global ratio +# for RamFilter. For AggregateRamFilter, it will fall back to +# this configuration value if no per-aggregate setting found. +# (floating point value) +#ram_allocation_ratio=1.5 + + +# +# Options defined in nova.scheduler.host_manager +# + +# Filter classes available to the scheduler which may be +# specified more than once. An entry of +# "nova.scheduler.filters.standard_filters" maps to all +# filters included with nova. (multi valued) +#scheduler_available_filters=nova.scheduler.filters.all_filters + +# Which filter class names to use for filtering hosts when not +# specified in the request. (list value) +#scheduler_default_filters=RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter + +# Which weight class names to use for weighing hosts (list +# value) +#scheduler_weight_classes=nova.scheduler.weights.all_weighers + + +# +# Options defined in nova.scheduler.manager +# + +# Default driver to use for the scheduler (string value) +#scheduler_driver=nova.scheduler.filter_scheduler.FilterScheduler + +# How often (in seconds) to run periodic tasks in the +# scheduler driver of your choice. Please note this is likely +# to interact with the value of service_down_time, but exactly +# how they interact will depend on your choice of scheduler +# driver. (integer value) +#scheduler_driver_task_period=60 + + +# +# Options defined in nova.scheduler.rpcapi +# + +# The topic scheduler nodes listen on (string value) +#scheduler_topic=scheduler + + +# +# Options defined in nova.scheduler.scheduler_options +# + +# Absolute path to scheduler configuration JSON file. (string +# value) +#scheduler_json_config_location= + + +# +# Options defined in nova.scheduler.weights.ram +# + +# Multiplier used for weighing ram. Negative numbers mean to +# stack vs spread. (floating point value) +#ram_weight_multiplier=1.0 + + +# +# Options defined in nova.servicegroup.api +# + +# The driver for servicegroup service (valid options are: db, +# zk, mc) (string value) +#servicegroup_driver=db + + +# +# Options defined in nova.virt.configdrive +# + +# Config drive format. One of iso9660 (default) or vfat +# (string value) +#config_drive_format=iso9660 + +# Where to put temporary files associated with config drive +# creation (string value) +#config_drive_tempdir= + +# Set to force injection to take place on a config drive (if +# set, valid options are: always) (string value) +#force_config_drive= + +# Name and optionally path of the tool used for ISO image +# creation (string value) +#mkisofs_cmd=genisoimage + + +# +# Options defined in nova.virt.cpu +# + +# Defines which pcpus that instance vcpus can use. For +# example, "4-12,^8,15" (string value) +#vcpu_pin_set= + + +# +# Options defined in nova.virt.disk.api +# + +# Template file for injected network (string value) +#injected_network_template=$pybasedir/nova/virt/interfaces.template + +# Name of the mkfs commands for ephemeral device. The format +# is = (multi valued) +#virt_mkfs= + +# Attempt to resize the filesystem by accessing the image over +# a block device. This is done by the host and may not be +# necessary if the image contains a recent version of cloud- +# init. Possible mechanisms require the nbd driver (for qcow +# and raw), or loop (for raw). (boolean value) +#resize_fs_using_block_device=false + + +# +# Options defined in nova.virt.disk.mount.nbd +# + +# Amount of time, in seconds, to wait for NBD device start up. +# (integer value) +#timeout_nbd=10 + + +# +# Options defined in nova.virt.driver +# + +# Driver to use for controlling virtualization. Options +# include: libvirt.LibvirtDriver, xenapi.XenAPIDriver, +# fake.FakeDriver, baremetal.BareMetalDriver, +# vmwareapi.VMwareESXDriver, vmwareapi.VMwareVCDriver (string +# value) +#compute_driver= + +# The default format an ephemeral_volume will be formatted +# with on creation. (string value) +#default_ephemeral_format= + +# VM image preallocation mode: "none" => no storage +# provisioning is done up front, "space" => storage is fully +# allocated at instance start (string value) +#preallocate_images=none + +# Whether to use cow images (boolean value) +#use_cow_images=true + +# Fail instance boot if vif plugging fails (boolean value) +#vif_plugging_is_fatal=true + +# Number of seconds to wait for neutron vif plugging events to +# arrive before continuing or failing (see +# vif_plugging_is_fatal). If this is set to zero and +# vif_plugging_is_fatal is False, events should not be +# expected to arrive at all. (integer value) +#vif_plugging_timeout=300 + + +# +# Options defined in nova.virt.firewall +# + +# Firewall driver (defaults to hypervisor specific iptables +# driver) (string value) +#firewall_driver= + +# Whether to allow network traffic from same network (boolean +# value) +#allow_same_net_traffic=true + + +# +# Options defined in nova.virt.imagecache +# + +# Number of seconds to wait between runs of the image cache +# manager (integer value) +#image_cache_manager_interval=2400 + +# Where cached images are stored under $instances_path. This +# is NOT the full path - just a folder name. For per-compute- +# host cached images, set to _base_$my_ip (string value) +# Deprecated group/name - [DEFAULT]/base_dir_name +#image_cache_subdirectory_name=_base + +# Should unused base images be removed? (boolean value) +#remove_unused_base_images=true + +# Unused unresized base images younger than this will not be +# removed (integer value) +#remove_unused_original_minimum_age_seconds=86400 + + +# +# Options defined in nova.virt.imagehandler +# + +# Specifies which image handler extension names to use for +# handling images. The first extension in the list which can +# handle the image with a suitable location will be used. +# (list value) +#image_handlers=download + + +# +# Options defined in nova.virt.images +# + +# Force backing images to raw format (boolean value) +#force_raw_images=true + + +# +# Options defined in nova.vnc +# + +# Location of VNC console proxy, in the form +# "http://127.0.0.1:6080/vnc_auto.html" (string value) +#novncproxy_base_url=http://127.0.0.1:6080/vnc_auto.html + +# Location of nova xvp VNC console proxy, in the form +# "http://127.0.0.1:6081/console" (string value) +#xvpvncproxy_base_url=http://127.0.0.1:6081/console + +# IP address on which instance vncservers should listen +# (string value) +#vncserver_listen=127.0.0.1 + +# The address to which proxy clients (like nova-xvpvncproxy) +# should connect (string value) +#vncserver_proxyclient_address=127.0.0.1 + +# Enable VNC related features (boolean value) +#vnc_enabled=true + +# Keymap for VNC (string value) +#vnc_keymap=en-us + + +# +# Options defined in nova.vnc.xvp_proxy +# + +# Port that the XCP VNC proxy should bind to (integer value) +#xvpvncproxy_port=6081 + +# Address that the XCP VNC proxy should bind to (string value) +#xvpvncproxy_host=0.0.0.0 + + +# +# Options defined in nova.volume +# + +# The full class name of the volume API class to use (string +# value) +#volume_api_class=nova.volume.cinder.API + + +# +# Options defined in nova.volume.cinder +# + +# Info to match when looking for cinder in the service +# catalog. Format is: separated values of the form: +# :: (string value) +#cinder_catalog_info=volume:cinder:publicURL + +# Override service catalog lookup with template for cinder +# endpoint e.g. http://localhost:8776/v1/%(project_id)s +# (string value) +#cinder_endpoint_template= + +# Region name of this node (string value) +#os_region_name= + +# Location of ca certificates file to use for cinder client +# requests. (string value) +#cinder_ca_certificates_file= + +# Number of cinderclient retries on failed http calls (integer +# value) +#cinder_http_retries=3 + +# Allow to perform insecure SSL requests to cinder (boolean +# value) +#cinder_api_insecure=false + +# Allow attach between instance and volume in different +# availability zones. (boolean value) +#cinder_cross_az_attach=true + + +[baremetal] + +# +# Options defined in nova.virt.baremetal.db.api +# + +# The backend to use for bare-metal database (string value) +#db_backend=sqlalchemy + + +# +# Options defined in nova.virt.baremetal.db.sqlalchemy.session +# + +# The SQLAlchemy connection string used to connect to the +# bare-metal database (string value) +#sql_connection=sqlite:///$state_path/baremetal_nova.sqlite + + +# +# Options defined in nova.virt.baremetal.driver +# + +# Baremetal VIF driver. (string value) +#vif_driver=nova.virt.baremetal.vif_driver.BareMetalVIFDriver + +# Baremetal volume driver. (string value) +#volume_driver=nova.virt.baremetal.volume_driver.LibvirtVolumeDriver + +# A list of additional capabilities corresponding to +# flavor_extra_specs for this compute host to advertise. Valid +# entries are name=value, pairs For example, "key1:val1, +# key2:val2" (list value) +# Deprecated group/name - [DEFAULT]/instance_type_extra_specs +#flavor_extra_specs= + +# Baremetal driver back-end (pxe or tilera) (string value) +#driver=nova.virt.baremetal.pxe.PXE + +# Baremetal power management method (string value) +#power_manager=nova.virt.baremetal.ipmi.IPMI + +# Baremetal compute node's tftp root path (string value) +#tftp_root=/tftpboot + + +# +# Options defined in nova.virt.baremetal.ipmi +# + +# Path to baremetal terminal program (string value) +#terminal=shellinaboxd + +# Path to baremetal terminal SSL cert(PEM) (string value) +#terminal_cert_dir= + +# Path to directory stores pidfiles of baremetal_terminal +# (string value) +#terminal_pid_dir=$state_path/baremetal/console + +# Maximal number of retries for IPMI operations (integer +# value) +#ipmi_power_retry=10 + + +# +# Options defined in nova.virt.baremetal.pxe +# + +# Default kernel image ID used in deployment phase (string +# value) +#deploy_kernel= + +# Default ramdisk image ID used in deployment phase (string +# value) +#deploy_ramdisk= + +# Template file for injected network config (string value) +#net_config_template=$pybasedir/nova/virt/baremetal/net-dhcp.ubuntu.template + +# Additional append parameters for baremetal PXE boot (string +# value) +#pxe_append_params=nofb nomodeset vga=normal + +# Template file for PXE configuration (string value) +#pxe_config_template=$pybasedir/nova/virt/baremetal/pxe_config.template + +# If True, enable file injection for network info, files and +# admin password (boolean value) +#use_file_injection=false + +# Timeout for PXE deployments. Default: 0 (unlimited) (integer +# value) +#pxe_deploy_timeout=0 + +# If set, pass the network configuration details to the +# initramfs via cmdline. (boolean value) +#pxe_network_config=false + +# This gets passed to Neutron as the bootfile dhcp parameter. +# (string value) +#pxe_bootfile_name=pxelinux.0 + + +# +# Options defined in nova.virt.baremetal.tilera_pdu +# + +# IP address of tilera pdu (string value) +#tile_pdu_ip=10.0.100.1 + +# Management script for tilera pdu (string value) +#tile_pdu_mgr=/tftpboot/pdu_mgr + +# Power status of tilera PDU is OFF (integer value) +#tile_pdu_off=2 + +# Power status of tilera PDU is ON (integer value) +#tile_pdu_on=1 + +# Power status of tilera PDU (integer value) +#tile_pdu_status=9 + +# Wait time in seconds until check the result after tilera +# power operations (integer value) +#tile_power_wait=9 + + +# +# Options defined in nova.virt.baremetal.virtual_power_driver +# + +# IP or name to virtual power host (string value) +#virtual_power_ssh_host= + +# Port to use for ssh to virtual power host (integer value) +#virtual_power_ssh_port=22 + +# Base command to use for virtual power(vbox, virsh) (string +# value) +#virtual_power_type=virsh + +# User to execute virtual power commands as (string value) +#virtual_power_host_user= + +# Password for virtual power host_user (string value) +#virtual_power_host_pass= + +# The ssh key for virtual power host_user (string value) +#virtual_power_host_key= + + +# +# Options defined in nova.virt.baremetal.volume_driver +# + +# Do not set this out of dev/test environments. If a node does +# not have a fixed PXE IP address, volumes are exported with +# globally opened ACL (boolean value) +#use_unsafe_iscsi=false + +# The iSCSI IQN prefix used in baremetal volume connections. +# (string value) +#iscsi_iqn_prefix=iqn.2010-10.org.openstack.baremetal + + +[cells] + +# +# Options defined in nova.cells.manager +# + +# Cells communication driver to use (string value) +#driver=nova.cells.rpc_driver.CellsRPCDriver + +# Number of seconds after an instance was updated or deleted +# to continue to update cells (integer value) +#instance_updated_at_threshold=3600 + +# Number of instances to update per periodic task run (integer +# value) +#instance_update_num_instances=1 + + +# +# Options defined in nova.cells.messaging +# + +# Maximum number of hops for cells routing. (integer value) +#max_hop_count=10 + +# Cells scheduler to use (string value) +#scheduler=nova.cells.scheduler.CellsScheduler + + +# +# Options defined in nova.cells.opts +# + +# Enable cell functionality (boolean value) +#enable=false + +# The topic cells nodes listen on (string value) +#topic=cells + +# Manager for cells (string value) +#manager=nova.cells.manager.CellsManager + +# Name of this cell (string value) +#name=nova + +# Key/Multi-value list with the capabilities of the cell (list +# value) +#capabilities=hypervisor=xenserver;kvm,os=linux;windows + +# Seconds to wait for response from a call to a cell. (integer +# value) +#call_timeout=60 + +# Percentage of cell capacity to hold in reserve. Affects both +# memory and disk utilization (floating point value) +#reserve_percent=10.0 + +# Type of cell: api or compute (string value) +#cell_type=compute + +# Number of seconds after which a lack of capability and +# capacity updates signals the child cell is to be treated as +# a mute. (integer value) +#mute_child_interval=300 + +# Seconds between bandwidth updates for cells. (integer value) +#bandwidth_update_interval=600 + + +# +# Options defined in nova.cells.rpc_driver +# + +# Base queue name to use when communicating between cells. +# Various topics by message type will be appended to this. +# (string value) +#rpc_driver_queue_base=cells.intercell + + +# +# Options defined in nova.cells.scheduler +# + +# Filter classes the cells scheduler should use. An entry of +# "nova.cells.filters.all_filters" maps to all cells filters +# included with nova. (list value) +#scheduler_filter_classes=nova.cells.filters.all_filters + +# Weigher classes the cells scheduler should use. An entry of +# "nova.cells.weights.all_weighers" maps to all cell weighers +# included with nova. (list value) +#scheduler_weight_classes=nova.cells.weights.all_weighers + +# How many retries when no cells are available. (integer +# value) +#scheduler_retries=10 + +# How often to retry in seconds when no cells are available. +# (integer value) +#scheduler_retry_delay=2 + + +# +# Options defined in nova.cells.state +# + +# Interval, in seconds, for getting fresh cell information +# from the database. (integer value) +#db_check_interval=60 + +# Configuration file from which to read cells configuration. +# If given, overrides reading cells from the database. (string +# value) +#cells_config= + + +# +# Options defined in nova.cells.weights.mute_child +# + +# Multiplier used to weigh mute children. (The value should be +# negative.) (floating point value) +#mute_weight_multiplier=-10.0 + +# Weight value assigned to mute children. (The value should be +# positive.) (floating point value) +#mute_weight_value=1000.0 + + +# +# Options defined in nova.cells.weights.ram_by_instance_type +# + +# Multiplier used for weighing ram. Negative numbers mean to +# stack vs spread. (floating point value) +#ram_weight_multiplier=10.0 + + +# +# Options defined in nova.cells.weights.weight_offset +# + +# Multiplier used to weigh offset weigher. (floating point +# value) +#offset_weight_multiplier=1.0 + + +[conductor] + +# +# Options defined in nova.conductor.api +# + +# Perform nova-conductor operations locally (boolean value) +#use_local=false + +# The topic on which conductor nodes listen (string value) +#topic=conductor + +# Full class name for the Manager for conductor (string value) +#manager=nova.conductor.manager.ConductorManager + +# Number of workers for OpenStack Conductor service. The +# default will be the number of CPUs available. (integer +# value) +#workers= + + +[database] + +# +# Options defined in nova.db.sqlalchemy.api +# + +# The SQLAlchemy connection string used to connect to the +# slave database (string value) +#slave_connection= + + +# +# Options defined in nova.openstack.common.db.options +# + +# The file name to use with SQLite (string value) +#sqlite_db=nova.sqlite + +# If True, SQLite uses synchronous mode (boolean value) +#sqlite_synchronous=true + +# The backend to use for db (string value) +# Deprecated group/name - [DEFAULT]/db_backend +#backend=sqlalchemy + +# The SQLAlchemy connection string used to connect to the +# database (string value) +# Deprecated group/name - [DEFAULT]/sql_connection +# Deprecated group/name - [DATABASE]/sql_connection +# Deprecated group/name - [sql]/connection +#connection= + +# The SQL mode to be used for MySQL sessions (default is +# empty, meaning do not override any server-side SQL mode +# setting) (string value) +#mysql_sql_mode= + +# Timeout before idle sql connections are reaped (integer +# value) +# Deprecated group/name - [DEFAULT]/sql_idle_timeout +# Deprecated group/name - [DATABASE]/sql_idle_timeout +# Deprecated group/name - [sql]/idle_timeout +#idle_timeout=3600 + +# Minimum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_min_pool_size +# Deprecated group/name - [DATABASE]/sql_min_pool_size +#min_pool_size=1 + +# Maximum number of SQL connections to keep open in a pool +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_pool_size +# Deprecated group/name - [DATABASE]/sql_max_pool_size +#max_pool_size= + +# Maximum db connection retries during startup. (setting -1 +# implies an infinite retry count) (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_retries +# Deprecated group/name - [DATABASE]/sql_max_retries +#max_retries=10 + +# Interval between retries of opening a sql connection +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_retry_interval +# Deprecated group/name - [DATABASE]/reconnect_interval +#retry_interval=10 + +# If set, use this value for max_overflow with sqlalchemy +# (integer value) +# Deprecated group/name - [DEFAULT]/sql_max_overflow +# Deprecated group/name - [DATABASE]/sqlalchemy_max_overflow +#max_overflow= + +# Verbosity of SQL debugging information. 0=None, +# 100=Everything (integer value) +# Deprecated group/name - [DEFAULT]/sql_connection_debug +#connection_debug=0 + +# Add python stack traces to SQL as comment strings (boolean +# value) +# Deprecated group/name - [DEFAULT]/sql_connection_trace +#connection_trace=false + +# If set, use this value for pool_timeout with sqlalchemy +# (integer value) +# Deprecated group/name - [DATABASE]/sqlalchemy_pool_timeout +#pool_timeout= + +# Enable the experimental use of database reconnect on +# connection lost (boolean value) +#use_db_reconnect=false + +# seconds between db connection retries (integer value) +#db_retry_interval=1 + +# Whether to increase interval between db connection retries, +# up to db_max_retry_interval (boolean value) +#db_inc_retry_interval=true + +# max seconds between db connection retries, if +# db_inc_retry_interval is enabled (integer value) +#db_max_retry_interval=10 + +# maximum db connection retries before error is raised. +# (setting -1 implies an infinite retry count) (integer value) +#db_max_retries=20 + + +[hyperv] + +# +# Options defined in nova.virt.hyperv.pathutils +# + +# The name of a Windows share name mapped to the +# "instances_path" dir and used by the resize feature to copy +# files to the target host. If left blank, an administrative +# share will be used, looking for the same "instances_path" +# used locally (string value) +#instances_path_share= + + +# +# Options defined in nova.virt.hyperv.utilsfactory +# + +# Force V1 WMI utility classes (boolean value) +#force_hyperv_utils_v1=false + +# Force V1 volume utility class (boolean value) +#force_volumeutils_v1=false + + +# +# Options defined in nova.virt.hyperv.vif +# + +# External virtual switch Name, if not provided, the first +# external virtual switch is used (string value) +#vswitch_name= + + +# +# Options defined in nova.virt.hyperv.vmops +# + +# Required for live migration among hosts with different CPU +# features (boolean value) +#limit_cpu_features=false + +# Sets the admin password in the config drive image (boolean +# value) +#config_drive_inject_password=false + +# Path of qemu-img command which is used to convert between +# different image types (string value) +#qemu_img_cmd=qemu-img.exe + +# Attaches the Config Drive image as a cdrom drive instead of +# a disk drive (boolean value) +#config_drive_cdrom=false + +# Enables metrics collections for an instance by using +# Hyper-V's metric APIs. Collected data can by retrieved by +# other apps and services, e.g.: Ceilometer. Requires Hyper-V +# / Windows Server 2012 and above (boolean value) +#enable_instance_metrics_collection=false + +# Enables dynamic memory allocation (ballooning) when set to a +# value greater than 1. The value expresses the ratio between +# the total RAM assigned to an instance and its startup RAM +# amount. For example a ratio of 2.0 for an instance with +# 1024MB of RAM implies 512MB of RAM allocated at startup +# (floating point value) +#dynamic_memory_ratio=1.0 + + +# +# Options defined in nova.virt.hyperv.volumeops +# + +# The number of times to retry to attach a volume (integer +# value) +#volume_attach_retry_count=10 + +# Interval between volume attachment attempts, in seconds +# (integer value) +#volume_attach_retry_interval=5 + +# The number of times to retry checking for a disk mounted via +# iSCSI. (integer value) +#mounted_disk_query_retry_count=10 + +# Interval between checks for a mounted iSCSI disk, in +# seconds. (integer value) +#mounted_disk_query_retry_interval=5 + + +[image_file_url] + +# +# Options defined in nova.image.download.file +# + +# List of file systems that are configured in this file in the +# image_file_url: sections (list value) +#filesystems= + + +[keymgr] + +# +# Options defined in nova.keymgr +# + +# The full class name of the key manager API class (string +# value) +#api_class=nova.keymgr.conf_key_mgr.ConfKeyManager + + +# +# Options defined in nova.keymgr.conf_key_mgr +# + +# Fixed key returned by key manager, specified in hex (string +# value) +#fixed_key= + + +[keystone_authtoken] + +# +# Options defined in keystonemiddleware.auth_token +# + +# Prefix to prepend at the beginning of the path (string +# value) +#auth_admin_prefix= + +# Host providing the admin Identity API endpoint (string +# value) +#auth_host=127.0.0.1 + +# Port of the admin Identity API endpoint (integer value) +#auth_port=35357 + +# Protocol of the admin Identity API endpoint(http or https) +# (string value) +#auth_protocol=https + +# Complete public Identity API endpoint (string value) +#auth_uri= + +# API version of the admin Identity API endpoint (string +# value) +#auth_version= + +# Do not handle authorization requests within the middleware, +# but delegate the authorization decision to downstream WSGI +# components (boolean value) +#delay_auth_decision=false + +# Request timeout value for communicating with Identity API +# server. (boolean value) +#http_connect_timeout= + +# How many times are we trying to reconnect when communicating +# with Identity API Server. (integer value) +#http_request_max_retries=3 + +# Single shared secret with the Keystone configuration used +# for bootstrapping a Keystone installation, or otherwise +# bypassing the normal authentication process. (string value) +#admin_token= + +# Keystone account username (string value) +#admin_user= + +# Keystone account password (string value) +#admin_password= + +# Keystone service account tenant name to validate user tokens +# (string value) +#admin_tenant_name=admin + +# Env key for the swift cache (string value) +#cache= + +# Required if Keystone server requires client certificate +# (string value) +#certfile= + +# Required if Keystone server requires client certificate +# (string value) +#keyfile= + +# A PEM encoded Certificate Authority to use when verifying +# HTTPs connections. Defaults to system CAs. (string value) +#cafile= + +# Verify HTTPS connections. (boolean value) +#insecure=false + +# Directory used to cache files related to PKI tokens (string +# value) +#signing_dir= + +# Optionally specify a list of memcached server(s) to use for +# caching. If left undefined, tokens will instead be cached +# in-process. (list value) +# Deprecated group/name - [DEFAULT]/memcache_servers +#memcached_servers= + +# In order to prevent excessive effort spent validating +# tokens, the middleware caches previously-seen tokens for a +# configurable duration (in seconds). Set to -1 to disable +# caching completely. (integer value) +#token_cache_time=300 + +# Determines the frequency at which the list of revoked tokens +# is retrieved from the Identity service (in seconds). A high +# number of revocation events combined with a low cache +# duration may significantly reduce performance. (integer +# value) +#revocation_cache_time=300 + +# (optional) if defined, indicate whether token data should be +# authenticated or authenticated and encrypted. Acceptable +# values are MAC or ENCRYPT. If MAC, token data is +# authenticated (with HMAC) in the cache. If ENCRYPT, token +# data is encrypted and authenticated in the cache. If the +# value is not one of these options or empty, auth_token will +# raise an exception on initialization. (string value) +#memcache_security_strategy= + +# (optional, mandatory if memcache_security_strategy is +# defined) this string is used for key derivation. (string +# value) +#memcache_secret_key= + +# (optional) indicate whether to set the X-Service-Catalog +# header. If False, middleware will not ask for service +# catalog on token validation and will not set the X-Service- +# Catalog header. (boolean value) +#include_service_catalog=true + +# Used to control the use and type of token binding. Can be +# set to: "disabled" to not check token binding. "permissive" +# (default) to validate binding information if the bind type +# is of a form known to the server and ignore it if not. +# "strict" like "permissive" but if the bind type is unknown +# the token will be rejected. "required" any form of token +# binding is needed to be allowed. Finally the name of a +# binding method that must be present in tokens. (string +# value) +#enforce_token_bind=permissive + + +[libvirt] + +# +# Options defined in nova.virt.libvirt.driver +# + +# Rescue ami image (string value) +#rescue_image_id= + +# Rescue aki image (string value) +#rescue_kernel_id= + +# Rescue ari image (string value) +#rescue_ramdisk_id= + +# Libvirt domain type (valid options are: kvm, lxc, qemu, uml, +# xen) (string value) +# Deprecated group/name - [DEFAULT]/libvirt_type +#virt_type=kvm + +# Override the default libvirt URI (which is dependent on +# virt_type) (string value) +# Deprecated group/name - [DEFAULT]/libvirt_uri +#connection_uri= + +# Inject the admin password at boot time, without an agent. +# (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_inject_password +#inject_password=false + +# Inject the ssh public key at boot time (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_inject_key +#inject_key=false + +# The partition to inject to : -2 => disable, -1 => inspect +# (libguestfs only), 0 => not partitioned, >0 => partition +# number (integer value) +# Deprecated group/name - [DEFAULT]/libvirt_inject_partition +#inject_partition=-2 + +# Sync virtual and real mouse cursors in Windows VMs (boolean +# value) +#use_usb_tablet=true + +# Migration target URI (any included "%s" is replaced with the +# migration target hostname) (string value) +#live_migration_uri=qemu+tcp://%s/system + +# Migration flags to be set for live migration (string value) +#live_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER + +# Migration flags to be set for block migration (string value) +#block_migration_flag=VIR_MIGRATE_UNDEFINE_SOURCE, VIR_MIGRATE_PEER2PEER, VIR_MIGRATE_NON_SHARED_INC + +# Maximum bandwidth to be used during migration, in Mbps +# (integer value) +#live_migration_bandwidth=0 + +# Snapshot image format (valid options are : raw, qcow2, vmdk, +# vdi). Defaults to same as source image (string value) +#snapshot_image_format= + +# DEPRECATED. The libvirt VIF driver to configure the +# VIFs.This option is deprecated and will be removed in the +# Juno release. (string value) +# Deprecated group/name - [DEFAULT]/libvirt_vif_driver +#vif_driver=nova.virt.libvirt.vif.LibvirtGenericVIFDriver + +# Libvirt handlers for remote volumes. (list value) +# Deprecated group/name - [DEFAULT]/libvirt_volume_drivers +#volume_drivers=iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver,iser=nova.virt.libvirt.volume.LibvirtISERVolumeDriver,local=nova.virt.libvirt.volume.LibvirtVolumeDriver,fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver,rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver,nfs=nova.virt.libvirt.volume.LibvirtNFSVolumeDriver,aoe=nova.virt.libvirt.volume.LibvirtAOEVolumeDriver,glusterfs=nova.virt.libvirt.volume.LibvirtGlusterfsVolumeDriver,fibre_channel=nova.virt.libvirt.volume.LibvirtFibreChannelVolumeDriver,scality=nova.virt.libvirt.volume.LibvirtScalityVolumeDriver + +# Override the default disk prefix for the devices attached to +# a server, which is dependent on virt_type. (valid options +# are: sd, xvd, uvd, vd) (string value) +# Deprecated group/name - [DEFAULT]/libvirt_disk_prefix +#disk_prefix= + +# Number of seconds to wait for instance to shut down after +# soft reboot request is made. We fall back to hard reboot if +# instance does not shutdown within this window. (integer +# value) +# Deprecated group/name - [DEFAULT]/libvirt_wait_soft_reboot_seconds +#wait_soft_reboot_seconds=120 + +# Set to "host-model" to clone the host CPU feature flags; to +# "host-passthrough" to use the host CPU model exactly; to +# "custom" to use a named CPU model; to "none" to not set any +# CPU model. If virt_type="kvm|qemu", it will default to +# "host-model", otherwise it will default to "none" (string +# value) +# Deprecated group/name - [DEFAULT]/libvirt_cpu_mode +#cpu_mode= + +# Set to a named libvirt CPU model (see names listed in +# /usr/share/libvirt/cpu_map.xml). Only has effect if +# cpu_mode="custom" and virt_type="kvm|qemu" (string value) +# Deprecated group/name - [DEFAULT]/libvirt_cpu_model +#cpu_model= + +# Location where libvirt driver will store snapshots before +# uploading them to image service (string value) +# Deprecated group/name - [DEFAULT]/libvirt_snapshots_directory +#snapshots_directory=$instances_path/snapshots + +# Location where the Xen hvmloader is kept (string value) +#xen_hvmloader_path=/usr/lib/xen/boot/hvmloader + +# Specific cachemodes to use for different disk types e.g: +# file=directsync,block=none (list value) +#disk_cachemodes= + +# A path to a device that will be used as source of entropy on +# the host. Permitted options are: /dev/random or /dev/hwrng +# (string value) +#rng_dev_path= + + +# +# Options defined in nova.virt.libvirt.imagebackend +# + +# VM Images format. Acceptable values are: raw, qcow2, lvm, +# rbd, default. If default is specified, then use_cow_images +# flag is used instead of this one. (string value) +# Deprecated group/name - [DEFAULT]/libvirt_images_type +#images_type=default + +# LVM Volume Group that is used for VM images, when you +# specify images_type=lvm. (string value) +# Deprecated group/name - [DEFAULT]/libvirt_images_volume_group +#images_volume_group= + +# Create sparse logical volumes (with virtualsize) if this +# flag is set to True. (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_sparse_logical_volumes +#sparse_logical_volumes=false + +# Method used to wipe old volumes (valid options are: none, +# zero, shred) (string value) +#volume_clear=zero + +# Size in MiB to wipe at start of old volumes. 0 => all +# (integer value) +#volume_clear_size=0 + +# The RADOS pool in which rbd volumes are stored (string +# value) +# Deprecated group/name - [DEFAULT]/libvirt_images_rbd_pool +#images_rbd_pool=rbd + +# Path to the ceph configuration file to use (string value) +# Deprecated group/name - [DEFAULT]/libvirt_images_rbd_ceph_conf +#images_rbd_ceph_conf= + + +# +# Options defined in nova.virt.libvirt.imagecache +# + +# Allows image information files to be stored in non-standard +# locations (string value) +#image_info_filename_pattern=$instances_path/$image_cache_subdirectory_name/%(image)s.info + +# Should unused kernel images be removed? This is only safe to +# enable if all compute nodes have been updated to support +# this option. This will be enabled by default in future. +# (boolean value) +#remove_unused_kernels=false + +# Unused resized base images younger than this will not be +# removed (integer value) +#remove_unused_resized_minimum_age_seconds=3600 + +# Write a checksum for files in _base to disk (boolean value) +#checksum_base_images=false + +# How frequently to checksum base images (integer value) +#checksum_interval_seconds=3600 + + +# +# Options defined in nova.virt.libvirt.utils +# + +# Compress snapshot images when possible. This currently +# applies exclusively to qcow2 images (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_snapshot_compression +#snapshot_compression=false + + +# +# Options defined in nova.virt.libvirt.vif +# + +# Use virtio for bridge interfaces with KVM/QEMU (boolean +# value) +# Deprecated group/name - [DEFAULT]/libvirt_use_virtio_for_bridges +#use_virtio_for_bridges=true + + +# +# Options defined in nova.virt.libvirt.volume +# + +# Number of times to rescan iSCSI target to find volume +# (integer value) +#num_iscsi_scan_tries=5 + +# Number of times to rescan iSER target to find volume +# (integer value) +#num_iser_scan_tries=5 + +# The RADOS client name for accessing rbd volumes (string +# value) +#rbd_user= + +# The libvirt UUID of the secret for the rbd_uservolumes +# (string value) +#rbd_secret_uuid= + +# Directory where the NFS volume is mounted on the compute +# node (string value) +#nfs_mount_point_base=$state_path/mnt + +# Mount options passedf to the NFS client. See section of the +# nfs man page for details (string value) +#nfs_mount_options= + +# Number of times to rediscover AoE target to find volume +# (integer value) +#num_aoe_discover_tries=3 + +# Directory where the glusterfs volume is mounted on the +# compute node (string value) +#glusterfs_mount_point_base=$state_path/mnt + +# Use multipath connection of the iSCSI volume (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_iscsi_use_multipath +#iscsi_use_multipath=false + +# Use multipath connection of the iSER volume (boolean value) +# Deprecated group/name - [DEFAULT]/libvirt_iser_use_multipath +#iser_use_multipath=false + +# Path or URL to Scality SOFS configuration file (string +# value) +#scality_sofs_config= + +# Base dir where Scality SOFS shall be mounted (string value) +#scality_sofs_mount_point=$state_path/scality + +# Protocols listed here will be accessed directly from QEMU. +# Currently supported protocols: [gluster] (list value) +#qemu_allowed_storage_drivers= + + +[matchmaker_ring] + +# +# Options defined in oslo.messaging +# + +# Matchmaker ring file (JSON). (string value) +# Deprecated group/name - [DEFAULT]/matchmaker_ringfile +#ringfile=/etc/oslo/matchmaker_ring.json + + +[metrics] + +# +# Options defined in nova.scheduler.weights.metrics +# + +# Multiplier used for weighing metrics. (floating point value) +#weight_multiplier=1.0 + +# How the metrics are going to be weighed. This should be in +# the form of "=, =, ...", where +# is one of the metrics to be weighed, and is +# the corresponding ratio. So for "name1=1.0, name2=-1.0" The +# final weight would be name1.value * 1.0 + name2.value * +# -1.0. (list value) +#weight_setting= + +# How to treat the unavailable metrics. When a metric is NOT +# available for a host, if it is set to be True, it would +# raise an exception, so it is recommended to use the +# scheduler filter MetricFilter to filter out those hosts. If +# it is set to be False, the unavailable metric would be +# treated as a negative factor in weighing process, the +# returned value would be set by the option +# weight_of_unavailable. (boolean value) +#required=true + +# The final weight value to be returned if required is set to +# False and any one of the metrics set by weight_setting is +# unavailable. (floating point value) +#weight_of_unavailable=-10000.0 + + +[osapi_v3] + +# +# Options defined in nova.api.openstack +# + +# Whether the V3 API is enabled or not (boolean value) +#enabled=false + +# A list of v3 API extensions to never load. Specify the +# extension aliases here. (list value) +#extensions_blacklist= + +# If the list is not empty then a v3 API extension will only +# be loaded if it exists in this list. Specify the extension +# aliases here. (list value) +#extensions_whitelist= + + +[rdp] + +# +# Options defined in nova.rdp +# + +# Location of RDP html5 console proxy, in the form +# "http://127.0.0.1:6083/" (string value) +#html5_proxy_base_url=http://127.0.0.1:6083/ + +# Enable RDP related features (boolean value) +#enabled=false + + +[spice] + +# +# Options defined in nova.spice +# + +# Location of spice HTML5 console proxy, in the form +# "http://127.0.0.1:6082/spice_auto.html" (string value) +#html5proxy_base_url=http://127.0.0.1:6082/spice_auto.html + +# IP address on which instance spice server should listen +# (string value) +#server_listen=127.0.0.1 + +# The address to which proxy clients (like nova- +# spicehtml5proxy) should connect (string value) +#server_proxyclient_address=127.0.0.1 + +# Enable spice related features (boolean value) +#enabled=false + +# Enable spice guest agent support (boolean value) +#agent_enabled=true + +# Keymap for spice (string value) +#keymap=en-us + + +[ssl] + +# +# Options defined in nova.openstack.common.sslutils +# + +# CA certificate file to use to verify connecting clients. +# (string value) +#ca_file= + +# Certificate file to use when starting the server securely. +# (string value) +#cert_file= + +# Private key file to use when starting the server securely. +# (string value) +#key_file= + + +[trusted_computing] + +# +# Options defined in nova.scheduler.filters.trusted_filter +# + +# Attestation server HTTP (string value) +#attestation_server= + +# Attestation server Cert file for Identity verification +# (string value) +#attestation_server_ca_file= + +# Attestation server port (string value) +#attestation_port=8443 + +# Attestation web API URL (string value) +#attestation_api_url=/OpenAttestationWebServices/V1.0 + +# Attestation authorization blob - must change (string value) +#attestation_auth_blob= + +# Attestation status cache valid period length (integer value) +#attestation_auth_timeout=60 + + +[upgrade_levels] + +# +# Options defined in nova.baserpc +# + +# Set a version cap for messages sent to the base api in any +# service (string value) +#baseapi= + + +# +# Options defined in nova.cells.rpc_driver +# + +# Set a version cap for messages sent between cells services +# (string value) +#intercell= + + +# +# Options defined in nova.cells.rpcapi +# + +# Set a version cap for messages sent to local cells services +# (string value) +#cells= + + +# +# Options defined in nova.cert.rpcapi +# + +# Set a version cap for messages sent to cert services (string +# value) +#cert= + + +# +# Options defined in nova.compute.rpcapi +# + +# Set a version cap for messages sent to compute services. If +# you plan to do a live upgrade from havana to icehouse, you +# should set this option to "icehouse-compat" before beginning +# the live upgrade procedure. (string value) +#compute= + + +# +# Options defined in nova.conductor.rpcapi +# + +# Set a version cap for messages sent to conductor services +# (string value) +#conductor= + + +# +# Options defined in nova.console.rpcapi +# + +# Set a version cap for messages sent to console services +# (string value) +#console= + + +# +# Options defined in nova.consoleauth.rpcapi +# + +# Set a version cap for messages sent to consoleauth services +# (string value) +#consoleauth= + + +# +# Options defined in nova.network.rpcapi +# + +# Set a version cap for messages sent to network services +# (string value) +#network= + + +# +# Options defined in nova.scheduler.rpcapi +# + +# Set a version cap for messages sent to scheduler services +# (string value) +#scheduler= + + +[vmware] + +# +# Options defined in nova.virt.vmwareapi.driver +# + +# Hostname or IP address for connection to VMware ESX/VC host. +# (string value) +#host_ip= + +# Username for connection to VMware ESX/VC host. (string +# value) +#host_username= + +# Password for connection to VMware ESX/VC host. (string +# value) +#host_password= + +# Name of a VMware Cluster ComputeResource. Used only if +# compute_driver is vmwareapi.VMwareVCDriver. (multi valued) +#cluster_name= + +# Regex to match the name of a datastore. (string value) +#datastore_regex= + +# The interval used for polling of remote tasks. (floating +# point value) +#task_poll_interval=0.5 + +# The number of times we retry on failures, e.g., socket +# error, etc. (integer value) +#api_retry_count=10 + +# VNC starting port (integer value) +#vnc_port=5900 + +# Total number of VNC ports (integer value) +#vnc_port_total=10000 + +# Whether to use linked clone (boolean value) +#use_linked_clone=true + + +# +# Options defined in nova.virt.vmwareapi.vif +# + +# Physical ethernet adapter name for vlan networking (string +# value) +#vlan_interface=vmnic0 + + +# +# Options defined in nova.virt.vmwareapi.vim +# + +# Optional VIM Service WSDL Location e.g +# http:///vimService.wsdl. Optional over-ride to +# default location for bug work-arounds (string value) +#wsdl_location= + + +# +# Options defined in nova.virt.vmwareapi.vim_util +# + +# The maximum number of ObjectContent data objects that should +# be returned in a single result. A positive value will cause +# the operation to suspend the retrieval when the count of +# objects reaches the specified maximum. The server may still +# limit the count to something less than the configured value. +# Any remaining objects may be retrieved with additional +# requests. (integer value) +#maximum_objects=100 + + +# +# Options defined in nova.virt.vmwareapi.vmops +# + +# Name of Integration Bridge (string value) +#integration_bridge=br-int + + +[xenserver] + +# +# Options defined in nova.virt.xenapi.agent +# + +# Number of seconds to wait for agent reply (integer value) +# Deprecated group/name - [DEFAULT]/agent_timeout +#agent_timeout=30 + +# Number of seconds to wait for agent to be fully operational +# (integer value) +# Deprecated group/name - [DEFAULT]/agent_version_timeout +#agent_version_timeout=300 + +# Number of seconds to wait for agent reply to resetnetwork +# request (integer value) +# Deprecated group/name - [DEFAULT]/agent_resetnetwork_timeout +#agent_resetnetwork_timeout=60 + +# Specifies the path in which the XenAPI guest agent should be +# located. If the agent is present, network configuration is +# not injected into the image. Used if +# compute_driver=xenapi.XenAPIDriver and flat_injected=True +# (string value) +# Deprecated group/name - [DEFAULT]/xenapi_agent_path +#agent_path=usr/sbin/xe-update-networking + +# Disables the use of the XenAPI agent in any image regardless +# of what image properties are present. (boolean value) +# Deprecated group/name - [DEFAULT]/xenapi_disable_agent +#disable_agent=false + +# Determines if the XenAPI agent should be used when the image +# used does not contain a hint to declare if the agent is +# present or not. The hint is a glance property +# "xenapi_use_agent" that has the value "True" or "False". +# Note that waiting for the agent when it is not present will +# significantly increase server boot times. (boolean value) +# Deprecated group/name - [DEFAULT]/xenapi_use_agent_default +#use_agent_default=false + + +# +# Options defined in nova.virt.xenapi.client.session +# + +# Timeout in seconds for XenAPI login. (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_login_timeout +#login_timeout=10 + +# Maximum number of concurrent XenAPI connections. Used only +# if compute_driver=xenapi.XenAPIDriver (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_connection_concurrent +#connection_concurrent=5 + + +# +# Options defined in nova.virt.xenapi.driver +# + +# URL for connection to XenServer/Xen Cloud Platform. A +# special value of unix://local can be used to connect to the +# local unix socket. Required if +# compute_driver=xenapi.XenAPIDriver (string value) +# Deprecated group/name - [DEFAULT]/xenapi_connection_url +#connection_url= + +# Username for connection to XenServer/Xen Cloud Platform. +# Used only if compute_driver=xenapi.XenAPIDriver (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_connection_username +#connection_username=root + +# Password for connection to XenServer/Xen Cloud Platform. +# Used only if compute_driver=xenapi.XenAPIDriver (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_connection_password +#connection_password= + +# The interval used for polling of coalescing vhds. Used only +# if compute_driver=xenapi.XenAPIDriver (floating point value) +# Deprecated group/name - [DEFAULT]/xenapi_vhd_coalesce_poll_interval +#vhd_coalesce_poll_interval=5.0 + +# Ensure compute service is running on host XenAPI connects +# to. (boolean value) +# Deprecated group/name - [DEFAULT]/xenapi_check_host +#check_host=true + +# Max number of times to poll for VHD to coalesce. Used only +# if compute_driver=xenapi.XenAPIDriver (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_vhd_coalesce_max_attempts +#vhd_coalesce_max_attempts=20 + +# Base path to the storage repository (string value) +# Deprecated group/name - [DEFAULT]/xenapi_sr_base_path +#sr_base_path=/var/run/sr-mount + +# The iSCSI Target Host (string value) +# Deprecated group/name - [DEFAULT]/target_host +#target_host= + +# The iSCSI Target Port, default is port 3260 (string value) +# Deprecated group/name - [DEFAULT]/target_port +#target_port=3260 + +# IQN Prefix (string value) +# Deprecated group/name - [DEFAULT]/iqn_prefix +#iqn_prefix=iqn.2010-10.org.openstack + +# Used to enable the remapping of VBD dev (Works around an +# issue in Ubuntu Maverick) (boolean value) +# Deprecated group/name - [DEFAULT]/xenapi_remap_vbd_dev +#remap_vbd_dev=false + +# Specify prefix to remap VBD dev to (ex. /dev/xvdb -> +# /dev/sdb) (string value) +# Deprecated group/name - [DEFAULT]/xenapi_remap_vbd_dev_prefix +#remap_vbd_dev_prefix=sd + + +# +# Options defined in nova.virt.xenapi.image.bittorrent +# + +# Base URL for torrent files. (string value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_base_url +#torrent_base_url= + +# Probability that peer will become a seeder. (1.0 = 100%) +# (floating point value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_seed_chance +#torrent_seed_chance=1.0 + +# Number of seconds after downloading an image via BitTorrent +# that it should be seeded for other peers. (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_seed_duration +#torrent_seed_duration=3600 + +# Cached torrent files not accessed within this number of +# seconds can be reaped (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_max_last_accessed +#torrent_max_last_accessed=86400 + +# Beginning of port range to listen on (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_listen_port_start +#torrent_listen_port_start=6881 + +# End of port range to listen on (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_listen_port_end +#torrent_listen_port_end=6891 + +# Number of seconds a download can remain at the same progress +# percentage w/o being considered a stall (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_download_stall_cutoff +#torrent_download_stall_cutoff=600 + +# Maximum number of seeder processes to run concurrently +# within a given dom0. (-1 = no limit) (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_max_seeder_processes_per_host +#torrent_max_seeder_processes_per_host=1 + + +# +# Options defined in nova.virt.xenapi.pool +# + +# To use for hosts with different CPUs (boolean value) +# Deprecated group/name - [DEFAULT]/use_join_force +#use_join_force=true + + +# +# Options defined in nova.virt.xenapi.vif +# + +# Name of Integration Bridge used by Open vSwitch (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_ovs_integration_bridge +#ovs_integration_bridge=xapi1 + + +# +# Options defined in nova.virt.xenapi.vm_utils +# + +# Cache glance images locally. `all` will cache all images, +# `some` will only cache images that have the image_property +# `cache_in_nova=True`, and `none` turns off caching entirely +# (string value) +# Deprecated group/name - [DEFAULT]/cache_images +#cache_images=all + +# Compression level for images, e.g., 9 for gzip -9. Range is +# 1-9, 9 being most compressed but most CPU intensive on dom0. +# (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_image_compression_level +#image_compression_level= + +# Default OS type (string value) +# Deprecated group/name - [DEFAULT]/default_os_type +#default_os_type=linux + +# Time to wait for a block device to be created (integer +# value) +# Deprecated group/name - [DEFAULT]/block_device_creation_timeout +#block_device_creation_timeout=10 + +# Maximum size in bytes of kernel or ramdisk images (integer +# value) +# Deprecated group/name - [DEFAULT]/max_kernel_ramdisk_size +#max_kernel_ramdisk_size=16777216 + +# Filter for finding the SR to be used to install guest +# instances on. To use the Local Storage in default +# XenServer/XCP installations set this flag to other-config +# :i18n-key=local-storage. To select an SR with a different +# matching criteria, you could set it to other- +# config:my_favorite_sr=true. On the other hand, to fall back +# on the Default SR, as displayed by XenCenter, set this flag +# to: default-sr:true (string value) +# Deprecated group/name - [DEFAULT]/sr_matching_filter +#sr_matching_filter=default-sr:true + +# Whether to use sparse_copy for copying data on a resize down +# (False will use standard dd). This speeds up resizes down +# considerably since large runs of zeros won't have to be +# rsynced (boolean value) +# Deprecated group/name - [DEFAULT]/xenapi_sparse_copy +#sparse_copy=true + +# Maximum number of retries to unplug VBD (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_num_vbd_unplug_retries +#num_vbd_unplug_retries=10 + +# Whether or not to download images via Bit Torrent +# (all|some|none). (string value) +# Deprecated group/name - [DEFAULT]/xenapi_torrent_images +#torrent_images=none + +# Name of network to use for booting iPXE ISOs (string value) +# Deprecated group/name - [DEFAULT]/xenapi_ipxe_network_name +#ipxe_network_name= + +# URL to the iPXE boot menu (string value) +# Deprecated group/name - [DEFAULT]/xenapi_ipxe_boot_menu_url +#ipxe_boot_menu_url= + +# Name and optionally path of the tool used for ISO image +# creation (string value) +# Deprecated group/name - [DEFAULT]/xenapi_ipxe_mkisofs_cmd +#ipxe_mkisofs_cmd=mkisofs + + +# +# Options defined in nova.virt.xenapi.vmops +# + +# Number of seconds to wait for instance to go to running +# state (integer value) +# Deprecated group/name - [DEFAULT]/xenapi_running_timeout +#running_timeout=60 + +# The XenAPI VIF driver using XenServer Network APIs. (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_vif_driver +#vif_driver=nova.virt.xenapi.vif.XenAPIBridgeDriver + +# Dom0 plugin driver used to handle image uploads. (string +# value) +# Deprecated group/name - [DEFAULT]/xenapi_image_upload_handler +#image_upload_handler=nova.virt.xenapi.image.glance.GlanceStore + + +# +# Options defined in nova.virt.xenapi.volume_utils +# + +# Number of seconds to wait for an SR to settle if the VDI +# does not exist when first introduced (integer value) +#introduce_vdi_retry_wait=20 + + +[zookeeper] + +# +# Options defined in nova.servicegroup.drivers.zk +# + +# The ZooKeeper addresses for servicegroup service in the +# format of host1:port,host2:port,host3:port (string value) +#address= + +# The recv_timeout parameter for the zk session (integer +# value) +#recv_timeout=4000 + +# The prefix used in ZooKeeper to store ephemeral nodes +# (string value) +#sg_prefix=/servicegroups + +# Number of seconds to wait until retrying to join the session +# (integer value) +#sg_retry_interval=5 + + + diff --git a/openstack/etc/nova/policy.json b/openstack/etc/nova/policy.json new file mode 100644 index 00000000..cc5b8ea4 --- /dev/null +++ b/openstack/etc/nova/policy.json @@ -0,0 +1,324 @@ +{ + "context_is_admin": "role:admin", + "admin_or_owner": "is_admin:True or project_id:%(project_id)s", + "default": "rule:admin_or_owner", + + "cells_scheduler_filter:TargetCellFilter": "is_admin:True", + + "compute:create": "", + "compute:create:attach_network": "", + "compute:create:attach_volume": "", + "compute:create:forced_host": "is_admin:True", + "compute:get_all": "", + "compute:get_all_tenants": "", + "compute:start": "rule:admin_or_owner", + "compute:stop": "rule:admin_or_owner", + "compute:unlock_override": "rule:admin_api", + + "compute:shelve": "", + "compute:shelve_offload": "", + "compute:unshelve": "", + + "compute:volume_snapshot_create": "", + "compute:volume_snapshot_delete": "", + + "admin_api": "is_admin:True", + "compute:v3:servers:start": "rule:admin_or_owner", + "compute:v3:servers:stop": "rule:admin_or_owner", + "compute_extension:v3:os-access-ips:discoverable": "", + "compute_extension:v3:os-access-ips": "", + "compute_extension:accounts": "rule:admin_api", + "compute_extension:admin_actions": "rule:admin_api", + "compute_extension:admin_actions:pause": "rule:admin_or_owner", + "compute_extension:admin_actions:unpause": "rule:admin_or_owner", + "compute_extension:admin_actions:suspend": "rule:admin_or_owner", + "compute_extension:admin_actions:resume": "rule:admin_or_owner", + "compute_extension:admin_actions:lock": "rule:admin_or_owner", + "compute_extension:admin_actions:unlock": "rule:admin_or_owner", + "compute_extension:admin_actions:resetNetwork": "rule:admin_api", + "compute_extension:admin_actions:injectNetworkInfo": "rule:admin_api", + "compute_extension:admin_actions:createBackup": "rule:admin_or_owner", + "compute_extension:admin_actions:migrateLive": "rule:admin_api", + "compute_extension:admin_actions:resetState": "rule:admin_api", + "compute_extension:admin_actions:migrate": "rule:admin_api", + "compute_extension:v3:os-admin-actions": "rule:admin_api", + "compute_extension:v3:os-admin-actions:discoverable": "", + "compute_extension:v3:os-admin-actions:reset_network": "rule:admin_api", + "compute_extension:v3:os-admin-actions:inject_network_info": "rule:admin_api", + "compute_extension:v3:os-admin-actions:reset_state": "rule:admin_api", + "compute_extension:v3:os-admin-password": "", + "compute_extension:v3:os-admin-password:discoverable": "", + "compute_extension:aggregates": "rule:admin_api", + "compute_extension:v3:os-aggregates:discoverable": "", + "compute_extension:v3:os-aggregates:index": "rule:admin_api", + "compute_extension:v3:os-aggregates:create": "rule:admin_api", + "compute_extension:v3:os-aggregates:show": "rule:admin_api", + "compute_extension:v3:os-aggregates:update": "rule:admin_api", + "compute_extension:v3:os-aggregates:delete": "rule:admin_api", + "compute_extension:v3:os-aggregates:add_host": "rule:admin_api", + "compute_extension:v3:os-aggregates:remove_host": "rule:admin_api", + "compute_extension:v3:os-aggregates:set_metadata": "rule:admin_api", + "compute_extension:agents": "rule:admin_api", + "compute_extension:v3:os-agents": "rule:admin_api", + "compute_extension:v3:os-agents:discoverable": "", + "compute_extension:attach_interfaces": "", + "compute_extension:v3:os-attach-interfaces": "", + "compute_extension:v3:os-attach-interfaces:discoverable": "", + "compute_extension:baremetal_nodes": "rule:admin_api", + "compute_extension:cells": "rule:admin_api", + "compute_extension:v3:os-cells": "rule:admin_api", + "compute_extension:v3:os-cells:discoverable": "", + "compute_extension:certificates": "", + "compute_extension:v3:os-certificates:create": "", + "compute_extension:v3:os-certificates:show": "", + "compute_extension:v3:os-certificates:discoverable": "", + "compute_extension:cloudpipe": "rule:admin_api", + "compute_extension:cloudpipe_update": "rule:admin_api", + "compute_extension:console_output": "", + "compute_extension:v3:consoles:discoverable": "", + "compute_extension:v3:os-console-output:discoverable": "", + "compute_extension:v3:os-console-output": "", + "compute_extension:consoles": "", + "compute_extension:v3:os-remote-consoles": "", + "compute_extension:v3:os-remote-consoles:discoverable": "", + "compute_extension:createserverext": "", + "compute_extension:v3:os-create-backup:discoverable": "", + "compute_extension:v3:os-create-backup": "rule:admin_or_owner", + "compute_extension:deferred_delete": "", + "compute_extension:v3:os-deferred-delete": "", + "compute_extension:v3:os-deferred-delete:discoverable": "", + "compute_extension:disk_config": "", + "compute_extension:evacuate": "rule:admin_api", + "compute_extension:v3:os-evacuate": "rule:admin_api", + "compute_extension:v3:os-evacuate:discoverable": "", + "compute_extension:extended_server_attributes": "rule:admin_api", + "compute_extension:v3:os-extended-server-attributes": "rule:admin_api", + "compute_extension:v3:os-extended-server-attributes:discoverable": "", + "compute_extension:extended_status": "", + "compute_extension:v3:os-extended-status": "", + "compute_extension:v3:os-extended-status:discoverable": "", + "compute_extension:extended_availability_zone": "", + "compute_extension:v3:os-extended-availability-zone": "", + "compute_extension:v3:os-extended-availability-zone:discoverable": "", + "compute_extension:extended_ips": "", + "compute_extension:extended_ips_mac": "", + "compute_extension:extended_vif_net": "", + "compute_extension:v3:extension_info:discoverable": "", + "compute_extension:extended_volumes": "", + "compute_extension:v3:os-extended-volumes": "", + "compute_extension:v3:os-extended-volumes:swap": "", + "compute_extension:v3:os-extended-volumes:discoverable": "", + "compute_extension:v3:os-extended-volumes:attach": "", + "compute_extension:v3:os-extended-volumes:detach": "", + "compute_extension:fixed_ips": "rule:admin_api", + "compute_extension:flavor_access": "", + "compute_extension:flavor_access:addTenantAccess": "rule:admin_api", + "compute_extension:flavor_access:removeTenantAccess": "rule:admin_api", + "compute_extension:v3:flavor-access": "", + "compute_extension:v3:flavor-access:discoverable": "", + "compute_extension:v3:flavor-access:remove_tenant_access": "rule:admin_api", + "compute_extension:v3:flavor-access:add_tenant_access": "rule:admin_api", + "compute_extension:flavor_disabled": "", + "compute_extension:flavor_rxtx": "", + "compute_extension:v3:os-flavor-rxtx": "", + "compute_extension:v3:os-flavor-rxtx:discoverable": "", + "compute_extension:flavor_swap": "", + "compute_extension:flavorextradata": "", + "compute_extension:flavorextraspecs:index": "", + "compute_extension:flavorextraspecs:show": "", + "compute_extension:flavorextraspecs:create": "rule:admin_api", + "compute_extension:flavorextraspecs:update": "rule:admin_api", + "compute_extension:flavorextraspecs:delete": "rule:admin_api", + "compute_extension:v3:flavors:discoverable": "", + "compute_extension:v3:flavor-extra-specs:discoverable": "", + "compute_extension:v3:flavor-extra-specs:index": "", + "compute_extension:v3:flavor-extra-specs:show": "", + "compute_extension:v3:flavor-extra-specs:create": "rule:admin_api", + "compute_extension:v3:flavor-extra-specs:update": "rule:admin_api", + "compute_extension:v3:flavor-extra-specs:delete": "rule:admin_api", + "compute_extension:flavormanage": "rule:admin_api", + "compute_extension:v3:flavor-manage": "rule:admin_api", + "compute_extension:floating_ip_dns": "", + "compute_extension:floating_ip_pools": "", + "compute_extension:floating_ips": "", + "compute_extension:floating_ips_bulk": "rule:admin_api", + "compute_extension:fping": "", + "compute_extension:fping:all_tenants": "rule:admin_api", + "compute_extension:hide_server_addresses": "is_admin:False", + "compute_extension:v3:os-hide-server-addresses": "is_admin:False", + "compute_extension:v3:os-hide-server-addresses:discoverable": "", + "compute_extension:hosts": "rule:admin_api", + "compute_extension:v3:os-hosts": "rule:admin_api", + "compute_extension:v3:os-hosts:discoverable": "", + "compute_extension:hypervisors": "rule:admin_api", + "compute_extension:v3:os-hypervisors": "rule:admin_api", + "compute_extension:v3:os-hypervisors:discoverable": "", + "compute_extension:image_size": "", + "compute_extension:instance_actions": "", + "compute_extension:v3:os-server-actions": "", + "compute_extension:v3:os-server-actions:discoverable": "", + "compute_extension:instance_actions:events": "rule:admin_api", + "compute_extension:v3:os-server-actions:events": "rule:admin_api", + "compute_extension:instance_usage_audit_log": "rule:admin_api", + "compute_extension:v3:ips:discoverable": "", + "compute_extension:keypairs": "", + "compute_extension:keypairs:index": "", + "compute_extension:keypairs:show": "", + "compute_extension:keypairs:create": "", + "compute_extension:keypairs:delete": "", + "compute_extension:v3:keypairs:discoverable": "", + "compute_extension:v3:keypairs": "", + "compute_extension:v3:keypairs:index": "", + "compute_extension:v3:keypairs:show": "", + "compute_extension:v3:keypairs:create": "", + "compute_extension:v3:keypairs:delete": "", + "compute_extension:v3:os-lock-server:discoverable": "", + "compute_extension:v3:os-lock-server:lock": "rule:admin_or_owner", + "compute_extension:v3:os-lock-server:unlock": "rule:admin_or_owner", + "compute_extension:v3:os-migrate-server:discoverable": "", + "compute_extension:v3:os-migrate-server:migrate": "rule:admin_api", + "compute_extension:v3:os-migrate-server:migrate_live": "rule:admin_api", + "compute_extension:multinic": "", + "compute_extension:v3:os-multinic": "", + "compute_extension:v3:os-multinic:discoverable": "", + "compute_extension:networks": "rule:admin_api", + "compute_extension:networks:view": "", + "compute_extension:networks_associate": "rule:admin_api", + "compute_extension:v3:os-pause-server:discoverable": "", + "compute_extension:v3:os-pause-server:pause": "rule:admin_or_owner", + "compute_extension:v3:os-pause-server:unpause": "rule:admin_or_owner", + "compute_extension:v3:os-pci:pci_servers": "", + "compute_extension:v3:os-pci:discoverable": "", + "compute_extension:v3:os-pci:index": "rule:admin_api", + "compute_extension:v3:os-pci:detail": "rule:admin_api", + "compute_extension:v3:os-pci:show": "rule:admin_api", + "compute_extension:quotas:show": "", + "compute_extension:quotas:update": "rule:admin_api", + "compute_extension:quotas:delete": "rule:admin_api", + "compute_extension:v3:os-quota-sets:discoverable": "", + "compute_extension:v3:os-quota-sets:show": "", + "compute_extension:v3:os-quota-sets:update": "rule:admin_api", + "compute_extension:v3:os-quota-sets:delete": "rule:admin_api", + "compute_extension:v3:os-quota-sets:detail": "rule:admin_api", + "compute_extension:quota_classes": "", + "compute_extension:rescue": "", + "compute_extension:v3:os-rescue": "", + "compute_extension:v3:os-rescue:discoverable": "", + "compute_extension:v3:os-scheduler-hints:discoverable": "", + "compute_extension:security_group_default_rules": "rule:admin_api", + "compute_extension:security_groups": "", + "compute_extension:v3:os-security-groups": "", + "compute_extension:v3:os-security-groups:discoverable": "", + "compute_extension:server_diagnostics": "rule:admin_api", + "compute_extension:v3:os-server-diagnostics": "rule:admin_api", + "compute_extension:v3:os-server-diagnostics:discoverable": "", + "compute_extension:server_groups": "", + "compute_extension:server_password": "", + "compute_extension:v3:os-server-password": "", + "compute_extension:v3:os-server-password:discoverable": "", + "compute_extension:server_usage": "", + "compute_extension:v3:os-server-usage": "", + "compute_extension:v3:os-server-usage:discoverable": "", + "compute_extension:services": "rule:admin_api", + "compute_extension:v3:os-services": "rule:admin_api", + "compute_extension:v3:os-services:discoverable": "", + "compute_extension:v3:server-metadata:discoverable": "", + "compute_extension:v3:servers:discoverable": "", + "compute_extension:shelve": "", + "compute_extension:shelveOffload": "rule:admin_api", + "compute_extension:v3:os-shelve:shelve": "", + "compute_extension:v3:os-shelve:shelve:discoverable": "", + "compute_extension:v3:os-shelve:shelve_offload": "rule:admin_api", + "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner", + "compute_extension:v3:os-suspend-server:discoverable": "", + "compute_extension:v3:os-suspend-server:suspend": "rule:admin_or_owner", + "compute_extension:v3:os-suspend-server:resume": "rule:admin_or_owner", + "compute_extension:simple_tenant_usage:list": "rule:admin_api", + "compute_extension:unshelve": "", + "compute_extension:v3:os-shelve:unshelve": "", + "compute_extension:users": "rule:admin_api", + "compute_extension:v3:os-user-data:discoverable": "", + "compute_extension:virtual_interfaces": "", + "compute_extension:virtual_storage_arrays": "", + "compute_extension:volumes": "", + "compute_extension:volume_attachments:index": "", + "compute_extension:volume_attachments:show": "", + "compute_extension:volume_attachments:create": "", + "compute_extension:volume_attachments:update": "", + "compute_extension:volume_attachments:delete": "", + "compute_extension:volumetypes": "", + "compute_extension:availability_zone:list": "", + "compute_extension:v3:os-availability-zone:list": "", + "compute_extension:v3:os-availability-zone:discoverable": "", + "compute_extension:availability_zone:detail": "rule:admin_api", + "compute_extension:v3:os-availability-zone:detail": "rule:admin_api", + "compute_extension:used_limits_for_admin": "rule:admin_api", + "compute_extension:migrations:index": "rule:admin_api", + "compute_extension:v3:os-migrations:index": "rule:admin_api", + "compute_extension:v3:os-migrations:discoverable": "", + "compute_extension:os-assisted-volume-snapshots:create": "rule:admin_api", + "compute_extension:os-assisted-volume-snapshots:delete": "rule:admin_api", + "compute_extension:console_auth_tokens": "rule:admin_api", + "compute_extension:v3:os-console-auth-tokens": "rule:admin_api", + "compute_extension:os-server-external-events:create": "rule:admin_api", + "compute_extension:v3:os-server-external-events:create": "rule:admin_api", + + "volume:create": "", + "volume:get_all": "", + "volume:get_volume_metadata": "", + "volume:get_snapshot": "", + "volume:get_all_snapshots": "", + + + "volume_extension:types_manage": "rule:admin_api", + "volume_extension:types_extra_specs": "rule:admin_api", + "volume_extension:volume_admin_actions:reset_status": "rule:admin_api", + "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api", + "volume_extension:volume_admin_actions:force_delete": "rule:admin_api", + + + "network:get_all": "", + "network:get": "", + "network:create": "", + "network:delete": "", + "network:associate": "", + "network:disassociate": "", + "network:get_vifs_by_instance": "", + "network:allocate_for_instance": "", + "network:deallocate_for_instance": "", + "network:validate_networks": "", + "network:get_instance_uuids_by_ip_filter": "", + "network:get_instance_id_by_floating_address": "", + "network:setup_networks_on_host": "", + "network:get_backdoor_port": "", + + "network:get_floating_ip": "", + "network:get_floating_ip_pools": "", + "network:get_floating_ip_by_address": "", + "network:get_floating_ips_by_project": "", + "network:get_floating_ips_by_fixed_address": "", + "network:allocate_floating_ip": "", + "network:deallocate_floating_ip": "", + "network:associate_floating_ip": "", + "network:disassociate_floating_ip": "", + "network:release_floating_ip": "", + "network:migrate_instance_start": "", + "network:migrate_instance_finish": "", + + "network:get_fixed_ip": "", + "network:get_fixed_ip_by_address": "", + "network:add_fixed_ip_to_instance": "", + "network:remove_fixed_ip_from_instance": "", + "network:add_network_to_project": "", + "network:get_instance_nw_info": "", + + "network:get_dns_domains": "", + "network:add_dns_entry": "", + "network:modify_dns_entry": "", + "network:delete_dns_entry": "", + "network:get_dns_entries_by_address": "", + "network:get_dns_entries_by_name": "", + "network:create_private_dns_domain": "", + "network:create_public_dns_domain": "", + "network:delete_dns_domain": "" +} diff --git a/openstack/etc/nova/release.sample b/openstack/etc/nova/release.sample new file mode 100644 index 00000000..4c0d8e48 --- /dev/null +++ b/openstack/etc/nova/release.sample @@ -0,0 +1,4 @@ +[Nova] +vendor = Fedora Project +product = OpenStack Nova +package = 1.fc18 diff --git a/openstack/etc/nova/rootwrap.conf b/openstack/etc/nova/rootwrap.conf new file mode 100644 index 00000000..aa466c5d --- /dev/null +++ b/openstack/etc/nova/rootwrap.conf @@ -0,0 +1,27 @@ +# Configuration for nova-rootwrap +# This file should be owned by (and only-writeable by) the root user + +[DEFAULT] +# List of directories to load filter definitions from (separated by ','). +# These directories MUST all be only writeable by root ! +filters_path=/etc/nova/rootwrap.d,/usr/share/nova/rootwrap + +# List of directories to search executables in, in case filters do not +# explicitely specify a full path (separated by ',') +# If not specified, defaults to system PATH environment variable. +# These directories MUST all be only writeable by root ! +exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin + +# Enable logging to syslog +# Default value is False +use_syslog=False + +# Which syslog facility to use. +# Valid values include auth, authpriv, syslog, local0, local1... +# Default value is 'syslog' +syslog_log_facility=syslog + +# Which messages to log. +# INFO means log all usage +# ERROR means only log unsuccessful attempts +syslog_log_level=ERROR diff --git a/openstack/etc/nova/rootwrap.d/api-metadata.filters b/openstack/etc/nova/rootwrap.d/api-metadata.filters new file mode 100644 index 00000000..1aa6f83e --- /dev/null +++ b/openstack/etc/nova/rootwrap.d/api-metadata.filters @@ -0,0 +1,13 @@ +# nova-rootwrap command filters for api-metadata nodes +# This is needed on nova-api hosts running with "metadata" in enabled_apis +# or when running nova-api-metadata +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ... +iptables-save: CommandFilter, iptables-save, root +ip6tables-save: CommandFilter, ip6tables-save, root + +# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,) +iptables-restore: CommandFilter, iptables-restore, root +ip6tables-restore: CommandFilter, ip6tables-restore, root diff --git a/openstack/etc/nova/rootwrap.d/baremetal-compute-ipmi.filters b/openstack/etc/nova/rootwrap.d/baremetal-compute-ipmi.filters new file mode 100644 index 00000000..4132a999 --- /dev/null +++ b/openstack/etc/nova/rootwrap.d/baremetal-compute-ipmi.filters @@ -0,0 +1,9 @@ +# nova-rootwrap command filters for compute nodes +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# nova/virt/baremetal/ipmi.py: 'ipmitool', .. +ipmitool: CommandFilter, ipmitool, root + +# nova/virt/baremetal/ipmi.py: 'kill', '-TERM', str(console_pid) +kill_shellinaboxd: KillFilter, root, /usr/local/bin/shellinaboxd, -15, -TERM diff --git a/openstack/etc/nova/rootwrap.d/baremetal-deploy-helper.filters b/openstack/etc/nova/rootwrap.d/baremetal-deploy-helper.filters new file mode 100644 index 00000000..6d14b5d9 --- /dev/null +++ b/openstack/etc/nova/rootwrap.d/baremetal-deploy-helper.filters @@ -0,0 +1,11 @@ +# nova-rootwrap command filters for nova-baremetal-deploy-helper +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# nova-baremetal-deploy-helper +iscsiadm: CommandFilter, iscsiadm, root +sfdisk: CommandFilter, sfdisk, root +dd: CommandFilter, dd, root +mkswap: CommandFilter, mkswap, root +blkid: CommandFilter, blkid, root +mkfs: CommandFilter, mkfs, root diff --git a/openstack/etc/nova/rootwrap.d/compute.filters b/openstack/etc/nova/rootwrap.d/compute.filters new file mode 100644 index 00000000..b79851b4 --- /dev/null +++ b/openstack/etc/nova/rootwrap.d/compute.filters @@ -0,0 +1,228 @@ +# nova-rootwrap command filters for compute nodes +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# nova/virt/disk/mount/api.py: 'kpartx', '-a', device +# nova/virt/disk/mount/api.py: 'kpartx', '-d', device +kpartx: CommandFilter, kpartx, root + +# nova/virt/xenapi/vm_utils.py: tune2fs, -O ^has_journal, part_path +# nova/virt/xenapi/vm_utils.py: tune2fs, -j, partition_path +tune2fs: CommandFilter, tune2fs, root + +# nova/virt/disk/mount/api.py: 'mount', mapped_device +# nova/virt/disk/api.py: 'mount', '-o', 'bind', src, target +# nova/virt/xenapi/vm_utils.py: 'mount', '-t', 'ext2,ext3,ext4,reiserfs'.. +# nova/virt/configdrive.py: 'mount', device, mountdir +# nova/virt/libvirt/volume.py: 'mount', '-t', 'sofs' ... +mount: CommandFilter, mount, root + +# nova/virt/disk/mount/api.py: 'umount', mapped_device +# nova/virt/disk/api.py: 'umount' target +# nova/virt/xenapi/vm_utils.py: 'umount', dev_path +# nova/virt/configdrive.py: 'umount', mountdir +umount: CommandFilter, umount, root + +# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-c', device, image +# nova/virt/disk/mount/nbd.py: 'qemu-nbd', '-d', device +qemu-nbd: CommandFilter, qemu-nbd, root + +# nova/virt/disk/mount/loop.py: 'losetup', '--find', '--show', image +# nova/virt/disk/mount/loop.py: 'losetup', '--detach', device +losetup: CommandFilter, losetup, root + +# nova/virt/libvirt/utils.py: 'blockdev', '--getsize64', path +# nova/virt/disk/mount/nbd.py: 'blockdev', '--flushbufs', device +blockdev: RegExpFilter, blockdev, root, blockdev, (--getsize64|--flushbufs), /dev/.* + +# nova/virt/disk/vfs/localfs.py: 'tee', canonpath +tee: CommandFilter, tee, root + +# nova/virt/disk/vfs/localfs.py: 'mkdir', canonpath +mkdir: CommandFilter, mkdir, root + +# nova/virt/disk/vfs/localfs.py: 'chown' +# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log +# nova/virt/libvirt/connection.py: 'chown', os.getuid( console_log +# nova/virt/libvirt/connection.py: 'chown', 'root', basepath('disk') +chown: CommandFilter, chown, root + +# nova/virt/disk/vfs/localfs.py: 'chmod' +chmod: CommandFilter, chmod, root + +# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap' +# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up' +# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev +# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i.. +# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'.. +# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',.. +# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',.. +# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev) +# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1] +# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge +# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', .. +# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',.. +# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ... +# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,.. +# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up' +# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up' +# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, .. +# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, .. +# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up' +# nova/network/linux_net.py: 'ip', 'route', 'add', .. +# nova/network/linux_net.py: 'ip', 'route', 'del', . +# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev +ip: CommandFilter, ip, root + +# nova/virt/libvirt/vif.py: 'tunctl', '-b', '-t', dev +# nova/network/linux_net.py: 'tunctl', '-b', '-t', dev +tunctl: CommandFilter, tunctl, root + +# nova/virt/libvirt/vif.py: 'ovs-vsctl', ... +# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ... +# nova/network/linux_net.py: 'ovs-vsctl', .... +ovs-vsctl: CommandFilter, ovs-vsctl, root + +# nova/network/linux_net.py: 'ovs-ofctl', .... +ovs-ofctl: CommandFilter, ovs-ofctl, root + +# nova/virt/libvirt/connection.py: 'dd', if=%s % virsh_output, ... +dd: CommandFilter, dd, root + +# nova/virt/xenapi/volume_utils.py: 'iscsiadm', '-m', ... +iscsiadm: CommandFilter, iscsiadm, root + +# nova/virt/libvirt/volume.py: 'aoe-revalidate', aoedev +# nova/virt/libvirt/volume.py: 'aoe-discover' +aoe-revalidate: CommandFilter, aoe-revalidate, root +aoe-discover: CommandFilter, aoe-discover, root + +# nova/virt/xenapi/vm_utils.py: parted, --script, ... +# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*. +parted: CommandFilter, parted, root + +# nova/virt/xenapi/vm_utils.py: 'pygrub', '-qn', dev_path +pygrub: CommandFilter, pygrub, root + +# nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s +fdisk: CommandFilter, fdisk, root + +# nova/virt/xenapi/vm_utils.py: e2fsck, -f, -p, partition_path +# nova/virt/disk/api.py: e2fsck, -f, -p, image +e2fsck: CommandFilter, e2fsck, root + +# nova/virt/xenapi/vm_utils.py: resize2fs, partition_path +# nova/virt/disk/api.py: resize2fs, image +resize2fs: CommandFilter, resize2fs, root + +# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ... +iptables-save: CommandFilter, iptables-save, root +ip6tables-save: CommandFilter, ip6tables-save, root + +# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,) +iptables-restore: CommandFilter, iptables-restore, root +ip6tables-restore: CommandFilter, ip6tables-restore, root + +# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ... +# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],.. +arping: CommandFilter, arping, root + +# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address +dhcp_release: CommandFilter, dhcp_release, root + +# nova/network/linux_net.py: 'kill', '-9', pid +# nova/network/linux_net.py: 'kill', '-HUP', pid +kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP + +# nova/network/linux_net.py: 'kill', pid +kill_radvd: KillFilter, root, /usr/sbin/radvd + +# nova/network/linux_net.py: dnsmasq call +dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq + +# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'.. +radvd: CommandFilter, radvd, root + +# nova/network/linux_net.py: 'brctl', 'addbr', bridge +# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0 +# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off' +# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface +brctl: CommandFilter, brctl, root + +# nova/virt/libvirt/utils.py: 'mkswap' +# nova/virt/xenapi/vm_utils.py: 'mkswap' +mkswap: CommandFilter, mkswap, root + +# nova/virt/xenapi/vm_utils.py: 'mkfs' +# nova/utils.py: 'mkfs', fs, path, label +mkfs: CommandFilter, mkfs, root + +# nova/virt/libvirt/utils.py: 'qemu-img' +qemu-img: CommandFilter, qemu-img, root + +# nova/virt/disk/vfs/localfs.py: 'readlink', '-e' +readlink: CommandFilter, readlink, root + +# nova/virt/disk/api.py: 'touch', target +touch: CommandFilter, touch, root + +# nova/virt/disk/api.py: +mkfs.ext3: CommandFilter, mkfs.ext3, root +mkfs.ntfs: CommandFilter, mkfs.ntfs, root + +# nova/virt/libvirt/connection.py: +read_initiator: ReadFileFilter, /etc/iscsi/initiatorname.iscsi + +# nova/virt/libvirt/connection.py: +lvremove: CommandFilter, lvremove, root + +# nova/virt/libvirt/utils.py: +lvcreate: CommandFilter, lvcreate, root + +# nova/virt/libvirt/utils.py: +lvs: CommandFilter, lvs, root + +# nova/virt/libvirt/utils.py: +vgs: CommandFilter, vgs, root + +# nova/virt/baremetal/volume_driver.py: 'tgtadm', '--lld', 'iscsi', ... +tgtadm: CommandFilter, tgtadm, root + +# nova/utils.py:read_file_as_root: 'cat', file_path +# (called from nova/virt/disk/vfs/localfs.py:VFSLocalFS.read_file) +read_passwd: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/passwd +read_shadow: RegExpFilter, cat, root, cat, (/var|/usr)?/tmp/openstack-vfs-localfs[^/]+/etc/shadow + +# nova/virt/libvirt/volume.py: 'multipath' '-R' +multipath: CommandFilter, multipath, root + +# nova/virt/libvirt/utils.py: +systool: CommandFilter, systool, root + +# nova/virt/libvirt/volume.py: +sginfo: CommandFilter, sginfo, root +sg_scan: CommandFilter, sg_scan, root +ln: RegExpFilter, ln, root, ln, --symbolic, --force, /dev/mapper/ip-.*-iscsi-iqn.2010-10.org.openstack:volume-.*, /dev/disk/by-path/ip-.*-iscsi-iqn.2010-10.org.openstack:volume-.* + +# nova/volume/encryptors.py: +# nova/virt/libvirt/dmcrypt.py: +cryptsetup: CommandFilter, cryptsetup, root + +# nova/virt/xenapi/vm_utils.py: +xenstore-read: CommandFilter, xenstore-read, root + +# nova/virt/baremetal/tilera.py: 'rpc.mountd' +rpc.mountd: CommandFilter, rpc.mountd, root + +# nova/virt/libvirt/utils.py: +rbd: CommandFilter, rbd, root + +# nova/virt/libvirt/utils.py: 'shred', '-n3', '-s%d' % volume_size, path +shred: CommandFilter, shred, root + +# nova/virt/libvirt/volume.py: 'cp', '/dev/stdin', delete_control.. +cp: CommandFilter, cp, root + +# nova/virt/xenapi/vm_utils.py: +sync: CommandFilter, sync, root + diff --git a/openstack/etc/nova/rootwrap.d/network.filters b/openstack/etc/nova/rootwrap.d/network.filters new file mode 100644 index 00000000..568e8d49 --- /dev/null +++ b/openstack/etc/nova/rootwrap.d/network.filters @@ -0,0 +1,94 @@ +# nova-rootwrap command filters for network nodes +# This file should be owned by (and only-writeable by) the root user + +[Filters] +# nova/virt/libvirt/vif.py: 'ip', 'tuntap', 'add', dev, 'mode', 'tap' +# nova/virt/libvirt/vif.py: 'ip', 'link', 'set', dev, 'up' +# nova/virt/libvirt/vif.py: 'ip', 'link', 'delete', dev +# nova/network/linux_net.py: 'ip', 'addr', 'add', str(floating_ip)+'/32'i.. +# nova/network/linux_net.py: 'ip', 'addr', 'del', str(floating_ip)+'/32'.. +# nova/network/linux_net.py: 'ip', 'addr', 'add', '169.254.169.254/32',.. +# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', dev, 'scope',.. +# nova/network/linux_net.py: 'ip', 'addr', 'del/add', ip_params, dev) +# nova/network/linux_net.py: 'ip', 'addr', 'del', params, fields[-1] +# nova/network/linux_net.py: 'ip', 'addr', 'add', params, bridge +# nova/network/linux_net.py: 'ip', '-f', 'inet6', 'addr', 'change', .. +# nova/network/linux_net.py: 'ip', 'link', 'set', 'dev', dev, 'promisc',.. +# nova/network/linux_net.py: 'ip', 'link', 'add', 'link', bridge_if ... +# nova/network/linux_net.py: 'ip', 'link', 'set', interface, address,.. +# nova/network/linux_net.py: 'ip', 'link', 'set', interface, 'up' +# nova/network/linux_net.py: 'ip', 'link', 'set', bridge, 'up' +# nova/network/linux_net.py: 'ip', 'addr', 'show', 'dev', interface, .. +# nova/network/linux_net.py: 'ip', 'link', 'set', dev, address, .. +# nova/network/linux_net.py: 'ip', 'link', 'set', dev, 'up' +# nova/network/linux_net.py: 'ip', 'route', 'add', .. +# nova/network/linux_net.py: 'ip', 'route', 'del', . +# nova/network/linux_net.py: 'ip', 'route', 'show', 'dev', dev +ip: CommandFilter, ip, root + +# nova/virt/libvirt/vif.py: 'ovs-vsctl', ... +# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ... +# nova/network/linux_net.py: 'ovs-vsctl', .... +ovs-vsctl: CommandFilter, ovs-vsctl, root + +# nova/network/linux_net.py: 'ovs-ofctl', .... +ovs-ofctl: CommandFilter, ovs-ofctl, root + +# nova/virt/libvirt/vif.py: 'ivs-ctl', ... +# nova/virt/libvirt/vif.py: 'ivs-ctl', 'del-port', ... +# nova/network/linux_net.py: 'ivs-ctl', .... +ivs-ctl: CommandFilter, ivs-ctl, root + +# nova/virt/libvirt/vif.py: 'ifc_ctl', ... +ifc_ctl: CommandFilter, /opt/pg/bin/ifc_ctl, root + +# nova/virt/libvirt/vif.py: 'ebrctl', ... +ebrctl: CommandFilter, ebrctl, root + +# nova/virt/libvirt/vif.py: 'mm-ctl', ... +mm-ctl: CommandFilter, mm-ctl, root + +# nova/network/linux_net.py: 'ebtables', '-D' ... +# nova/network/linux_net.py: 'ebtables', '-I' ... +ebtables: CommandFilter, ebtables, root +ebtables_usr: CommandFilter, ebtables, root + +# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd, '-t', ... +iptables-save: CommandFilter, iptables-save, root +ip6tables-save: CommandFilter, ip6tables-save, root + +# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,) +iptables-restore: CommandFilter, iptables-restore, root +ip6tables-restore: CommandFilter, ip6tables-restore, root + +# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ... +# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],.. +arping: CommandFilter, arping, root + +# nova/network/linux_net.py: 'dhcp_release', dev, address, mac_address +dhcp_release: CommandFilter, dhcp_release, root + +# nova/network/linux_net.py: 'kill', '-9', pid +# nova/network/linux_net.py: 'kill', '-HUP', pid +kill_dnsmasq: KillFilter, root, /usr/sbin/dnsmasq, -9, -HUP + +# nova/network/linux_net.py: 'kill', pid +kill_radvd: KillFilter, root, /usr/sbin/radvd + +# nova/network/linux_net.py: dnsmasq call +dnsmasq: EnvFilter, env, root, CONFIG_FILE=, NETWORK_ID=, dnsmasq + +# nova/network/linux_net.py: 'radvd', '-C', '%s' % _ra_file(dev, 'conf'.. +radvd: CommandFilter, radvd, root + +# nova/network/linux_net.py: 'brctl', 'addbr', bridge +# nova/network/linux_net.py: 'brctl', 'setfd', bridge, 0 +# nova/network/linux_net.py: 'brctl', 'stp', bridge, 'off' +# nova/network/linux_net.py: 'brctl', 'addif', bridge, interface +brctl: CommandFilter, brctl, root + +# nova/network/linux_net.py: 'sysctl', .... +sysctl: CommandFilter, sysctl, root + +# nova/network/linux_net.py: 'conntrack' +conntrack: CommandFilter, conntrack, root diff --git a/openstack/etc/sysctl.conf b/openstack/etc/sysctl.conf new file mode 100644 index 00000000..a4417acc --- /dev/null +++ b/openstack/etc/sysctl.conf @@ -0,0 +1,3 @@ +net.ipv4.ip_forward=1 +net.ipv4.conf.all.rp_filter=0 +net.ipv4.conf.default.rp_filter=0 diff --git a/openstack/etc/systemd/system/apache-httpd-server-setup.service b/openstack/etc/systemd/system/apache-httpd-server-setup.service new file mode 100644 index 00000000..17fa301b --- /dev/null +++ b/openstack/etc/systemd/system/apache-httpd-server-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run apache-httpd-server-setup (once) +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/apache-httpd-server-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/apache-httpd.service b/openstack/etc/systemd/system/apache-httpd.service new file mode 100644 index 00000000..01627e02 --- /dev/null +++ b/openstack/etc/systemd/system/apache-httpd.service @@ -0,0 +1,16 @@ +[Unit] +Description=Apache Web Server +Requires=apache-httpd-server-setup.service openstack-horizon-setup.service +After=network.target remote-fs.target nss-lookup.target apache-httpd-server-setup.service openstack-horizon-setup.service + +[Service] +Type=forking +PIDFile=/var/run/httpd.pid +ExecStart=/usr/sbin/apachectl start +ExecStop=/usr/sbin/apachectl graceful-stop +ExecReload=/usr/sbin/apachectl graceful +PrivateTmp=true +LimitNOFILE=infinity + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-api.service b/openstack/etc/systemd/system/openstack-cinder-api.service new file mode 100644 index 00000000..a4a100f8 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-cinder-api.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Volume Service (code-named Cinder) API server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-backup.service b/openstack/etc/systemd/system/openstack-cinder-backup.service new file mode 100644 index 00000000..a8f09ae0 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-cinder-backup.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder backup server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-scheduler.service b/openstack/etc/systemd/system/openstack-cinder-scheduler.service new file mode 100644 index 00000000..feff70f4 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-cinder-scheduler.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder scheduler server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-setup.service b/openstack/etc/systemd/system/openstack-cinder-setup.service new file mode 100644 index 00000000..2bd0a6bb --- /dev/null +++ b/openstack/etc/systemd/system/openstack-cinder-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openstack-cinder-setup (once) +After=local-fs.target openstack-keystone-setup.service postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-cinder-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-cinder-volume.service b/openstack/etc/systemd/system/openstack-cinder-volume.service new file mode 100644 index 00000000..8852c90f --- /dev/null +++ b/openstack/etc/systemd/system/openstack-cinder-volume.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Cinder volume server +After=syslog.target network.target + +[Service] +Type=simple +User=cinder +ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-glance-api.service b/openstack/etc/systemd/system/openstack-glance-api.service new file mode 100644 index 00000000..7958f84c --- /dev/null +++ b/openstack/etc/systemd/system/openstack-glance-api.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Image Service (code-named Glance) API server +After=syslog.target network.target + +[Service] +Type=simple +User=glance +ExecStart=/usr/bin/glance-api --config-file /etc/glance/glance-api.conf + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/etc/systemd/system/openstack-glance-registry.service b/openstack/etc/systemd/system/openstack-glance-registry.service new file mode 100644 index 00000000..18a60ae1 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-glance-registry.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Image Service (code-named Glance) Registry server +After=syslog.target network.target + +[Service] +Type=simple +User=glance +ExecStart=/usr/bin/glance-registry --config-file /etc/glance/glance-registry.conf + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/etc/systemd/system/openstack-glance-setup.service b/openstack/etc/systemd/system/openstack-glance-setup.service new file mode 100644 index 00000000..ee03c167 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-glance-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openstack-glance-setup (once) +After=local-fs.target openstack-keystone-setup.service postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-glance-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-horizon-setup.service b/openstack/etc/systemd/system/openstack-horizon-setup.service new file mode 100644 index 00000000..082ec372 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-horizon-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openstack-horizon-setup (once) +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-horizon-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-keystone-setup.service b/openstack/etc/systemd/system/openstack-keystone-setup.service new file mode 100644 index 00000000..fb2793bb --- /dev/null +++ b/openstack/etc/systemd/system/openstack-keystone-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openstack-keystone-setup (once) +After=local-fs.target postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-keystone-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-keystone.service b/openstack/etc/systemd/system/openstack-keystone.service new file mode 100644 index 00000000..82b2d078 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-keystone.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Identity Service (code-named Keystone) +After=syslog.target network.target + +[Service] +Type=notify +Restart=always +User=keystone +ExecStart=/usr/bin/keystone-all --config-file /etc/keystone/keystone.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service b/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service new file mode 100644 index 00000000..a86b7a0a --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-dhcp-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron DHCP Agent +After=network-online.target openstack-neutron-ovs-cleanup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-dhcp-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/dhcp_agent.ini \ + --log-file=/var/log/neutron/dhcp-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-l3-agent.service b/openstack/etc/systemd/system/openstack-neutron-l3-agent.service new file mode 100644 index 00000000..7fe12f46 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-l3-agent.service @@ -0,0 +1,15 @@ +[Unit] +Description=Neutron Layer 3 Agent +After=network-online.target openstack-neutron-ovs-cleanup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-l3-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/l3_agent.ini \ + --config-file=/etc/neutron/fwaas_driver.ini \ + --log-file=/var/log/neutron/l3-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service b/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service new file mode 100644 index 00000000..15fd406f --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-metadata-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron Metadata Plugin Agent +After=network-online.target openstack-neutron-setup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-metadata-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/metadata_agent.ini \ + --log-file=/var/log/neutron/metadata-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service new file mode 100644 index 00000000..2b1d168b --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service @@ -0,0 +1,13 @@ +[Unit] +Description=Configuration script to set Openstack in one node networking +Wants=network-online.target +After=network-online.target openvswitch.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node +Restart=no +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service new file mode 100644 index 00000000..5eaf8a30 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron OVS cleanup +After=network-online.target openstack-neutron-setup.service +ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-ovs-cleanup \ + --log-file /var/log/neutron/ovs-cleanup.log \ + --config-file /etc/neutron/neutron.conf --verbose + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service b/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service new file mode 100644 index 00000000..12498cc9 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service @@ -0,0 +1,14 @@ +[Unit] +Description=Neutron OpenvSwitch Plugin Agent +After=network-online.target openstack-neutron-setup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-openvswitch-agent \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ + --log-file=/var/log/neutron/openvswitch-agent.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/etc/systemd/system/openstack-neutron-server.service new file mode 100644 index 00000000..f48c0a88 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-server.service @@ -0,0 +1,15 @@ +[Unit] +Description=Neutron Api Server +Wants=openvswitch-create-links-one-node.service +After=network-online.target openstack-neutron-setup.service + +[Service] +Type=simple +User=neutron +ExecStart=/usr/bin/neutron-server \ + --config-file=/etc/neutron/neutron.conf \ + --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini \ + --log-file=/var/log/neutron/neutron-server.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service new file mode 100644 index 00000000..38882e80 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-neutron-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Run openstack-neutron-setup (once) +After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-neutron-setup +Restart=no +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-api.service b/openstack/etc/systemd/system/openstack-nova-api.service new file mode 100644 index 00000000..de7412ee --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-api.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Compute Service (code-named Nova) API server +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-api --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-cert.service b/openstack/etc/systemd/system/openstack-nova-cert.service new file mode 100644 index 00000000..c21246bf --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-cert.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova Cert +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-cert --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-compute.service b/openstack/etc/systemd/system/openstack-nova-compute.service new file mode 100644 index 00000000..dc18f225 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-compute.service @@ -0,0 +1,12 @@ +[Unit] +Description=OpenStack Compute Service (code-named Nova) API server +After=syslog.target network.target libvirtd.service +Requires=libvirtd.service + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-compute --config-file /etc/nova/nova.conf --config-file /etc/nova/nova-compute.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-conductor.service b/openstack/etc/systemd/system/openstack-nova-conductor.service new file mode 100644 index 00000000..68e0a6ed --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-conductor.service @@ -0,0 +1,12 @@ +[Unit] +Description=Database-access support for Compute nodes (nova-conductor) +After=syslog.target network.target libvirtd.service +Requires=libvirtd.service + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-conductor --config-file /etc/nova/nova.conf --logfile /var/log/nova/conductor.log + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-consoleauth.service b/openstack/etc/systemd/system/openstack-nova-consoleauth.service new file mode 100644 index 00000000..2c582518 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-consoleauth.service @@ -0,0 +1,11 @@ +[Unit] +Description=Openstack Console Auth (nova-consoleauth) +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-consoleauth --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-novncproxy.service b/openstack/etc/systemd/system/openstack-nova-novncproxy.service new file mode 100644 index 00000000..21013244 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-novncproxy.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova NoVNC proxy +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-novncproxy --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-scheduler.service b/openstack/etc/systemd/system/openstack-nova-scheduler.service new file mode 100644 index 00000000..519ef5eb --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-scheduler.service @@ -0,0 +1,11 @@ +[Unit] +Description=OpenStack Nova Scheduler +After=syslog.target network.target + +[Service] +Type=simple +User=nova +ExecStart=/usr/bin/nova-scheduler --config-file /etc/nova/nova.conf + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-nova-setup.service b/openstack/etc/systemd/system/openstack-nova-setup.service new file mode 100644 index 00000000..e7a9136f --- /dev/null +++ b/openstack/etc/systemd/system/openstack-nova-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openstack-nova-setup (once) +After=local-fs.target libvirtd.service openstack-keystone-setup.service postgres-server.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-nova-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-server.service b/openstack/etc/systemd/system/openstack-rabbitmq-server.service new file mode 100644 index 00000000..91bd6fa7 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-rabbitmq-server.service @@ -0,0 +1,16 @@ +[Unit] +Description=RabbitMQ broker +After=syslog.target network.target openstack-rabbitmq-setup.service +Requires=openstack-rabbitmq-setup.service + +[Service] +Type=notify +User=rabbitmq +Group=rabbitmq +Environment="HOME=/var/lib/rabbitmq" +WorkingDirectory=/var/lib/rabbitmq +ExecStart=/usr/sbin/rabbitmq-server +ExecStop=/usr/sbin/rabbitmqctl stop + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openstack-rabbitmq-setup.service b/openstack/etc/systemd/system/openstack-rabbitmq-setup.service new file mode 100644 index 00000000..85257fd1 --- /dev/null +++ b/openstack/etc/systemd/system/openstack-rabbitmq-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Run openstack-rabbitmq-setup (once) +Requires=local-fs.target +After=local-fs.target network.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openstack-rabbitmq-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service new file mode 100644 index 00000000..bacfc433 --- /dev/null +++ b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service @@ -0,0 +1,14 @@ +[Unit] +Description=Create Veth pairs +Wants=openstack-neutron-network-configuration-one-node.service +After=network-online.target openstack-neutron-network-configuration-one-node.service + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs +RemainAfterExit=yes +Restart=no + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/etc/systemd/system/openvswitch-db-server.service new file mode 100644 index 00000000..e1cd2042 --- /dev/null +++ b/openstack/etc/systemd/system/openvswitch-db-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=Open vSwitch Database Server Daemon +After=local-fs.target openvswitch-setup.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ovsdb-server --remote=punix:/usr/local/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach + +[Install] +WantedBy=multi-user.target + diff --git a/openstack/etc/systemd/system/openvswitch-initialize-db.service b/openstack/etc/systemd/system/openvswitch-initialize-db.service new file mode 100644 index 00000000..3c564c5a --- /dev/null +++ b/openstack/etc/systemd/system/openvswitch-initialize-db.service @@ -0,0 +1,10 @@ +[Unit] +Description=Run openvswitch-initialize-db (once) +After=local-fs.target openvswitch-db-server.service + +ConditionPathExists=!/usr/local/var/run/openvswitch/openvswitch-initialize-db-flag + +[Service] +Type=oneshot +ExecStart=/usr/bin/ovs-vsctl --no-wait init +ExecStart=/bin/touch /usr/local/var/run/openvswitch/openvswitch-initialize-db-flag diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/etc/systemd/system/openvswitch-setup.service new file mode 100644 index 00000000..bfe67002 --- /dev/null +++ b/openstack/etc/systemd/system/openvswitch-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run openvswitch-setup (once) +After=local-fs.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/openvswitch-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/openvswitch.service b/openstack/etc/systemd/system/openvswitch.service new file mode 100644 index 00000000..446c0f95 --- /dev/null +++ b/openstack/etc/systemd/system/openvswitch.service @@ -0,0 +1,10 @@ +[Unit] +Description=Open vSwitch Daemon +After=openvswitch-initialize-db.service + +[Service] +Type=forking +ExecStart=/usr/sbin/ovs-vswitchd --pidfile --detach + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/postgres-server.service b/openstack/etc/systemd/system/postgres-server.service new file mode 100644 index 00000000..6ee25e98 --- /dev/null +++ b/openstack/etc/systemd/system/postgres-server.service @@ -0,0 +1,26 @@ +[Unit] +Description=PostgreSQL database server +Requires=postgres-setup.service +After=postgres-setup.service + +[Service] +Type=forking +TimeoutSec=120 +User=postgres +Group=postgres + +Environment=PGROOT=/var/lib/pgsql + +SyslogIdentifier=postgres +PIDFile=/var/lib/pgsql/data/postmaster.pid + +ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120 +ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload +ExecStop= /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast + +# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in +# killing Postgres, so adjust it downward +OOMScoreAdjust=-200 + +[Install] +WantedBy=multi-user.target diff --git a/openstack/etc/systemd/system/postgres-setup.service b/openstack/etc/systemd/system/postgres-setup.service new file mode 100644 index 00000000..281d0d77 --- /dev/null +++ b/openstack/etc/systemd/system/postgres-setup.service @@ -0,0 +1,11 @@ +[Unit] +Description=Run postgres-setup (once) +After=network.target + +[Service] +Type=oneshot +ExecStart=/usr/share/openstack/postgres-setup +Restart=no + +[Install] +WantedBy=multi-user.target diff --git a/openstack/manifest b/openstack/manifest new file mode 100644 index 00000000..a1badde4 --- /dev/null +++ b/openstack/manifest @@ -0,0 +1,187 @@ +0040755 0 0 /etc/keystone +0040755 0 0 /var/lib/keystone +0040755 0 0 /usr/share/openstack +0100755 0 0 /usr/share/openstack/openstack-keystone-setup +0100644 0 0 /etc/keystone/logging.conf +0100644 0 0 /etc/keystone/keystone.conf +0100644 0 0 /etc/keystone/policy.json +0100644 0 0 /etc/keystone/keystone-paste.ini +0100644 0 0 /etc/logrotate.d/openstack-keystone +0100644 0 0 /etc/systemd/system/openstack-keystone.service +0100644 0 0 /etc/systemd/system/openstack-keystone-setup.service +0040755 0 0 /etc/glance +0040755 0 0 /var/lib/glance +0040755 0 0 /var/lib/glance/image-cache +0040755 0 0 /var/lib/glance/image-cache/incomplete +0040755 0 0 /var/lib/glance/image-cache/invalid +0040755 0 0 /var/lib/glance/image-cache/queue +0040755 0 0 /var/lib/glance/images +0100644 0 0 /etc/glance/logging.conf +0100644 0 0 /etc/glance/glance-api.conf +0100644 0 0 /etc/glance/glance-registry.conf +0100644 0 0 /etc/glance/glance-scrubber.conf +0100644 0 0 /etc/glance/glance-cache.conf +0100644 0 0 /etc/glance/schema-image.json +0100644 0 0 /etc/glance/policy.json +0100644 0 0 /etc/glance/glance-api-paste.ini +0100644 0 0 /etc/glance/glance-registry-paste.ini +0100644 0 0 /etc/logrotate.d/openstack-glance-api +0100644 0 0 /etc/logrotate.d/openstack-glance-registry +0100644 0 0 /etc/systemd/system/openstack-glance-setup.service +0100644 0 0 /etc/systemd/system/openstack-glance-api.service +0100644 0 0 /etc/systemd/system/openstack-glance-registry.service +0100755 0 0 /usr/share/openstack/openstack-glance-setup +0040755 0 0 /var/lib/nova +0040755 0 0 /etc/nova +0100644 0 0 /etc/nova/logging.conf +0100644 0 0 /etc/nova/rootwrap.conf +0100644 0 0 /etc/nova/nova.conf +0100644 0 0 /etc/nova/nova-compute.conf +0100644 0 0 /etc/nova/policy.json +0100644 0 0 /etc/nova/cells.json +0100644 0 0 /etc/nova/api-paste.ini +0040755 0 0 /etc/nova/rootwrap.d/ +0100644 0 0 /etc/nova/rootwrap.d/api-metadata.filters +0100644 0 0 /etc/nova/rootwrap.d/baremetal-compute-ipmi.filters +0100644 0 0 /etc/nova/rootwrap.d/baremetal-deploy-helper.filters +0100644 0 0 /etc/nova/rootwrap.d/compute.filters +0100644 0 0 /etc/nova/rootwrap.d/network.filters +0100755 0 0 /usr/share/openstack/openstack-nova-setup +0100644 0 0 /etc/systemd/system/openstack-nova-setup.service +0100644 0 0 /etc/systemd/system/openstack-nova-compute.service +0100644 0 0 /etc/systemd/system/openstack-nova-conductor.service +0100644 0 0 /etc/systemd/system/openstack-nova-api.service +0100644 0 0 /etc/systemd/system/openstack-nova-scheduler.service +0100644 0 0 /etc/systemd/system/openstack-nova-consoleauth.service +0100644 0 0 /etc/systemd/system/openstack-nova-novncproxy.service +0100644 0 0 /etc/systemd/system/openstack-nova-cert.service +0100644 0 0 /etc/systemd/system/openstack-rabbitmq-setup.service +0100644 0 0 /etc/systemd/system/openstack-rabbitmq-server.service +0100755 0 0 /usr/share/openstack/openstack-rabbitmq-setup +0040755 0 0 /var/lib/rabbitmq +0040755 0 0 /var/lib/cinder +0040755 0 0 /etc/cinder +0100644 0 0 /etc/cinder/rootwrap.conf +0100644 0 0 /etc/cinder/cinder.conf +0100644 0 0 /etc/cinder/api-paste.ini +0100644 0 0 /etc/cinder/policy.json +0100755 0 0 /usr/share/openstack/openstack-cinder-setup +0100644 0 0 /etc/systemd/system/openstack-cinder-setup.service +0100644 0 0 /etc/systemd/system/openstack-cinder-api.service +0100644 0 0 /etc/systemd/system/openstack-cinder-scheduler.service +0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service +0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service +0040755 0 0 /etc/cinder/rootwrap.d/ +0100644 0 0 /etc/cinder/rootwrap.d/volume.filters +0040755 0 0 /etc/neutron +0040755 0 0 /var/lib/neutron +0100644 0 0 /etc/neutron/rootwrap.conf +0100644 0 0 /etc/neutron/neutron.conf +0100644 0 0 /etc/neutron/api-paste.ini +0100644 0 0 /etc/neutron/policy.json +0100644 0 0 /etc/neutron/l3_agent.ini +0100644 0 0 /etc/neutron/dhcp_agent.ini +0100644 0 0 /etc/neutron/lbaas_agent.ini +0100644 0 0 /etc/neutron/metadata_agent.ini +0100644 0 0 /etc/neutron/fwaas_driver.ini +0100644 0 0 /etc/neutron/metering_agent.ini +0100644 0 0 /etc/neutron/vpn_agent.ini +0040755 0 0 /etc/neutron/rootwrap.d/ +0100644 0 0 /etc/neutron/rootwrap.d/cisco-apic.filters +0100644 0 0 /etc/neutron/rootwrap.d/debug.filters +0100644 0 0 /etc/neutron/rootwrap.d/dhcp.filters +0100644 0 0 /etc/neutron/rootwrap.d/ipset-firewall.filters +0100644 0 0 /etc/neutron/rootwrap.d/iptables-firewall.filters +0100644 0 0 /etc/neutron/rootwrap.d/l3.filters +0100644 0 0 /etc/neutron/rootwrap.d/lbaas-haproxy.filters +0100644 0 0 /etc/neutron/rootwrap.d/linuxbridge-plugin.filters +0100644 0 0 /etc/neutron/rootwrap.d/nec-plugin.filters +0100644 0 0 /etc/neutron/rootwrap.d/ofagent.filters +0100644 0 0 /etc/neutron/rootwrap.d/openvswitch-plugin.filters +0100644 0 0 /etc/neutron/rootwrap.d/vpnaas.filters +0040755 0 0 /etc/neutron/plugins/ +0040755 0 0 /etc/neutron/plugins/bigswitch +0100644 0 0 /etc/neutron/plugins/bigswitch/restproxy.ini +0040755 0 0 /etc/neutron/plugins/bigswitch/ssl +0040755 0 0 /etc/neutron/plugins/bigswitch/ssl/ca_certs +0040755 0 0 /etc/neutron/plugins/bigswitch/ssl/host_certs +0100644 0 0 /etc/neutron/plugins/bigswitch/ssl/ca_certs/README +0100644 0 0 /etc/neutron/plugins/bigswitch/ssl/host_certs/README +0040755 0 0 /etc/neutron/plugins/brocade +0100644 0 0 /etc/neutron/plugins/brocade/brocade.ini +0040755 0 0 /etc/neutron/plugins/cisco +0100644 0 0 /etc/neutron/plugins/cisco/cisco_cfg_agent.ini +0100644 0 0 /etc/neutron/plugins/cisco/cisco_plugins.ini +0100644 0 0 /etc/neutron/plugins/cisco/cisco_router_plugin.ini +0100644 0 0 /etc/neutron/plugins/cisco/cisco_vpn_agent.ini +0040755 0 0 /etc/neutron/plugins/embrane +0100644 0 0 /etc/neutron/plugins/embrane/heleos_conf.ini +0040755 0 0 /etc/neutron/plugins/hyperv +0100644 0 0 /etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini +0040755 0 0 /etc/neutron/plugins/ibm +0100644 0 0 /etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini +0040755 0 0 /etc/neutron/plugins/linuxbridge +0100644 0 0 /etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini +0040755 0 0 /etc/neutron/plugins/metaplugin +0100644 0 0 /etc/neutron/plugins/metaplugin/metaplugin.ini +0040755 0 0 /etc/neutron/plugins/midonet +0100644 0 0 /etc/neutron/plugins/midonet/midonet.ini +0040755 0 0 /etc/neutron/plugins/ml2 +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_arista.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_brocade.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_cisco.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_mlnx.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_ncs.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_odl.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_ofa.ini +0100644 0 0 /etc/neutron/plugins/ml2/ml2_conf_sriov.ini +0040755 0 0 /etc/neutron/plugins/mlnx +0100644 0 0 /etc/neutron/plugins/mlnx/mlnx_conf.ini +0040755 0 0 /etc/neutron/plugins/nec +0100644 0 0 /etc/neutron/plugins/nec/nec.ini +0040755 0 0 /etc/neutron/plugins/nuage +0100644 0 0 /etc/neutron/plugins/nuage/nuage_plugin.ini +0040755 0 0 /etc/neutron/plugins/oneconvergence +0100644 0 0 /etc/neutron/plugins/oneconvergence/nvsdplugin.ini +0040755 0 0 /etc/neutron/plugins/opencontrail +0100644 0 0 /etc/neutron/plugins/opencontrail/contrailplugin.ini +0040755 0 0 /etc/neutron/plugins/openvswitch +0100644 0 0 /etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini +0040755 0 0 /etc/neutron/plugins/plumgrid +0100644 0 0 /etc/neutron/plugins/plumgrid/plumgrid.ini +0040755 0 0 /etc/neutron/plugins/vmware +0100644 0 0 /etc/neutron/plugins/vmware/nsx.ini +0100755 0 0 /usr/share/openstack/openstack-neutron-setup +0100644 0 0 /etc/systemd/system/openstack-neutron-setup.service +0100644 0 0 /etc/systemd/system/openstack-neutron-server.service +0100644 0 0 /etc/systemd/system/openstack-neutron-metadata-agent.service +0100644 0 0 /etc/systemd/system/openstack-neutron-plugin-openvswitch-agent.service +0100644 0 0 /etc/systemd/system/openstack-neutron-ovs-cleanup.service +0100644 0 0 /etc/systemd/system/openstack-neutron-dhcp-agent.service +0100644 0 0 /etc/systemd/system/openstack-neutron-l3-agent.service +0100755 0 0 /usr/share/openstack/openvswitch-setup +0100644 0 0 /etc/systemd/system/openvswitch-setup.service +0100644 0 0 /etc/systemd/system/openvswitch-db-server.service +0100644 0 0 /etc/systemd/system/openvswitch.service +0100755 0 0 /usr/share/openstack/openstack-neutron-network-configuration-for-one-node +0100644 0 0 /etc/systemd/system/openstack-neutron-network-configuration-one-node.service +0100644 0 0 /etc/systemd/system/openvswitch-initialize-db.service +0100755 0 0 /usr/share/openstack/postgres-setup +0100644 0 0 /etc/systemd/system/postgres-setup.service +0100644 0 0 /etc/systemd/system/postgres-server.service +0100755 0 0 /usr/share/openstack/apache-httpd-server-setup +0100644 0 0 /etc/systemd/system/apache-httpd-server-setup.service +0100644 0 0 /etc/systemd/system/apache-httpd.service +0040755 0 0 /etc/horizon +0040755 0 0 /etc/horizon/openstack_dashboard +0040755 0 0 /var/lib/horizon +0100644 0 0 /etc/systemd/system/openstack-horizon-setup.service +0100755 0 0 /usr/share/openstack/openstack-horizon-setup +0100644 0 0 /etc/horizon/apache-horizon.conf +0100644 0 0 /etc/horizon/openstack_dashboard/local_settings.py +0100644 0 0 /etc/sysctl.conf +0100644 0 0 /etc/systemd/system/openvswitch-create-links-one-node.service +0100755 0 0 /usr/share/openstack/create_openvswitch_veth_pairs +0100644 0 0 /etc/hosts diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup new file mode 100755 index 00000000..4c0b3cee --- /dev/null +++ b/openstack/usr/share/openstack/apache-httpd-server-setup @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +if [ -f /var/openstack/apache-http-setup ]; then + exit 0 +fi + +############################################################################### +# Move suexec to the directory where apache is configured to have it # +# Check configure in strata/apache-httpd-server/httpd-server.morph # +############################################################################### +mkdir -p /srv/www +groupadd -r apache +useradd -c "Apache Server" -d /srv/www -g apache \ + -s /bin/false apache + +############################################################################### +# Move suexec to the directory where apache is configured to have it # +# Check configure in strata/apache-httpd-server/httpd-server.morph # +############################################################################### +mkdir -p /usr/lib/httpd +mv -v /usr/sbin/suexec /usr/lib/httpd/suexec +chgrp apache /usr/lib/httpd/suexec +chmod 4754 /usr/lib/httpd/suexec +chown -R apache:apache /srv/www + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/apache-http-setup +Apache http setup: success +EOF + +exit 0 diff --git a/openstack/usr/share/openstack/create_openvswitch_veth_pairs b/openstack/usr/share/openstack/create_openvswitch_veth_pairs new file mode 100644 index 00000000..a239ac73 --- /dev/null +++ b/openstack/usr/share/openstack/create_openvswitch_veth_pairs @@ -0,0 +1,32 @@ +#!/bin/sh +# +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -xe + +# Get the first ethernet driver and its ip +eth_dev="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $1 } ')" +eth_ip="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $2 } ')" + +# Create the veth pairs between bridges (configuration one node) +ifconfig br-eth0 $eth_ip up +ip link set br-eth0 promisc on +ip link set eth1-br-proxy up promisc on +ip link set ex-br-proxy up promisc on +ip link set proxy-br-eth1 up promisc on +ip link set proxy-br-ex up promisc on + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-cinder-setup b/openstack/usr/share/openstack/openstack-cinder-setup new file mode 100644 index 00000000..eb97d55a --- /dev/null +++ b/openstack/usr/share/openstack/openstack-cinder-setup @@ -0,0 +1,132 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +# Create required system users and groups + +getent group cinder >/dev/null || groupadd -r --gid 165 cinder +getent passwd cinder >/dev/null || \ + useradd --uid 165 -r -g cinder -d /var/lib/cinder -s /sbin/nologin \ + -c "OpenStack Cinder Daemons" cinder + +# Create the keystone user and services + +export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0' + +keystone user-create --name ##CINDER_USER## --pass ##CINDER_PASSWORD## +keystone user-role-add --tenant service --user ##CINDER_USER## --role admin + +# Register the Block Storage service with the Identity service so other OpenStack services +# can locate it +keystone service-create --name ##CINDER_USER## --type volume --description "OpenStack Block Storage" +keystone endpoint-create --service-id $(keystone service-list | awk '/ volume / {print $2}') \ + --publicurl ##CINDER_PUBLIC_URL## \ + --internalurl ##CINDER_INTERNAL_URL## \ + --adminurl ##CINDER_ADMIN_URL## + +# Register a service and endpoint for version 2 of the Block Storage service API +keystone service-create --name ##CINDER_USER_V2## \ + --type volumev2 --description "OpenStack Block Storage" +keystone endpoint-create --service-id $(keystone service-list | awk '/ volumev2 / {print $2}') \ + --publicurl ##CINDER_PUBLIC_URL_V2## \ + --internalurl ##CINDER_INTERNAL_URL_V2## \ + --adminurl ##CINDER_ADMIN_URL_V2## + +# Create run directory for cinder +if [ ! -d /var/run/cinder ]; then + mkdir -p /var/run/cinder + chown -R cinder:cinder /var/run/cinder +fi + +# Create the lock directory for cinder +if [ ! -d /var/lock/cinder ]; then + mkdir -p /var/lock/cinder + chown -R cinder:cinder /var/lock/cinder +fi + +# Create the log directory for cinder +if [ ! -d /var/log/cinder ]; then + mkdir -p /var/log/cinder + chown -R cinder:cinder /var/log/cinder +fi + +# Create the volumes directory for cinder +if [ ! -d /var/lib/cinder/volumes ]; then + mkdir -p /var/lib/cinder/volumes + chown -R cinder:cinder /var/lib/cinder/volumes +fi + +# Setup the cinder database +if ! sudo -u postgres psql -lqt | grep -q cinder; then + # Create posgreSQL user + sudo -u postgres createuser \ + --pwprompt --encrypted \ + --no-adduser --no-createdb \ + --no-password \ + ##CINDER_DB_USER## + + sudo -u postgres createdb \ + --owner=##CINDER_DB_USER## \ + cinder + + sudo -u cinder cinder-manage db sync +fi + +chown -R cinder:cinder /var/lib/cinder + +# This is only for testing purposes and we need to change it for +# something more robust to deploy in production. +# This also assumes that the user will add a second disk to its VM +# and if it does not find sdb or vda it will fail. +if [ $(ls /sys/block | grep -v sda | grep [vs]d | wc -l) -ne 1 ]; then + echo "Error: More than one or none block device found, cinder will not be able to create a VG." + exit 1 +else + device=/dev/$(ls /sys/block | grep -v sda | grep [vs]d) +fi + +# Create a physical volume +pvcreate -ff -y $device + +# Create a volume group named "cinder-volumes" +vgcreate -y cinder-volumes $device + +# Remove the one-shot setup service +rm /etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service + +# Start cinder services +systemctl start openstack-cinder-api +systemctl start openstack-cinder-scheduler +systemctl start openstack-cinder-volume +systemctl start openstack-cinder-backup + +# Create the links to run nova services when system start next times. +ln -s "/etc/systemd/system/openstack-cinder-api.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-cinder-api.service" + +ln -s "/etc/systemd/system/openstack-cinder-scheduler.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-cinder-scheduler.service" + +ln -s "/etc/systemd/system/openstack-cinder-volume.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-cinder-volume.service" + +ln -s "/etc/systemd/system/openstack-cinder-backup.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-cinder-backup.service" + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-glance-setup b/openstack/usr/share/openstack/openstack-glance-setup new file mode 100644 index 00000000..1363a7b7 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-glance-setup @@ -0,0 +1,89 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +# Create required system users and groups +getent group glance >/dev/null || groupadd -r --gid 164 glance +getent passwd glance >/dev/null || \ + useradd --uid 164 -r -g glance -d /var/lib/glance -s /sbin/nologin \ + -c "OpenStack Glance Daemons" glance + +# Create required keystone tenants, users and roles +export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0' + +keystone user-create --name ##GLANCE_SERVICE_USER## --pass ##GLANCE_SERVICE_PASSWORD## +keystone user-role-add --tenant service --user ##GLANCE_SERVICE_USER## --role admin + +keystone service-create --name glance --type image --description "OpenStack Image Service" +keystone endpoint-create --service-id $(keystone service-list | awk '/ image / {print $2}') \ + --publicurl ##GLANCE_PUBLIC_URL## \ + --internalurl ##GLANCE_INTERNAL_URL## \ + --adminurl ##GLANCE_ADMIN_URL## + +# Create run directory for glance +if [ ! -d /var/run/glance ]; then + mkdir -p /var/run/glance + chown -R glance:glance /var/run/glance +fi + +# Create the lock directory for glance +if [ ! -d /var/lock/glance ]; then + mkdir -p /var/lock/glance + chown -R glance:glance /var/lock/glance +fi + +# Create the log directory for glance +if [ ! -d /var/log/glance ]; then + mkdir -p /var/log/glance + chown -R glance:glance /var/log/glance +fi + +# Setup the glance database +if ! sudo -u postgres psql -lqt | grep -q glance; then + # Create posgreSQL user + sudo -u postgres createuser \ + --pwprompt --encrypted \ + --no-adduser --no-createdb \ + --no-password \ + ##GLANCE_DB_USER## + + sudo -u postgres createdb \ + --owner=##GLANCE_DB_USER## \ + glance + + sudo -u glance glance-manage db_sync +fi + +chown -R glance:glance /var/lib/glance + +# Remove the one-shot setup service +rm /etc/systemd/system/multi-user.target.wants/openstack-glance-setup.service + +# Start glance services +systemctl start openstack-glance-api +systemctl start openstack-glance-registry + +# Create the links to run glance services when system start next times. +ln -s "/etc/systemd/system/openstack-glance-api.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-glance-api.service" + +ln -s "/etc/systemd/system/openstack-glance-registry.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-glance-registry.service" + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup new file mode 100644 index 00000000..d10007d1 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-horizon-setup @@ -0,0 +1,63 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +if [ -f /var/openstack/horizon-setup ]; then + exit 0 +fi + +# Create required system users and groups +mkdir -p /var/lib/horizon +getent group horizon >/dev/null || groupadd -r --gid 167 horizon +getent passwd neutron >/dev/null || \ + useradd --uid 167 -r -g horizon -d /var/lib/horizon -s /sbin/nologin \ + -c "Horizon user" horizon + +# Work around to make django.wsgi working with horizon +# See: https://bugs.launchpad.net/osprofiler/+bug/1361235 +# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79 +sed -i "s|'../..'|os.path.realpath('../..')|" \ + /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi + +# And link this django.wsgi file to the horizon home directory +ln -sf /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \ + /var/lib/horizon/django.wsgi + +# Link Openstack local_settings where openstack_dashboard is installed. +ln -sf /etc/horizon/openstack_dashboard/local_settings.py \ + /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py + +# Create the static directory (STATIC_ROOT) used in local_settings.py to keep +# the static objects like css files. +mkdir -p /var/lib/horizon/openstack_dashboard/static + +# Create the horizon document root for apache configuration +mkdir -p /var/lib/horizon/openstack_dashboard/.blackhole + +# Link horizon configuration file for apache to the directory where our apache load +# configurations files +ln -sf /etc/horizon/apache-horizon.conf \ + /usr/httpd/conf.d/apache-horizon.conf + +chown -R horizon:horizon /var/lib/horizon + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/horizon-setup +Horizon setup: success +EOF + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-keystone-setup b/openstack/usr/share/openstack/openstack-keystone-setup new file mode 100644 index 00000000..9c034c5b --- /dev/null +++ b/openstack/usr/share/openstack/openstack-keystone-setup @@ -0,0 +1,92 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +# Create required system users and groups + +getent group keystone >/dev/null || groupadd -r --gid 163 keystone +getent passwd keystone >/dev/null || \ + useradd --uid 163 -r -g keystone -d /var/lib/keystone -s /sbin/nologin \ + -c "OpenStack Keystone Daemons" keystone + +# Keystone compute configuration +if [ ! -d /var/run/keystone ]; then + mkdir -p /var/run/keystone + chown -R keystone:keystone /var/run/keystone +fi + +if [ ! -d /var/lock/keystone ]; then + mkdir -p /var/lock/keystone + chown -R keystone:keystone /var/lock/keystone +fi + +if [ ! -d /var/log/keystone ]; then + mkdir -p /var/log/keystone + chown -R keystone:keystone /var/log/keystone +fi + +# Setup the keystone database +if ! sudo -u postgres psql -lqt | grep -q keystone; then + # Create posgreSQL user + sudo -u postgres createuser \ + --pwprompt --encrypted \ + --no-adduser --no-createdb \ + --no-password \ + ##KEYSTONE_DB_USER## + + sudo -u postgres createdb \ + --owner=##KEYSTONE_DB_USER## \ + keystone + + sudo -u keystone keystone-manage db_sync +fi + +chown -R keystone:keystone /var/lib/keystone + +systemctl start openstack-keystone + +export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0' + +# This script creates a TEMPORARY admin user, with a password that may +# float arount on the system. Please delete this user once you have set up +# the real admin user with a real secure password. + +keystone tenant-create --name admin --description "Admin Tenant" +keystone role-create --name admin + +keystone user-create --name temporary_admin --pass ##KEYSTONE_TEMPORARY_ADMIN_PASSWORD## +keystone user-role-add --tenant admin --user temporary_admin --role admin + +keystone tenant-create --name service --description "Service Tenant" + +# Define a service for the Identity Service +keystone service-create --name keystone --type identity --description "Openstack Identity" + +# Specify an API endpoint for the Identity Service by using the returned service ID. +keystone endpoint-create --service-id $(keystone service-list | awk '/ identity / {print $2}') \ + --publicurl ##KEYSTONE_PUBLIC_URL## \ + --internalurl ##KEYSTONE_INTERNAL_URL## \ + --adminurl ##KEYSTONE_ADMIN_URL## + +rm /etc/systemd/system/multi-user.target.wants/openstack-keystone-setup.service + +ln -s "/etc/systemd/system/openstack-keystone.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-keystone.service" + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node new file mode 100644 index 00000000..c2ccbd81 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-neutron-network-configuration-for-one-node @@ -0,0 +1,56 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -xe + +# Get the first ethernet driver and its ip +eth_dev="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $1 } ')" +eth_ip="$(ip addr | perl -pe 'if (/^\d+: ([^:]+)/) { $iface=$1; } if (m@^\s*inet ([^/]+)/@) { print "$iface $1\n"; } $_=undef;' | grep "^e" | head -1 | awk '{ print $2 } ')" + +ip link add proxy-br-eth1 type veth peer name eth1-br-proxy +ip link add proxy-br-ex type veth peer name ex-br-proxy + +if [ -f /var/openstack/openvswitch-one-node-setup ]; then + exit 0 +fi + +# Create the bridges to use the External network mapped +# This configuration is for 1 node and it was taken from: +# https://fosskb.wordpress.com/2014/10/18/openstack-juno-on-ubuntu-14-10/ +# and https://fosskb.wordpress.com/2014/06/10/managing-openstack-internaldataexternal-network-in-one-interface/ + + +ovs-vsctl add-br br-eth0 +ovs-vsctl add-port br-eth0 $eth_dev +ifconfig br-eth0 $eth_ip up +ip link set br-eth0 promisc on +ovs-vsctl add-br br-eth1 +ovs-vsctl add-br br-ex +ovs-vsctl add-port br-eth1 eth1-br-proxy +ovs-vsctl add-port br-ex ex-br-proxy +ovs-vsctl add-port br-eth0 proxy-br-eth1 +ovs-vsctl add-port br-eth0 proxy-br-ex +ip link set eth1-br-proxy up promisc on +ip link set ex-br-proxy up promisc on +ip link set proxy-br-eth1 up promisc on +ip link set proxy-br-ex up promisc on + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/openvswitch-one-node-setup +Openvswitch one node setup: success +EOF + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-neutron-setup b/openstack/usr/share/openstack/openstack-neutron-setup new file mode 100644 index 00000000..ff6496a0 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-neutron-setup @@ -0,0 +1,95 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -xe + +if [ -f /var/openstack/openstack-neutron-setup ]; then + exit 0 +fi + +# Create required system users and groups + +getent group neutron >/dev/null || groupadd -r --gid 166 neutron +getent passwd neutron >/dev/null || \ + useradd --uid 166 -r -g neutron -d /var/lib/neutron -s /sbin/nologin \ + -c "OpenStack Neutron Daemons" neutron + +chown -R neutron:neutron /var/lib/neutron + +# Create the keystone user and services +export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0' + +keystone user-create --name ##NEUTRON_SERVICE_USER## --pass ##NEUTRON_SERVICE_PASSWORD## +keystone user-role-add --tenant service --user ##NEUTRON_SERVICE_USER## --role admin + +keystone service-create --name neutron --type network --description "OpenStack Networking" +keystone endpoint-create --service-id $(keystone service-list | awk '/ network / {print $2}') \ + --publicurl ##NEUTRON_PUBLIC_URL## \ + --internalurl ##NEUTRON_INTERNAL_URL## \ + --adminurl ##NEUTRON_ADMIN_URL## \ + --region regionOne + +# neutron.conf configuration +service_tenant_id=$(keystone tenant-get service | grep id | tr -d " " | cut -d"|" -f3) +sed -i "s/##SERVICE_TENANT_ID##/$service_tenant_id/g" /etc/neutron/neutron.conf + +# Neutron compute configuration +if [ ! -d /var/run/neutron ]; then + mkdir -p /var/run/neutron + chown -R neutron:neutron /var/run/neutron +fi + +if [ ! -d /var/lock/neutron ]; then + mkdir -p /var/lock/neutron + chown -R neutron:neutron /var/lock/neutron +fi + +if [ ! -d /var/log/neutron ]; then + mkdir -p /var/log/neutron + chown -R neutron:neutron /var/log/neutron +fi + +# Setup the neutron database +if ! sudo -u postgres psql -lqt | grep -q neutron; then + # Create postgresSQL user + sudo -u postgres createuser \ + --pwprompt --encrypted \ + --no-adduser --no-createdb \ + --no-password \ + ##NEUTRON_DB_USER## + sudo -u postgres createdb \ + --owner=##NEUTRON_DB_USER## \ + neutron + # Stamp neutron database with the latest stamped version available, + # in this case "icehouse" + sudo -u neutron neutron-db-manage \ + --config-file /etc/neutron/neutron.conf \ + --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ + stamp icehouse + # Upgrade database to "juno" + sudo -u neutron neutron-db-manage \ + --config-file /etc/neutron/neutron.conf \ + --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ + upgrade juno +fi + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/openstack-neutron-setup +Openstack neutron setup: success +EOF + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-nova-setup b/openstack/usr/share/openstack/openstack-nova-setup new file mode 100644 index 00000000..7168e7c2 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-nova-setup @@ -0,0 +1,133 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +# Create required system users and groups + +getent group nova >/dev/null || groupadd -r --gid 162 nova +getent passwd nova >/dev/null || \ + useradd --uid 162 -r -g nova -d /var/lib/nova -s /sbin/nologin \ + -c "OpenStack Nova Daemons" nova + +# Create the keystone user and services + +export OS_SERVICE_TOKEN=##KEYSTONE_TEMPORARY_ADMIN_TOKEN## +export OS_SERVICE_ENDPOINT='http://onenode:35357/v2.0' + +keystone user-create --name ##NOVA_SERVICE_USER## --pass ##NOVA_SERVICE_PASSWORD## +keystone user-role-add --tenant service --user ##NOVA_SERVICE_USER## --role admin + +keystone service-create --name nova --type compute --description "OpenStack Compute Service" +keystone endpoint-create --service-id $(keystone service-list | awk '/ compute / {print $2}') \ + --publicurl ##NOVA_PUBLIC_URL## \ + --internalurl ##NOVA_INTERNAL_URL## \ + --adminurl ##NOVA_ADMIN_URL## \ + --region ##NOVA_REGION## + +# Nova compute configuration +if [ ! -d /var/run/nova ]; then + mkdir -p /var/run/nova + chown -R nova:nova /var/run/nova +fi + +if [ ! -d /var/lock/nova ]; then + mkdir -p /var/lock/nova + chown -R nova:nova /var/lock/nova +fi + +if [ ! -d /var/log/nova ]; then + mkdir -p /var/log/nova + chown -R nova:nova /var/log/nova +fi + +if [ ! -d /var/lib/nova/instances ]; then + mkdir /var/lib/nova/instances + chown -R nova:nova /var/lib/nova/instances +fi + +# Setup the nova database +if ! sudo -u postgres psql -lqt | grep -q nova; then + # Create posgreSQL user + sudo -u postgres createuser \ + --pwprompt --encrypted \ + --no-adduser --no-createdb \ + --no-password \ + ##NOVA_DB_USER## + + sudo -u postgres createdb \ + --owner=##NOVA_DB_USER## \ + nova + + sudo -u nova nova-manage db sync +fi + +# Nova novncproxy needs /usr/share/novnc folder available +if [ ! -d /usr/share/novnc ]; then + mkdir /usr/share/novnc + chown -R nova:nova /usr/share/novnc +fi + +chown -R nova:nova /var/lib/nova + +# Add nova to the libvirt group +usermod -a -G libvirt nova + +# Check existence of Network Block Device module in the kernel +# NOTE: modprobe does not work actually and returns always +# failure, enable this check when modprobe is fixed. +#modprobe nbd + +# Remove the one-shot setup service +rm /etc/systemd/system/multi-user.target.wants/openstack-nova-setup.service + +# Start nova services +systemctl start openstack-nova-compute +# [1] Never enable openstack-nova-conductor service in a node with +# openstack-nova-compute or the security benefits of removing +# database access from nova-compute will be negated +#systemctl start openstack-nova-conductor +systemctl start openstack-nova-api +systemctl start openstack-nova-cert +systemctl start openstack-nova-consoleauth +systemctl start openstack-nova-scheduler +systemctl start openstack-nova-novncproxy +#systemctl start openstack-nova-xvpnvncproxy + +# Create the links to run nova services when system start next times. +ln -s "/etc/systemd/system/openstack-nova-compute.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-compute.service" +# See description of why this shouldn't run in a openstack in one node in [1] +#ln -s "/etc/systemd/system/openstack-nova-conductor.service" \ +# "/etc/systemd/system/multi-user.target.wants/openstack-nova-conductor.service" + +ln -s "/etc/systemd/system/openstack-nova-api.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-api.service" + +ln -s "/etc/systemd/system/openstack-nova-cert.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-cert.service" + +ln -s "/etc/systemd/system/openstack-nova-consoleauth.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-consoleauth.service" + +ln -s "/etc/systemd/system/openstack-nova-scheduler.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-scheduler.service" + +ln -s "/etc/systemd/system/openstack-nova-novncproxy.service" \ + "/etc/systemd/system/multi-user.target.wants/openstack-nova-novncproxy.service" + +exit 0 diff --git a/openstack/usr/share/openstack/openstack-rabbitmq-setup b/openstack/usr/share/openstack/openstack-rabbitmq-setup new file mode 100644 index 00000000..dd491294 --- /dev/null +++ b/openstack/usr/share/openstack/openstack-rabbitmq-setup @@ -0,0 +1,66 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +# Create required system users and groups +getent group rabbitmq >/dev/null || groupadd -r --gid 1002 rabbitmq +getent passwd rabbitmq >/dev/null || \ + useradd --uid 1002 -r -g rabbitmq -d /var/lib/rabbitmq -s /sbin/nologin \ + -c "Rabbitmq server daemon" rabbitmq + +chown -R rabbitmq:rabbitmq /var/lib/rabbitmq + +# Create directories and files needed to run openstack-rabbitmq-server +if [ ! -d /var/run/rabbitmq ]; then + mkdir -p /var/run/rabbitmq + chown -R rabbitmq:rabbitmq /var/run/rabbitmq + chmod 755 /var/run/rabbitmq +fi + +if [ ! -d /var/log/rabbitmq ]; then + mkdir -p /var/log/rabbitmq + chown -R rabbitmq:rabbitmq /var/log/rabbitmq + chmod 755 /var/log/rabbitmq +fi + +# Install rabbimq.config and rabbitmq-env.conf +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/lib/rabbitmq/etc/rabbitmq/rabbitmq.config +%% -*- Rabbit configuration for Openstack in Baserock +[ + {rabbit, + [ + {default_user, <<"##RABBITMQ_USER##">>}, + {default_pass, <<"##RABBITMQ_PASSWORD##">>}, + {tcp_listeners, [##RABBITMQ_PORT##]} + ]} +]. +EOF + +install -D -m 644 /proc/self/fd/0 <<'EOF' /etc/rabbitmq/rabbitmq-env.conf +# NOTE: Install this file in /etc/rabbitmq/ because rabbitmq-server will load +# it only from this directory. + +# Configure port node where rabbitmq-server will listen from. +NODE_PORT=##RABBITMQ_PORT## +# Config file has to be in $RABBITMQ_HOME/etc/rabbitmq/rabbitmq.config +CONFIG_FILE=/var/lib/rabbitmq/etc/rabbitmq/rabbitmq +EOF + +chown -R rabbitmq:rabbitmq /var/lib/rabbitmq + +exit 0 diff --git a/openstack/usr/share/openstack/openvswitch-setup b/openstack/usr/share/openstack/openvswitch-setup new file mode 100644 index 00000000..a5db7d21 --- /dev/null +++ b/openstack/usr/share/openstack/openvswitch-setup @@ -0,0 +1,44 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +if [ -f /var/openstack/openvswitch-setup ]; then + exit 0 +fi + +# Create the openvswitch required folders +mkdir -p /usr/local/etc/openvswitch +mkdir -p /usr/local/var/run/openvswitch + +# Define openvswitch files +# Example (default values) +#openvswitch_database=/usr/local/etc/openvswitch/conf.db +#openvswitch_pidfile=/usr/local/var/run/openvswitch/ovsdb-server.pid +#openvswitch_logfile=/usr/local/var/run/openvswitch/ovsdb-server.log +openvswitch_database=/usr/local/etc/openvswitch/conf.db +openvswitch_pidfile=/usr/local/var/run/openvswitch/ovsdb-server.pid +openvswitch_logfile=/usr/local/var/run/openvswitch/ovsdb-server.log + +# Create openvswitch database +ovsdb-tool create $openvswitch_database /usr/share/openvswitch/vswitch.ovsschema + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/openvswitch-setup +Openvswitch setup: success +EOF + +exit 0 diff --git a/openstack/usr/share/openstack/postgres-setup b/openstack/usr/share/openstack/postgres-setup new file mode 100644 index 00000000..fb224fd8 --- /dev/null +++ b/openstack/usr/share/openstack/postgres-setup @@ -0,0 +1,42 @@ +#!/bin/sh +# +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +if [ -f /var/openstack/postgres-setup ]; then + exit 0 +fi + +# Create postgres directories +install -dm700 /var/lib/pgsql/data +install -dm755 /var/run/postgresql + +# Create required system users and groups +getent group postgress >/dev/null || groupadd -r -g 41 postgres +getent passwd postgres >/dev/null || \ + useradd --uid 41 -r -g postgres -d /var/lib/pgsql -s /sbin/nologin \ + -c "PostgreSQL Server" postgres + +chown -R postgres:postgres /var/lib/pgsql /var/run/postgresql + +test -d /var/lib/pgsql/data/base || sudo -u postgres pg_ctl -D /var/lib/pgsql/data initdb + +install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/postgres-setup +Postgres setup: success +EOF + +exit 0 diff --git a/openvswitch.configure b/openvswitch.configure new file mode 100644 index 00000000..be4eb6d3 --- /dev/null +++ b/openvswitch.configure @@ -0,0 +1,30 @@ +#!/bin/bash + +# Copyright (C) 2015 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +services=("openvswitch-setup.service" \ + "openvswitch-db-server.service" \ + "openvswitch-initialize-db.service" \ + "openvswitch.service") + +for service in ${services[@]}; do + ln -sf "/etc/systemd/system/$service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/$service" +done diff --git a/postgres.configure b/postgres.configure new file mode 100644 index 00000000..257cf56c --- /dev/null +++ b/postgres.configure @@ -0,0 +1,23 @@ +#!/bin/sh + +# Copyright (C) 2014 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +set -e + +ROOT="$1" + +ln -sf "/etc/systemd/system/postgres-server.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/postgres-server.service" diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph new file mode 100644 index 00000000..dd95e5a2 --- /dev/null +++ b/strata/openstack-services.morph @@ -0,0 +1,825 @@ +name: openstack-services +kind: stratum +description: Openstack clients and services +build-depends: +- morph: strata/erlang.morph +- morph: strata/django.morph +- morph: strata/xstatic.morph +- morph: strata/openstack-clients.morph +chunks: +- name: rabbitmq-codegen + morph: strata/openstack-services/rabbitmq-codegen.morph + ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32 + unpetrify-ref: rabbitmq_v3_4_1 + repo: upstream:rabbitmq-codegen + build-depends: [] +- name: rabbitmq-server + morph: strata/openstack-services/rabbitmq-server.morph + ref: 9afcf9b95d2c53f866e9a33ddce46562f8950ded + unpetrify-ref: baserock/master + repo: upstream:rabbitmq-server + build-depends: + - rabbitmq-codegen +- name: oslo-rootwrap + repo: upstream:openstack/oslo-rootwrap + ref: 62d732277de5cf663172eafe6d3a6c149a9cf814 + unpetrify-ref: master + build-depends: [] +- name: webob + repo: upstream:python-packages/webob + ref: ae0ac90f22f9e1ff351e445f92330efd89195f51 + unpetrify-ref: 1.4 + build-depends: [] +- name: greenlet + ref: 42b65a7b67dfabd180625155cd4fcd8e51917fe2 + unpetrify-ref: 0.4.5 + repo: upstream:python-packages/greenlet + build-depends: [] +- name: eventlet + ref: 8d2474197de4827a7bca9c33e71a82573b6fc721 + unpetrify-ref: v0.15.2 + repo: upstream:python-packages/eventlet + build-depends: + - greenlet +- name: py-amqp + repo: upstream:python-packages/py-amqp + ref: 875b10d1715def640042c7ff2f42c00a6c07eed1 + unpetrify-ref: 1.4.6 + build-depends: [] +- name: librabbitmq + morph: strata/openstack-services/librabbitmq.morph + repo: upstream:python-packages/librabbitmq + ref: 0087f3c6fa81d4ec4c573319ee2149a5db7018e6 + unpetrify-ref: baserock/v1.6.1 + build-depends: + - py-amqp +- name: anyjson + repo: upstream:python-packages/anyjson + ref: 016506078e94718e1fe750eb5083ab5ba07498c8 + unpetrify-ref: 0.3.3 + build-depends: [] +- name: kombu + repo: upstream:python-packages/kombu + ref: 6e68e54b3a846faa6f8b7e14a4a7ca51d1967bc2 + unpetrify-ref: v3.0.23 + build-depends: + - anyjson + - py-amqp + - librabbitmq +- name: sqlalchemy + repo: upstream:python-packages/sqlalchemy + ref: ff34c480dfd2b8b7c72339d196f5477980a5124c + unpetrify-ref: rel_0_9_8 + build-depends: [] +- name: mako + repo: upstream:python-packages/mako.git + ref: 285bc818a50ccc0f9549630f7c4f4c250585c3e7 + unpetrify-ref: rel_1_0_0 + build-depends: [] +- name: alembic + repo: upstream:python-packages/alembic + ref: 5f952f25caa688d89204d134ee867de7dbad917c + unpetrify-ref: rel_0_7_1 + build-depends: + - sqlalchemy + - mako +- name: lockfile + repo: upstream:python-packages/lockfile + ref: 777758cdf4520271370b3338b86b5c66f9b104f0 + unpetrify-ref: master + build-depends: [] +- name: dogpile-core + repo: upstream:python-packages/dogpile-core + ref: 3e6f0f86b4161b48898e656039154092426e5cc8 + unpetrify-ref: rel_0_4_1 + build-depends: [] +- name: dogpile-cache + repo: upstream:python-packages/dogpile-cache + ref: 1c753914b335b4391bc5847a87b7c52ca81c2bc6 + unpetrify-ref: rel_0_5_4 + build-depends: + - dogpile-core +- name: pyjwt + repo: upstream:python-packages/pyjwt + ref: 739efeff4c6c1fc30ab5cf5eb0ac337e8ee107d7 + unpetrify-ref: 0.2.3 + build-depends: [] +- name: creole + repo: upstream:python-packages/creole + ref: 6390231688adb5d8678a71cd33204e9bca555d4a + unpetrify-ref: v1.2.1 + build-depends: [] +- name: mock + repo: upstream:python-packages/mock + ref: 35b35f7ad239005a950f870af57b44dbdc99d66b + unpetrify-ref: master + build-depends: [] +- name: nose + repo: upstream:python-packages/nose + ref: 08d134270b035dac3310cd877bb0fe9ab678303a + unpetrify-ref: release_1.3.4 + build-depends: [] +- name: pygments + repo: upstream:python-packages/pygments + ref: f41e8c594e76855611b3b3dfca300894bd29f1c4 + unpetrify-ref: 2.0rc1 + build-depends: [] +- name: docutils + repo: upstream:python-packages/docutils + ref: 1976ba91eff979abc3e13e5d8cb68324833af6a0 + unpetrify-ref: docutils-0.12 + build-depends: [] +- name: snowballstemmer + repo: upstream:python-packages/snowballstemmer.git + ref: f0d81ce1606d685029302ea073b59d9437d12569 + unpetrify-ref: master + build-depends: [] +- name: sphinx + repo: upstream:python-packages/sphinx + ref: e76c9771bad16e68cdb7deb18b4d13de0a718c68 + unpetrify-ref: 1.3b1 + build-depends: + - pygments + - docutils + - snowballstemmer +- name: logilab-common + repo: upstream:python-packages/logilab-common.git + ref: d1d8f793af6d015d885b9ea67b5741d5a093e2f4 + unpetrify-ref: logilab-common-version-0.62.0 + build-depends: [] +- name: astroid + repo: upstream:python-packages/astroid.git + ref: 7657331baa162122890aa4327f4f441cde9f5188 + unpetrify-ref: astroid-1.2.1 + build-depends: + - logilab-common +- name: pylint + repo: upstream:python-packages/pylint + ref: 541466c31aae21c7cfbf30470f0f6a2dc0a948c3 + unpetrify-ref: pylint-1.3.1 + build-depends: + - logilab-common + - astroid +- name: python-markdown + repo: upstream:python-markdown + ref: f0c5b71acbc02af60a33d67c59558bb513b25e74 + unpetrify-ref: 2.5.1-final + build-depends: [] +- name: pystache + repo: upstream:python-packages/pystache.git + ref: 0c5e61a4ccc05bde7f6c6132b4fb6c49a3c093fd + unpetrify-ref: baserock/v0.5.4 + build-depends: [] +- name: pies + repo: upstream:python-packages/pies.git + ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c + unpetrify-ref: 2.6.1 + build-depends: [] +- name: natsort + repo: upstream:python-packages/natsort.git + ref: ce94d418c3849e891f0508b41f5bccc4ae1d4e4d + unpetrify-ref: 3.5.1 + build-depends: [] +- name: isort + repo: upstream:python-packages/isort.git + ref: 9d1b03b6e1fd2f87be1c635d6159a76a131f8155 + unpetrify-ref: 3.9.0 + build-depends: + - pies + - natsort +- name: pep8 + repo: upstream:python-packages/pep8.git + ref: 164066c4d85f212f5f4a11699b848942c678b947 + unpetrify-ref: 1.5.7 + build-depends: [] +- name: pyflakes + repo: upstream:python-packages/pyflakes.git + ref: 71b7b6776856912d50a0b9a85a8ea2a1dc7eb75c + unpetrify-ref: 0.8.1 + build-depends: [] +- name: smartypants + repo: upstream:python-packages/smartypants.git + ref: e89b6e7e119694edcd414a556c634d5ca85bff76 + unpetrify-ref: v1.8.6 + build-depends: + - isort + - pep8 + - pyflakes + - pylint +- name: pycco + repo: upstream:python-packages/pycco + ref: 22e157e525760e843dba391ca85fbe9bd35fdc5b + unpetrify-ref: master + build-depends: + - python-markdown + - pygments + - pystache + - smartypants +- name: python-decorator + repo: upstream:python-packages/python-decorator + ref: b02f7a254c3679dfac57a824e08dd02ced850636 + unpetrify-ref: decorator-3.4.0 + build-depends: [] +- name: dateutil + repo: upstream:python-packages/dateutil + ref: 8c6026ba09716a4e164f5420120bfe2ebb2d9d82 + unpetrify-ref: trunk + build-depends: [] +- name: posix-ipc-tarball + repo: upstream:python-packages/posix-ipc-tarball + ref: f3765db04b903b3671733e07cf1541a51966dd14 + unpetrify-ref: posix_ipc-0.9.8 + build-depends: [] +- name: pastedeploy + repo: upstream:python-packages/pastedeploy + ref: 5ad87be617c2cc1dd31625688172e964db2756dc + unpetrify-ref: 1.5.2 + build-depends: [] +- name: paste + repo: upstream:python-packages/paste + ref: 4c177fce89fee925f0f4fbfde00ce2e1252562c0 + unpetrify-ref: master + build-depends: [] +- name: repoze-lru + repo: upstream:python-packages/repoze-lru + ref: 29c8281dee7fe8dae8c66c7c40ce7c058ec2ab0f + unpetrify-ref: 0.6 + build-depends: [] +- name: routes + repo: upstream:python-packages/routes + ref: 8b165a52ab568f6fcaaa11cbbc7402e0360f60a3 + unpetrify-ref: v2.0 + build-depends: + - repoze-lru +- name: passlib + repo: upstream:python-packages/passlib + ref: f407312597727a08440e41bc8e31d3b3b334c66f + unpetrify-ref: 1.6.2 + build-depends: [] +- name: tempita + repo: upstream:python-packages/tempita + ref: b2b67795a009e9f825cbd855d766b78a00273f10 + unpetrify-ref: 0.5 + build-depends: [] +- name: cython + repo: upstream:cython + ref: f66e01ff743b6d010245a08b144a94e474f29967 + unpetrify-ref: 0.21.1 + build-depends: [] +- name: numpy + repo: upstream:python-packages/numpy.git + ref: ac07f6d3e45090b224a7da81708e60a762a65f76 + unpetrify-ref: baserock/v1.9.0 + build-depends: + - cython + - sphinx +- name: websockify + repo: upstream:python-packages/websockify + ref: e0863aa0c2103069961bc24e618615a0f2bb1487 + unpetrify-ref: baserock/v0.6.0 + build-depends: + - numpy +- name: python-mimeparse + repo: upstream:python-packages/python-mimeparse.git + ref: 2d600d3fc4a386af69d20fba433843b4df2b3c92 + unpetrify-ref: master + build-depends: [] +- name: httplib2 + ref: 058a1f9448d5c27c23772796f83a596caf9188e6 + unpetrify-ref: v0.9 + repo: upstream:python-packages/httplib2 + build-depends: [] +- name: extras + repo: upstream:python-packages/python-test-extras.git + ref: cdeb596f01241e9c779332e86f6edcd0c2e8e9f0 + unpetrify-ref: master + build-depends: [] +- name: testtools + repo: upstream:python-packages/testtools + ref: ee9946228ce5a03a84cf146027de0a8a9a46c4fe + unpetrify-ref: testools-1.1.0 + build-depends: + - extras + - python-mimeparse +- name: fixtures + repo: upstream:python-packages/fixtures + ref: 9f9d89ce718463b24cd3910b9a99efb60b3c9e1b + unpetrify-ref: 0.3.16 + build-depends: + - testtools +- name: subunit + morph: strata/openstack-services/subunit.morph + repo: upstream:python-packages/subunit + ref: e18ffe65a3229d5c1d91be988405d40219db0887 + unpetrify-ref: 0.0.21 + build-depends: + - extras + - testtools +- name: testrepository + repo: upstream:python-packages/testrepository + ref: 6419a3dcaabaf09eaf438c6d8d85c90eba7a2b91 + unpetrify-ref: 0.0.19 + build-depends: + - fixtures + - subunit + - testtools +- name: suds + repo: upstream:python-packages/suds + ref: badd30a87f676d632d7386b05401e6029a5df83c + unpetrify-ref: release-0.3.2 + build-depends: [] +- name: testscenarios + repo: upstream:python-packages/testscenarios + ref: 475857af19a8190c9c0c7f8241b9907b942e19fd + unpetrify-ref: trunk + build-depends: [] +- name: mox + repo: upstream:python-packages/mox + ref: 160491d0384285698d726b1af21277f336107f51 + unpetrify-ref: master + build-depends: [] +- name: jsonrpclib + repo: upstream:python-packages/jsonrpclib + ref: 53c8ffcfe4dd1718086cc551dce8ac459e8abc67 + unpetrify-ref: master + build-depends: [] +- name: rtslib-fb + repo: upstream:python-packages/rtslib-fb + ref: a020fbadfe530bc0773b73501c2cee420c435f87 + unpetrify-ref: v2.1.fb50 + build-depends: [] +- name: netifaces + repo: upstream:python-packages/netifaces + ref: 885b200ba717df87f6e8044ec8c66c677c949bcb + unpetrify-ref: release_0_10_4 + build-depends: [] +- name: networkx + repo: upstream:python-packages/networkx + ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c + unpetrify-ref: v1.9.1 + build-depends: + - python-decorator +- name: dnspython + repo: upstream:python-packages/dnspython + ref: e1369c62d14f82b80ef11197a490ace5d43bb3f3 + unpetrify-ref: v1.12.0 + build-depends: [] +- name: pexpect + repo: upstream:python-packages/pexpect + ref: 671417beb41c21f772687c565196fdde444b053b + unpetrify-ref: 3.3 + build-depends: [] +- name: ply + repo: upstream:python-packages/ply.git + ref: 6513f3537d80f483ec9c7e36d52e87f107a57f23 + unpetrify-ref: master + build-depends: [] +- name: jsonpath-rw + repo: upstream:python-packages/jsonpath-rw + ref: f4cfe56b8e8370116c5275ddcea970e9a68fd75d + unpetrify-ref: 1.2.3 + build-depends: + - ply + - python-decorator +- name: waitress + repo: upstream:python-packages/waitress.git + ref: b795d573a5a9e6e39b46a6e82da367a6a5db8dbd + unpetrify-ref: 0.8.9 + build-depends: [] +- name: beautifulsoup4 + repo: upstream:python-packages/beautifulsoup4.git + ref: bcd7af0e9159d97aa511fb2d879424d1c1c5aadf + unpetrify-ref: trunk + build-depends: [] +- name: webtest + repo: upstream:python-packages/webtest.git + ref: 6a24fba456d1c4ac2609b90f1fdc377c595608a4 + unpetrify-ref: 2.0.16 + build-depends: + - webob + - waitress + - beautifulsoup4 +- name: logutils + repo: upstream:python-packages/logutils.git + ref: 095f14efbaaf838b7772bffd36a466abb9668efe + unpetrify-ref: 0.3.3 + build-depends: [] +- name: pecan + repo: upstream:python-packages/pecan + ref: c7f241fd6bb8a0b10e02b8b43aaf1810c312cfbf + unpetrify-ref: 0.8.0 + build-depends: + - webob + - mako + - webtest + - logutils +- name: croniter + repo: upstream:python-packages/croniter + ref: 0c3aeac05791cb4ece9e30da29442e9cd5b22f36 + unpetrify-ref: 0.3.5 + build-depends: + - dateutil +- name: msgpack-python + repo: upstream:python-packages/msgpack-python + ref: 61bac2f586e82313a0e618093bfed2435cd18983 + unpetrify-ref: 0.4.2 + build-depends: [] +- name: qpid-python + morph: strata/openstack-services/qpid-python.morph + repo: upstream:python-packages/qpid-python + ref: 587b0febaf1996db1e483137ed6addb45580ee9e + unpetrify-ref: 0.30 + build-depends: [] +- name: simplegeneric-tarball + repo: upstream:python-packages/simplegeneric-tarball + ref: 601fab9b154c557dfd848d531a8969f4697d1aa2 + unpetrify-ref: simplegeneric_0.8.1.orig + build-depends: [] +- name: ipaddr-py + morph: strata/openstack-services/ipaddr-py.morph + ref: c813f4790d1092b1515ee18fe8270180ed3cc5cb + unpetrify-ref: master + repo: upstream:python-packages/ipaddr-py + build-depends: [] +- name: wsme + repo: upstream:python-packages/wsme + ref: 99d7668789cc6252398222549599d1363cddb081 + unpetrify-ref: 0.6.1 + build-depends: + - ipaddr-py + - simplegeneric-tarball + - webob +- name: pysnmp + repo: upstream:python-packages/pysnmp + ref: 1b377afeaf9ee96ab1d48aeebb2b7a6d65a4ac9d + unpetrify-ref: release_4_2_5_tag + build-depends: [] +- name: thrift + morph: strata/openstack-services/thrift.morph + repo: upstream:thrift + ref: 591e20f9636c37527a70dc03598218c3468a0eff + unpetrify-ref: 0.9.2 + build-depends: [] +- name: retrying + repo: upstream:python-packages/retrying + ref: cab083eb5791615fadbc0c98ad77a70d64b77d0d + unpetrify-ref: v1.3.1 + build-depends: [] +- name: boto + repo: upstream:boto + ref: 2517f660f8ef9012708d46da3a36ab967993d2f6 + unpetrify-ref: 2.33.0 + build-depends: [] +- name: oslo-messaging + repo: upstream:openstack/oslo-messaging + ref: 6ea3b12492e86f9e8d109fc3490cc4d3a0edd8b6 + unpetrify-ref: 1.4.0.0a5 + build-depends: + - eventlet + - kombu +- name: oslo-vmware + repo: upstream:openstack/oslo-vmware + ref: 047d62c4bbd01a951f77a1a4a75fb2b3d8ce23ee + unpetrify-ref: 0.6.0 + build-depends: + - suds + - eventlet +- name: taskflow + repo: upstream:openstack/taskflow + ref: 1caaecc5d6b2aa4cde4a50e31d1d993fce7a66c4 + unpetrify-ref: 0.5.0 + build-depends: + - networkx +- name: sqlalchemy-migrate + repo: upstream:python-packages/sqlalchemy-migrate + ref: 089663761cc15f8b3cdb874b6a76270ccdd0a412 + unpetrify-ref: 0.9.1 + build-depends: + - sqlalchemy + - python-decorator + - tempita +- name: oauthlib + repo: upstream:python-packages/oauthlib + ref: de773eefcb3c1afe54a0c12d5bf9bd214ceaf404 + unpetrify-ref: 0.6.3 + build-depends: + - docutils + - creole + - pycco + - mock + - nose + - sphinx + - pyjwt +- name: happybase + repo: upstream:python-packages/happybase + ref: 90a4b7ef741f0ecfe5145693f64c6f7180b9ba3d + unpetrify-ref: 0.8 + build-depends: + - thrift +- name: osprofiler + repo: upstream:python-packages/osprofiler + ref: bbe39b517263017c9db56ae1d904d08846eacff7 + unpetrify-ref: 0.3.0 + build-depends: + - webob +- name: oslotest + repo: upstream:openstack/oslotest + ref: cfdb562a6e07728570ca624a8c4faf3f5b61423b + unpetrify-ref: 1.2.0 + build-depends: + - fixtures + - subunit + - testrepository + - testscenarios + - testtools + - mock + - mox +- name: pycadf + repo: upstream:python-packages/pycadf + ref: 52727bcea3a98e72331e748ce5f9e3a111a64cd1 + unpetrify-ref: 0.6.0 + build-depends: + - oslo-messaging + - posix-ipc-tarball + - webob +- name: xattr + morph: strata/openstack-services/xattr.morph + repo: upstream:python-packages/xattr + ref: dd10d44e3eb9a1d2303c1f7d5126c099d56e97fc + unpetrify-ref: v0.7.6 + build-depends: [] +- name: keystonemiddleware + repo: upstream:openstack/keystonemiddleware + ref: a7beb50b38be5c3dd4c44d68ad79d1bb206dab6b + unpetrify-ref: 1.2.0 + build-depends: + - webob +- name: oslo-db + repo: upstream:openstack/oslo-db + ref: 0bb1e236daae53a3f5b4b88761d7b19f7961ed6c + unpetrify-ref: 1.0.2 + build-depends: + - alembic + - sqlalchemy + - sqlalchemy-migrate +- name: glance_store + repo: upstream:openstack/glance_store.git + ref: 54f673d4133c1244e2555e7ceb3344c104a74154 + unpetrify-ref: 0.1.8 + build-depends: + - eventlet +- name: glance + repo: upstream:openstack/glance + ref: 055adff1d95dca72074da898b541cb4a6b62406d + unpetrify-ref: 2014.2.1 + build-depends: + - greenlet + - sqlalchemy + - anyjson + - eventlet + - pastedeploy + - routes + - webob + - boto + - sqlalchemy-migrate + - httplib2 + - kombu + - keystonemiddleware + - wsme + - oslo-vmware + - paste + - oslo-db + - oslo-messaging + - retrying + - osprofiler + - glance_store +- name: sqlparse + repo: upstream:python-packages/sqlparse + ref: 991e7348075accae6d08025212251af21e92e664 + unpetrify-ref: 0.1.13 + build-depends: [] +- name: keystone + repo: upstream:openstack/keystone + ref: 615f79bb97883eee76923527cea13c2f72baa7ff + unpetrify-ref: 2014.2.1 + build-depends: + - webob + - eventlet + - greenlet + - pastedeploy + - paste + - routes + - sqlalchemy + - sqlalchemy-migrate + - passlib + - keystonemiddleware + - oslo-messaging + - oslo-db + - oauthlib + - dogpile-cache + - pycadf + - posix-ipc-tarball + - sqlparse +- name: neutron + repo: upstream:openstack/neutron + ref: dfa4b4b9b6b19a627cfb5eb5c6ab9db4961a06ea + unpetrify-ref: 2014.2.1 + build-depends: + - paste + - pastedeploy + - routes + - anyjson + - eventlet + - greenlet + - httplib2 + - jsonrpclib + - keystonemiddleware + - sqlalchemy + - webob + - alembic + - oslo-db + - oslo-messaging + - oslo-rootwrap +- name: swift + repo: upstream:openstack/swift + ref: 2e8261a4dc0d0af0c4a46478b81e167bcf02220b + unpetrify-ref: 2.2.0 + build-depends: + - dnspython + - eventlet + - greenlet + - netifaces + - pastedeploy + - xattr +- name: trove + repo: upstream:openstack/trove + ref: a4c38cc6ddbfba2301766eced939229cccc31953 + unpetrify-ref: 2014.2 + build-depends: + - sqlalchemy + - eventlet + - keystonemiddleware + - kombu + - routes + - webob + - pastedeploy + - paste + - sqlalchemy-migrate + - netifaces + - httplib2 + - passlib + - pexpect +- name: wsgiref + repo: upstream:python-packages/wsgiref.git + ref: e8360785eef259394e13b2062407edc3c2cbc1e0 + unpetrify-ref: baserock/master + build-depends: [] +- name: rfc3986 + repo: upstream:python-packages/python-rfc3986.git + ref: 9817ec3e47bca8fba9a7cac56d785e9d644f7473 + unpetrify-ref: rfc3986-0.2.0 + build-depends: [] +- name: nova + repo: upstream:openstack/nova + ref: ba25e9ea6d0d42dd3b78cc6440710fd9362ae1b5 + unpetrify-ref: 2014.2.1 + build-depends: + - sqlalchemy + - anyjson + - boto + - python-decorator + - eventlet + - keystonemiddleware + - kombu + - routes + - webob + - greenlet + - pastedeploy + - paste + - sqlalchemy-migrate + - suds + - posix-ipc-tarball + - websockify + - wsgiref + - oslo-db + - oslo-rootwrap + - pycadf + - oslo-messaging + - lockfile + - rfc3986 + - oslo-vmware +- name: cinder + repo: upstream:openstack/cinder + ref: b48aee211ad9b2571c8554dd162b37b8a8d80a42 + unpetrify-ref: 2014.2.1 + build-depends: + - anyjson + - eventlet + - greenlet + - keystonemiddleware + - kombu + - oslo-db + - oslo-messaging + - oslo-rootwrap + - osprofiler + - paste + - pastedeploy + - routes + - taskflow + - rtslib-fb + - sqlalchemy + - sqlalchemy-migrate + - suds + - webob + - wsgiref +- name: kazoo + repo: upstream:python-packages/kazoo.git + ref: 93a718ea4c20df797766742c3d74de281613c651 + unpretrify-ref: 2.0 + build-depends: [] +- name: pymemcache + repo: upstream:python-packages/pymemcache.git + ref: 3824d3b0bcdea3e8d0c08598bedfce10fd3c79e0 + unpetrify-ref: master + build-depends: + - nose +- name: zake + repo: upstream:python-packages/zake.git + ref: 13b92d9db4ad37d9550ef5c5abd323a2530a1e72 + unpetrify-ref: master + build-depends: + - kazoo + - testtools +- name: sysv_ipc-tarball + repo: upstream:python-packages/sysv-ipc-tarball.git + ref: a77e3a63f004e6ee789fa05e4a5bbc333b1529f1 + unpetrify-ref: sysv_ipc-0.6.8 + build-depends: [] +- name: tooz + repo: upstream:python-packages/tooz.git + ref: a90940a506b7c1bf52ef7d2f2ff52204fdcc6221 + unpetrify-ref: 0.7 + build-depends: + - kazoo + - pymemcache + - zake + - sysv_ipc-tarball + - msgpack-python + - retrying +- name: ceilometer + repo: upstream:openstack/ceilometer + ref: 94579bfc81b820380d03703e4e2311b3bd25c022 + unpetrify-ref: 2014.2 + build-depends: + - alembic + - anyjson + - croniter + - eventlet + - happybase + - jsonpath-rw + - keystonemiddleware + - lockfile + - msgpack-python + - oslo-db + - oslo-rootwrap + - oslo-vmware + - pastedeploy + - pecan + - posix-ipc-tarball + - oslo-messaging + - pysnmp + - sqlalchemy + - sqlalchemy-migrate + - tooz + - webob + - wsme +- name: heat + repo: upstream:openstack/heat + ref: c06772571a81383aa37336a78d72d455067b75e8 + unpetrify-ref: 2014.2 + build-depends: + - eventlet + - greenlet + - httplib2 + - keystonemiddleware + - kombu + - oslo-db + - oslo-messaging + - pastedeploy + - posix-ipc-tarball + - qpid-python + - routes + - sqlalchemy + - sqlalchemy-migrate + - webob +- name: django-openstack-auth + repo: upstream:openstack/django_openstack_auth + ref: e676c88a329af57d6c4f13df54f6e1e06c1f8360 + unpetrify-ref: 1.1.8 + build-depends: [] +- name: horizon + repo: upstream:openstack/horizon + ref: 3d9a31e2a05288e9a48a51eb4fe693c42e92aac7 + unpetrify-ref: 2014.2.1 + build-depends: + - django-openstack-auth diff --git a/strata/openstack-services/ipaddr-py.morph b/strata/openstack-services/ipaddr-py.morph new file mode 100644 index 00000000..f6691ab7 --- /dev/null +++ b/strata/openstack-services/ipaddr-py.morph @@ -0,0 +1,6 @@ +name: ipaddr-py +kind: chunk +build-commands: +- cd trunk && python setup.py build +install-commands: +- cd trunk && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-services/librabbitmq.morph b/strata/openstack-services/librabbitmq.morph new file mode 100644 index 00000000..b87ce369 --- /dev/null +++ b/strata/openstack-services/librabbitmq.morph @@ -0,0 +1,10 @@ +name: librabbitmq +kind: chunk +build-system: python-distutils +configure-commands: +- (cd rabbitmq-c; rm -rf codegen; ln -sf ../rabbitmq-codegen ./codegen) +- (cd rabbitmq-c; autoreconf -fvi) +- (cd rabbitmq-c; automake --add-missing) +- (cd rabbitmq-c; ./configure --disable-tools --disable-docs) +- (cd rabbitmq-c; make distdir) +- mv rabbitmq-c/rabbitmq-c-0.5.3 clib diff --git a/strata/openstack-services/pies.morph b/strata/openstack-services/pies.morph new file mode 100644 index 00000000..327c1dc9 --- /dev/null +++ b/strata/openstack-services/pies.morph @@ -0,0 +1,11 @@ +name: pies +kind: chunk +configure-commands: +- | + cd pies2override + && python setup.py build + && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-services/pycrypto.morph b/strata/openstack-services/pycrypto.morph new file mode 100644 index 00000000..51cc00f0 --- /dev/null +++ b/strata/openstack-services/pycrypto.morph @@ -0,0 +1,3 @@ +name: pycrypto +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-services/qpid-python.morph b/strata/openstack-services/qpid-python.morph new file mode 100644 index 00000000..203b3db5 --- /dev/null +++ b/strata/openstack-services/qpid-python.morph @@ -0,0 +1,6 @@ +name: qpid-python +kind: chunk +build-commands: +- cd qpid/python && python setup.py build +install-commands: +- cd qpid/python && python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/strata/openstack-services/rabbitmq-codegen.morph b/strata/openstack-services/rabbitmq-codegen.morph new file mode 100644 index 00000000..2b06aeb5 --- /dev/null +++ b/strata/openstack-services/rabbitmq-codegen.morph @@ -0,0 +1,7 @@ +name: rabbitmq-codegen +kind: chunk +configure-commands: [] +build-commands: [] +install-commands: +- mkdir -p "$DESTDIR$PREFIX"/lib/rabbitmq-codegen +- cp * "$DESTDIR$PREFIX"/lib/rabbitmq-codegen diff --git a/strata/openstack-services/rabbitmq-server.morph b/strata/openstack-services/rabbitmq-server.morph new file mode 100644 index 00000000..0c2d9b3b --- /dev/null +++ b/strata/openstack-services/rabbitmq-server.morph @@ -0,0 +1,9 @@ +name: rabbitmq-server +kind: chunk +configure-commands: +- mkdir -p codegen +- cp /usr/lib/rabbitmq-codegen/* codegen +build-commands: +- make +install-commands: +- make install_bin TARGET_DIR="$DESTDIR$PREFIX" SBIN_DIR="$DESTDIR$PREFIX"/sbin MAN_DIR="$PREFIX"/share/man DOC_INSTALL_DIR="$PREFIX"/share diff --git a/strata/openstack-services/subunit.morph b/strata/openstack-services/subunit.morph new file mode 100644 index 00000000..a93decc1 --- /dev/null +++ b/strata/openstack-services/subunit.morph @@ -0,0 +1,3 @@ +name: python-subunit +kind: chunk +build-system: python-distutils diff --git a/strata/openstack-services/thrift.morph b/strata/openstack-services/thrift.morph new file mode 100644 index 00000000..321e06d6 --- /dev/null +++ b/strata/openstack-services/thrift.morph @@ -0,0 +1,9 @@ +{ + "name": "thrift", + "kind": "chunk", + "build-system": "autotools", + "configure-commands": [ + "./bootstrap.sh", + "./configure --prefix=\"$PREFIX\" --without-erlang" + ] +} diff --git a/strata/openstack-services/xattr.morph b/strata/openstack-services/xattr.morph new file mode 100644 index 00000000..65f47dae --- /dev/null +++ b/strata/openstack-services/xattr.morph @@ -0,0 +1,8 @@ +name: xattr +kind: chunk +configure-commands: +- cp -r /usr/lib/python2.7/site-packages/cffi . +build-commands: +- python setup.py build +install-commands: +- python setup.py install --prefix "$PREFIX" --root "$DESTDIR" diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph new file mode 100644 index 00000000..f20e9a15 --- /dev/null +++ b/systems/openstack-server.morph @@ -0,0 +1,67 @@ +name: openstack-system-x86_64 +kind: system +description: Openstack system in baserock for the x86_64 architecture +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: python-core + morph: strata/python-core.morph +- name: python-common + morph: strata/python-common.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-x86_64-openstack + morph: strata/bsp-x86_64-openstack.morph +- name: coreutils-common + morph: strata/coreutils-common.morph +- name: devtools + morph: strata/devtools.morph +- name: tools + morph: strata/tools.morph +- name: cloudinit-support + morph: strata/cloudinit-support.morph +- name: lvm + morph: strata/lvm.morph +- name: virtualization + morph: strata/virtualization.morph +- name: connectivity + morph: strata/connectivity.morph +- name: networking-utils + morph: strata/networking-utils.morph +- name: databases + morph: strata/databases.morph +- name: erlang + morph: strata/erlang.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +- name: apache-httpd-server + morph: strata/apache-httpd-server.morph +- name: django + morph: strata/django.morph +- name: xstatic + morph: strata/xstatic.morph +- name: openstack-common + morph: strata/openstack-common.morph +- name: openstack-clients + morph: strata/openstack-clients.morph +- name: openstack-services + morph: strata/openstack-services.morph +configuration-extensions: +- set-hostname +- add-config-files +- simple-network +- nfsboot +- install-files +- cloud-init +- openstack-keystone +- openstack-glance +- openstack-nova +- openstack-rabbitmq +- openstack-cinder +- openstack-neutron +- openvswitch +- postgres +- apache-httpd-server -- cgit v1.2.1 From b415f8316e1acdf0212d7f7af0a1df60a61ed14e Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 16 Feb 2015 12:50:57 +0000 Subject: Add nfs to openstack-server system --- systems/openstack-server.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index f20e9a15..775aaaef 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -31,6 +31,8 @@ strata: morph: strata/connectivity.morph - name: networking-utils morph: strata/networking-utils.morph +- name: nfs.morph + morph: strata/nfs.morph - name: databases morph: strata/databases.morph - name: erlang -- cgit v1.2.1 From fd3bbd2ec2f13692598e5e8a2ef8960b80b09b64 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 16 Feb 2015 16:13:27 +0000 Subject: Install rootwrap filters on post-install time Installing rootwrap filters from their repositories will make easy to deal with updates. Also move neutron rootwrap filters to the right location without duplication. --- openstack/manifest | 24 ------------------------ strata/openstack-services.morph | 3 +++ strata/openstack-services/cinder.morph | 9 +++++++++ strata/openstack-services/neutron.morph | 8 ++++++++ strata/openstack-services/nova.morph | 9 +++++++++ 5 files changed, 29 insertions(+), 24 deletions(-) create mode 100644 strata/openstack-services/cinder.morph create mode 100644 strata/openstack-services/neutron.morph create mode 100644 strata/openstack-services/nova.morph diff --git a/openstack/manifest b/openstack/manifest index a1badde4..b19142b5 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -34,18 +34,11 @@ 0040755 0 0 /var/lib/nova 0040755 0 0 /etc/nova 0100644 0 0 /etc/nova/logging.conf -0100644 0 0 /etc/nova/rootwrap.conf 0100644 0 0 /etc/nova/nova.conf 0100644 0 0 /etc/nova/nova-compute.conf 0100644 0 0 /etc/nova/policy.json 0100644 0 0 /etc/nova/cells.json 0100644 0 0 /etc/nova/api-paste.ini -0040755 0 0 /etc/nova/rootwrap.d/ -0100644 0 0 /etc/nova/rootwrap.d/api-metadata.filters -0100644 0 0 /etc/nova/rootwrap.d/baremetal-compute-ipmi.filters -0100644 0 0 /etc/nova/rootwrap.d/baremetal-deploy-helper.filters -0100644 0 0 /etc/nova/rootwrap.d/compute.filters -0100644 0 0 /etc/nova/rootwrap.d/network.filters 0100755 0 0 /usr/share/openstack/openstack-nova-setup 0100644 0 0 /etc/systemd/system/openstack-nova-setup.service 0100644 0 0 /etc/systemd/system/openstack-nova-compute.service @@ -61,7 +54,6 @@ 0040755 0 0 /var/lib/rabbitmq 0040755 0 0 /var/lib/cinder 0040755 0 0 /etc/cinder -0100644 0 0 /etc/cinder/rootwrap.conf 0100644 0 0 /etc/cinder/cinder.conf 0100644 0 0 /etc/cinder/api-paste.ini 0100644 0 0 /etc/cinder/policy.json @@ -71,11 +63,8 @@ 0100644 0 0 /etc/systemd/system/openstack-cinder-scheduler.service 0100644 0 0 /etc/systemd/system/openstack-cinder-volume.service 0100644 0 0 /etc/systemd/system/openstack-cinder-backup.service -0040755 0 0 /etc/cinder/rootwrap.d/ -0100644 0 0 /etc/cinder/rootwrap.d/volume.filters 0040755 0 0 /etc/neutron 0040755 0 0 /var/lib/neutron -0100644 0 0 /etc/neutron/rootwrap.conf 0100644 0 0 /etc/neutron/neutron.conf 0100644 0 0 /etc/neutron/api-paste.ini 0100644 0 0 /etc/neutron/policy.json @@ -86,19 +75,6 @@ 0100644 0 0 /etc/neutron/fwaas_driver.ini 0100644 0 0 /etc/neutron/metering_agent.ini 0100644 0 0 /etc/neutron/vpn_agent.ini -0040755 0 0 /etc/neutron/rootwrap.d/ -0100644 0 0 /etc/neutron/rootwrap.d/cisco-apic.filters -0100644 0 0 /etc/neutron/rootwrap.d/debug.filters -0100644 0 0 /etc/neutron/rootwrap.d/dhcp.filters -0100644 0 0 /etc/neutron/rootwrap.d/ipset-firewall.filters -0100644 0 0 /etc/neutron/rootwrap.d/iptables-firewall.filters -0100644 0 0 /etc/neutron/rootwrap.d/l3.filters -0100644 0 0 /etc/neutron/rootwrap.d/lbaas-haproxy.filters -0100644 0 0 /etc/neutron/rootwrap.d/linuxbridge-plugin.filters -0100644 0 0 /etc/neutron/rootwrap.d/nec-plugin.filters -0100644 0 0 /etc/neutron/rootwrap.d/ofagent.filters -0100644 0 0 /etc/neutron/rootwrap.d/openvswitch-plugin.filters -0100644 0 0 /etc/neutron/rootwrap.d/vpnaas.filters 0040755 0 0 /etc/neutron/plugins/ 0040755 0 0 /etc/neutron/plugins/bigswitch 0100644 0 0 /etc/neutron/plugins/bigswitch/restproxy.ini diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index dd95e5a2..89829944 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -621,6 +621,7 @@ chunks: - posix-ipc-tarball - sqlparse - name: neutron + morph: strata/openstack-services/neutron.morph repo: upstream:openstack/neutron ref: dfa4b4b9b6b19a627cfb5eb5c6ab9db4961a06ea unpetrify-ref: 2014.2.1 @@ -680,6 +681,7 @@ chunks: unpetrify-ref: rfc3986-0.2.0 build-depends: [] - name: nova + morph: strata/openstack-services/nova.morph repo: upstream:openstack/nova ref: ba25e9ea6d0d42dd3b78cc6440710fd9362ae1b5 unpetrify-ref: 2014.2.1 @@ -709,6 +711,7 @@ chunks: - rfc3986 - oslo-vmware - name: cinder + morph: strata/openstack-services/cinder.morph repo: upstream:openstack/cinder ref: b48aee211ad9b2571c8554dd162b37b8a8d80a42 unpetrify-ref: 2014.2.1 diff --git a/strata/openstack-services/cinder.morph b/strata/openstack-services/cinder.morph new file mode 100644 index 00000000..bfc31026 --- /dev/null +++ b/strata/openstack-services/cinder.morph @@ -0,0 +1,9 @@ +name: cinder +kind: chunk +build-system: python-distutils +post-install-commands: +# Install rootwrap.conf +- install -D -m 640 etc/cinder/rootwrap.conf "$DESTDIR"/etc/cinder/rootwrap.conf +# Move rootwrap files to a proper location +- mkdir -p "$DESTDIR"/etc/cinder/rootwrap.d +- install -D -m 644 etc/cinder/rootwrap.d/* "$DESTDIR"/etc/cinder/rootwrap.d/ diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph new file mode 100644 index 00000000..1de5678b --- /dev/null +++ b/strata/openstack-services/neutron.morph @@ -0,0 +1,8 @@ +name: neutron +kind: chunk +build-system: python-distutils +post-install-commands: +# Move rootwrap files to a proper location +- mkdir -p "$DESTDIR"/etc/neutron +- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.d "$DESTDIR"/etc/neutron/ +- mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.conf "$DESTDIR"/etc/neutron/ diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph new file mode 100644 index 00000000..4bf15bc7 --- /dev/null +++ b/strata/openstack-services/nova.morph @@ -0,0 +1,9 @@ +name: nova +kind: chunk +build-system: python-distutils +post-install-commands: +# Install rootwrap.conf +- install -D -m 640 etc/nova/rootwrap.conf "$DESTDIR"/etc/nova/rootwrap.conf +# Move rootwrap files to a proper location +- mkdir -p "$DESTDIR"/etc/nova/rootwrap.d +- install -D -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/ -- cgit v1.2.1 From 59bd33fc3b9fab49a23a97486cd833c9fa1dcb0b Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 16 Feb 2015 17:34:52 +0000 Subject: Add sudoers files for cinder, nova and neutron on post-install time --- openstack-cinder.configure | 8 -------- openstack-neutron.configure | 8 -------- openstack-nova.configure | 8 -------- strata/openstack-services/cinder.morph | 7 +++++++ strata/openstack-services/neutron.morph | 7 +++++++ strata/openstack-services/nova.morph | 7 +++++++ 6 files changed, 21 insertions(+), 24 deletions(-) diff --git a/openstack-cinder.configure b/openstack-cinder.configure index 335ff512..a32ee3be 100644 --- a/openstack-cinder.configure +++ b/openstack-cinder.configure @@ -45,11 +45,3 @@ sed -f "$ROOT"/etc/openstack-cinder-setup.sed -i \ ln -sf "/etc/systemd/system/openstack-cinder-setup.service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-cinder-setup.service" - -########################################################################## -# Add cinder to sudoers controlling which commands is running as a root -# using the openstack rootwrap. -########################################################################## -install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/cinder-rootwrap -cinder ALL=(root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * -EOF diff --git a/openstack-neutron.configure b/openstack-neutron.configure index 5f5754a9..71b29713 100644 --- a/openstack-neutron.configure +++ b/openstack-neutron.configure @@ -57,11 +57,3 @@ for service in ${services[@]}; do ln -sf "/etc/systemd/system/$service" \ "$ROOT/etc/systemd/system/multi-user.target.wants/$service" done - -########################################################################## -# Add neutron to sudoers controlling which commands is running as a root # -# using the openstack rootwrap. # -########################################################################## -install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/neutron-rootwrap -neutron ALL=(root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * -EOF diff --git a/openstack-nova.configure b/openstack-nova.configure index efa6eb11..4655342c 100644 --- a/openstack-nova.configure +++ b/openstack-nova.configure @@ -64,11 +64,3 @@ ln -sf ../libvirt-guests.service "$wants_dir/libvirt-guests.service" sed -i "s/192\.168\.122\./192\.168\.1\./g" \ "$ROOT"/etc/libvirt/qemu/networks/default.xml - -########################################################################## -# Add nova to sudoers controlling which commands is running as a root -# using the openstack rootwrap. -########################################################################## -install -D -m 0440 /proc/self/fd/0 <<'EOF' "$ROOT"/etc/sudoers.d/nova-rootwrap -nova ALL=(root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * -EOF diff --git a/strata/openstack-services/cinder.morph b/strata/openstack-services/cinder.morph index bfc31026..eafc7cea 100644 --- a/strata/openstack-services/cinder.morph +++ b/strata/openstack-services/cinder.morph @@ -7,3 +7,10 @@ post-install-commands: # Move rootwrap files to a proper location - mkdir -p "$DESTDIR"/etc/cinder/rootwrap.d - install -D -m 644 etc/cinder/rootwrap.d/* "$DESTDIR"/etc/cinder/rootwrap.d/ +# Add cinder to sudoers controlling which commands will run as a root +# using the openstack rootwrap. +- mkdir -p "$DESTDIR"/etc/sudoers.d +- | + install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/cinder-rootwrap + cinder ALL=(root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * + EOF diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph index 1de5678b..d6d08997 100644 --- a/strata/openstack-services/neutron.morph +++ b/strata/openstack-services/neutron.morph @@ -6,3 +6,10 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/neutron - mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.d "$DESTDIR"/etc/neutron/ - mv "$DESTDIR$PREFIX"/etc/neutron/rootwrap.conf "$DESTDIR"/etc/neutron/ +# Add neutron to sudoers controlling which commands is running as a root +# using the openstack rootwrap. +- mkdir -p "$DESTDIR"/etc/sudoers.d +- | + install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/neutron-rootwrap + neutron ALL=(root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * + EOF diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph index 4bf15bc7..98ac9854 100644 --- a/strata/openstack-services/nova.morph +++ b/strata/openstack-services/nova.morph @@ -7,3 +7,10 @@ post-install-commands: # Move rootwrap files to a proper location - mkdir -p "$DESTDIR"/etc/nova/rootwrap.d - install -D -m 644 etc/nova/rootwrap.d/* "$DESTDIR"/etc/nova/rootwrap.d/ +# Add nova to sudoers controlling which commands will run as a root +# using the openstack rootwrap. +- mkdir -p "$DESTDIR"/etc/sudoers.d +- | + install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/nova-rootwrap + nova ALL=(root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * + EOF -- cgit v1.2.1 From ec8e6228f8a916d47de2035a9bea4173e13b3a42 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 16 Feb 2015 17:35:34 +0000 Subject: Fix .blackhole location for Horizon --- openstack/usr/share/openstack/openstack-horizon-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup index d10007d1..43652322 100644 --- a/openstack/usr/share/openstack/openstack-horizon-setup +++ b/openstack/usr/share/openstack/openstack-horizon-setup @@ -47,7 +47,7 @@ ln -sf /etc/horizon/openstack_dashboard/local_settings.py \ mkdir -p /var/lib/horizon/openstack_dashboard/static # Create the horizon document root for apache configuration -mkdir -p /var/lib/horizon/openstack_dashboard/.blackhole +mkdir -p /var/lib/horizon/.blackhole # Link horizon configuration file for apache to the directory where our apache load # configurations files -- cgit v1.2.1 From 0e6cba2aa8a0856dced8e86b073849e7a343c9dd Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 17 Feb 2015 11:09:15 +0000 Subject: Rabbitmq-server was installing things in /usr, remove them --- strata/openstack-services/rabbitmq-server.morph | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/strata/openstack-services/rabbitmq-server.morph b/strata/openstack-services/rabbitmq-server.morph index 0c2d9b3b..97b8a126 100644 --- a/strata/openstack-services/rabbitmq-server.morph +++ b/strata/openstack-services/rabbitmq-server.morph @@ -6,4 +6,11 @@ configure-commands: build-commands: - make install-commands: -- make install_bin TARGET_DIR="$DESTDIR$PREFIX" SBIN_DIR="$DESTDIR$PREFIX"/sbin MAN_DIR="$PREFIX"/share/man DOC_INSTALL_DIR="$PREFIX"/share +- | + make install_bin TARGET_DIR="$DESTDIR$PREFIX" \ + SBIN_DIR="$DESTDIR$PREFIX"/sbin \ + MAN_DIR="$PREFIX"/share/man \ + DOC_INSTALL_DIR="$PREFIX"/share + +post-install-commands: +- rm "$DESTDIR$PREFIX"/LICENSE* "$DESTDIR$PREFIX"/INSTALL -- cgit v1.2.1 From 29892cd76ed0380e0c1e328f40938079ee5e6388 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Tue, 17 Feb 2015 15:00:30 +0000 Subject: Disable login requirement for sudo for cinder, nova and neutron users Requiredtty is dissable by default but just in case we enable it in the future for the rest of the users, cinder, nova and neutron needs login disable to run commands being superuser. --- strata/openstack-services/cinder.morph | 2 ++ strata/openstack-services/neutron.morph | 2 ++ strata/openstack-services/nova.morph | 2 ++ 3 files changed, 6 insertions(+) diff --git a/strata/openstack-services/cinder.morph b/strata/openstack-services/cinder.morph index eafc7cea..cd680b09 100644 --- a/strata/openstack-services/cinder.morph +++ b/strata/openstack-services/cinder.morph @@ -12,5 +12,7 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/sudoers.d - | install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/cinder-rootwrap + Defaults:cinder !requiretty + cinder ALL=(root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * EOF diff --git a/strata/openstack-services/neutron.morph b/strata/openstack-services/neutron.morph index d6d08997..b79a089b 100644 --- a/strata/openstack-services/neutron.morph +++ b/strata/openstack-services/neutron.morph @@ -11,5 +11,7 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/sudoers.d - | install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/neutron-rootwrap + Defaults:neutron !requiretty + neutron ALL=(root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf * EOF diff --git a/strata/openstack-services/nova.morph b/strata/openstack-services/nova.morph index 98ac9854..bb6dd756 100644 --- a/strata/openstack-services/nova.morph +++ b/strata/openstack-services/nova.morph @@ -12,5 +12,7 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/sudoers.d - | install -D -m 0440 /proc/self/fd/0 <<'EOF' "$DESTDIR"/etc/sudoers.d/nova-rootwrap + Defaults:nova !requiretty + nova ALL=(root) NOPASSWD: /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf * EOF -- cgit v1.2.1 From 18c735aa068f5ce374c32dd4d0d41fdec5c15fb7 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Tue, 17 Feb 2015 15:04:10 +0000 Subject: Fix issues with ordering and enabling neutron-setup and neutron-server --- openstack/etc/systemd/system/openstack-neutron-server.service | 2 +- openstack/etc/systemd/system/openstack-neutron-setup.service | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/openstack/etc/systemd/system/openstack-neutron-server.service b/openstack/etc/systemd/system/openstack-neutron-server.service index f48c0a88..b9484b94 100644 --- a/openstack/etc/systemd/system/openstack-neutron-server.service +++ b/openstack/etc/systemd/system/openstack-neutron-server.service @@ -1,7 +1,7 @@ [Unit] Description=Neutron Api Server Wants=openvswitch-create-links-one-node.service -After=network-online.target openstack-neutron-setup.service +After=network-online.target openstack-neutron-setup.service openvswitch-create-links-one-node.service [Service] Type=simple diff --git a/openstack/etc/systemd/system/openstack-neutron-setup.service b/openstack/etc/systemd/system/openstack-neutron-setup.service index 38882e80..4c09907e 100644 --- a/openstack/etc/systemd/system/openstack-neutron-setup.service +++ b/openstack/etc/systemd/system/openstack-neutron-setup.service @@ -1,5 +1,6 @@ [Unit] Description=Run openstack-neutron-setup (once) +Wants=openvswitch-create-links-one-node.service After=network-online.target openstack-keystone-setup.service openvswitch-create-links-one-node.service postgres-server.service [Service] -- cgit v1.2.1 From 78999f172e32c93509222b00a3568fc58b730c1d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 17 Feb 2015 16:56:36 +0000 Subject: Add Ansible to Openstack system --- systems/openstack-server.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index 775aaaef..1292072a 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -51,6 +51,8 @@ strata: morph: strata/openstack-clients.morph - name: openstack-services morph: strata/openstack-services.morph +- name: ansible + morph: strata/ansible.morph configuration-extensions: - set-hostname - add-config-files -- cgit v1.2.1 From 025786557031e6bb73000fd048894d3a499639b2 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Wed, 18 Feb 2015 14:54:37 +0000 Subject: Fix apache-httpd and horizon setup because of the change of layout --- openstack/usr/share/openstack/apache-httpd-server-setup | 6 +++--- openstack/usr/share/openstack/openstack-horizon-setup | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack/usr/share/openstack/apache-httpd-server-setup b/openstack/usr/share/openstack/apache-httpd-server-setup index 4c0b3cee..8f8cdd60 100755 --- a/openstack/usr/share/openstack/apache-httpd-server-setup +++ b/openstack/usr/share/openstack/apache-httpd-server-setup @@ -25,9 +25,9 @@ fi # Move suexec to the directory where apache is configured to have it # # Check configure in strata/apache-httpd-server/httpd-server.morph # ############################################################################### -mkdir -p /srv/www +mkdir -p /var/www groupadd -r apache -useradd -c "Apache Server" -d /srv/www -g apache \ +useradd -c "Apache Server" -d /var/www -g apache \ -s /bin/false apache ############################################################################### @@ -38,7 +38,7 @@ mkdir -p /usr/lib/httpd mv -v /usr/sbin/suexec /usr/lib/httpd/suexec chgrp apache /usr/lib/httpd/suexec chmod 4754 /usr/lib/httpd/suexec -chown -R apache:apache /srv/www +chown -R apache:apache /var/www install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/apache-http-setup Apache http setup: success diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup index 43652322..c8b15125 100644 --- a/openstack/usr/share/openstack/openstack-horizon-setup +++ b/openstack/usr/share/openstack/openstack-horizon-setup @@ -52,7 +52,7 @@ mkdir -p /var/lib/horizon/.blackhole # Link horizon configuration file for apache to the directory where our apache load # configurations files ln -sf /etc/horizon/apache-horizon.conf \ - /usr/httpd/conf.d/apache-horizon.conf + /etc/httpd/conf.d/apache-horizon.conf chown -R horizon:horizon /var/lib/horizon -- cgit v1.2.1 From f3e6e638095ef05ffaa2c1e29a6f0da952fa743b Mon Sep 17 00:00:00 2001 From: Zara Zaimeche Date: Fri, 20 Feb 2015 10:45:48 +0000 Subject: Fix Redirect in Horizon --- openstack/etc/horizon/openstack_dashboard/local_settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openstack/etc/horizon/openstack_dashboard/local_settings.py b/openstack/etc/horizon/openstack_dashboard/local_settings.py index dc757eb1..febc3e70 100644 --- a/openstack/etc/horizon/openstack_dashboard/local_settings.py +++ b/openstack/etc/horizon/openstack_dashboard/local_settings.py @@ -546,4 +546,6 @@ SECURITY_GROUP_RULES = { # auth_token middleware are using. Allowed values are the # algorithms supported by Python's hashlib library. # OPENSTACK_TOKEN_HASH_ALGORITHM = 'md5' - +LOGIN_URL='/horizon/auth/login/' +LOGOUT_URL='/horizon/auth/logout/' +LOGIN_REDIRECT_URL='/horizon/' -- cgit v1.2.1 From 3d8aaa6aa9646acc918ce2a38f26c00d83abcf13 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 28 Feb 2015 10:50:58 +0000 Subject: Revert if needed: thrift with erlang and max-jobs=1 --- strata/openstack-services/thrift.morph | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/strata/openstack-services/thrift.morph b/strata/openstack-services/thrift.morph index 321e06d6..39062351 100644 --- a/strata/openstack-services/thrift.morph +++ b/strata/openstack-services/thrift.morph @@ -1,9 +1,6 @@ -{ - "name": "thrift", - "kind": "chunk", - "build-system": "autotools", - "configure-commands": [ - "./bootstrap.sh", - "./configure --prefix=\"$PREFIX\" --without-erlang" - ] -} +name: thrift +kind: chunk +build-system: autotools +max-jobs: 1 +pre-configure-commands: +- ./bootstrap.sh -- cgit v1.2.1 From 0a8a994da852df954d85597d441c93362b4cc616 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Tue, 24 Feb 2015 12:30:08 +0000 Subject: Collect statics for horizon and move install commands to the chunk Collecting the static files (css, js, png, ...) for horizon, compressing them and storing them in a folder accessible by horizon, fixes the problem when some css are not found and improves loading and navigating the pages. --- openstack/etc/horizon/apache-horizon.conf | 6 +-- openstack/manifest | 1 - .../usr/share/openstack/openstack-horizon-setup | 27 +--------- strata/openstack-services.morph | 2 + strata/openstack-services/horizon.morph | 59 ++++++++++++++++++++++ 5 files changed, 66 insertions(+), 29 deletions(-) create mode 100644 strata/openstack-services/horizon.morph diff --git a/openstack/etc/horizon/apache-horizon.conf b/openstack/etc/horizon/apache-horizon.conf index e51fbd17..1b0b3fe3 100644 --- a/openstack/etc/horizon/apache-horizon.conf +++ b/openstack/etc/horizon/apache-horizon.conf @@ -1,6 +1,6 @@ - WSGIScriptAlias /horizon /var/lib/horizon/django.wsgi - WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horzion + WSGIScriptAlias /horizon /var/lib/horizon/openstack_dashboard/django.wsgi + WSGIDaemonProcess horizon user=horizon group=horizon processes=3 threads=10 home=/var/lib/horizon display-name=horizon WSGIApplicationGroup %{GLOBAL} SetEnv APACHE_RUN_USER apache @@ -10,7 +10,7 @@ DocumentRoot /var/lib/horizon/.blackhole Alias /static /var/lib/horizon/openstack_dashboard/static - + Options Indexes FollowSymLinks MultiViews AllowOverride None # Apache 2.4 uses mod_authz_host for access control now (instead of diff --git a/openstack/manifest b/openstack/manifest index b19142b5..8c7b9915 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -152,7 +152,6 @@ 0100644 0 0 /etc/systemd/system/apache-httpd.service 0040755 0 0 /etc/horizon 0040755 0 0 /etc/horizon/openstack_dashboard -0040755 0 0 /var/lib/horizon 0100644 0 0 /etc/systemd/system/openstack-horizon-setup.service 0100755 0 0 /usr/share/openstack/openstack-horizon-setup 0100644 0 0 /etc/horizon/apache-horizon.conf diff --git a/openstack/usr/share/openstack/openstack-horizon-setup b/openstack/usr/share/openstack/openstack-horizon-setup index c8b15125..af944477 100644 --- a/openstack/usr/share/openstack/openstack-horizon-setup +++ b/openstack/usr/share/openstack/openstack-horizon-setup @@ -22,39 +22,16 @@ if [ -f /var/openstack/horizon-setup ]; then fi # Create required system users and groups -mkdir -p /var/lib/horizon getent group horizon >/dev/null || groupadd -r --gid 167 horizon getent passwd neutron >/dev/null || \ useradd --uid 167 -r -g horizon -d /var/lib/horizon -s /sbin/nologin \ -c "Horizon user" horizon -# Work around to make django.wsgi working with horizon -# See: https://bugs.launchpad.net/osprofiler/+bug/1361235 -# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79 -sed -i "s|'../..'|os.path.realpath('../..')|" \ - /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi - -# And link this django.wsgi file to the horizon home directory -ln -sf /usr/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \ - /var/lib/horizon/django.wsgi - -# Link Openstack local_settings where openstack_dashboard is installed. -ln -sf /etc/horizon/openstack_dashboard/local_settings.py \ - /usr/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py - -# Create the static directory (STATIC_ROOT) used in local_settings.py to keep -# the static objects like css files. -mkdir -p /var/lib/horizon/openstack_dashboard/static - -# Create the horizon document root for apache configuration -mkdir -p /var/lib/horizon/.blackhole +chown -R horizon:horizon /var/lib/horizon # Link horizon configuration file for apache to the directory where our apache load # configurations files -ln -sf /etc/horizon/apache-horizon.conf \ - /etc/httpd/conf.d/apache-horizon.conf - -chown -R horizon:horizon /var/lib/horizon +ln -sf /etc/horizon/apache-horizon.conf /etc/httpd/conf.d/apache-horizon.conf install -D -m 644 /proc/self/fd/0 <<'EOF' /var/openstack/horizon-setup Horizon setup: success diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index 89829944..8ec40c09 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -821,8 +821,10 @@ chunks: unpetrify-ref: 1.1.8 build-depends: [] - name: horizon + morph: strata/openstack-services/horizon.morph repo: upstream:openstack/horizon ref: 3d9a31e2a05288e9a48a51eb4fe693c42e92aac7 unpetrify-ref: 2014.2.1 build-depends: - django-openstack-auth + - lockfile diff --git a/strata/openstack-services/horizon.morph b/strata/openstack-services/horizon.morph new file mode 100644 index 00000000..ae6399b1 --- /dev/null +++ b/strata/openstack-services/horizon.morph @@ -0,0 +1,59 @@ +name: horizon +kind: chunk +configure-commands: +# Remove unnecessary .mo files they will be generated +# later during package build. +- find . -name "django*.mo" -exec rm -f '{}' \; +# Set COMPRESS_OFFLINE=True +- | + sed -i 's:COMPRESS_OFFLINE.=.False:COMPRESS_OFFLINE = True:' \ + openstack_dashboard/settings.py +build-commands: +# Compile message strings +- cd horizon && django-admin.py compilemessages && cd .. +- cd openstack_dashboard && django-admin.py compilemessages && cd .. +- python setup.py build +post-build-commands: +# Use the local_settings.py example to compile and compress the css, js, etc files. +# This is a hack to make SECRET_KEY work. +- | + cp openstack_dashboard/local/local_settings.py.example \ + openstack_dashboard/local/local_settings.py +# Collect the static files and compress them. +- python manage.py collectstatic --noinput +- python manage.py compress --force +install-commands: +# Undo hack +- | + cp openstack_dashboard/local/local_settings.py.example \ + openstack_dashboard/local/local_settings.py +# Install horizon +- python setup.py install -O1 --skip-build --prefix "$PREFIX" --root "$DESTDIR" +post-install-commands: +# Remove unnecessary .po files +- find "$DESTDIR" -name django.po -exec rm '{}' \; +- find "$DESTDIR" -name djangojs.po -exec rm '{}' \; +# Link Openstack local_settings where openstack_dashboard is installed. +- mkdir -p "$DESTDIR"/var/lib/horizon/openstack_dashboard/local +- | + ln -sf /etc/horizon/openstack_dashboard/local_settings.py \ + "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py +# Create the static directory (STATIC_ROOT) used in local_settings.py to keep +# the static objects like css files. +- mkdir -p "$DESTDIR"/var/lib/horizon/openstack_dashboard/static +# Copy the compressed static files to horizon. +- cp -a openstack_dashboard/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static +- cp -a horizon/static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static +- cp -a static/* "$DESTDIR"/var/lib/horizon/openstack_dashboard/static +# Work around to make django.wsgi working with horizon +# See: https://bugs.launchpad.net/osprofiler/+bug/1361235 +# and: https://git.openstack.org/cgit/openstack/tripleo-image-elements/commit/?id=41c9a1dfad23f8aee366afb6a0b20a6c57ec8f79 +- | + sed -i "s|'../..'|os.path.realpath('../..')|" \ + "$DESTDIR$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi +# And link this django.wsgi file to the horizon home directory +- | + ln -sf "$PREFIX"/lib/python2.7/site-packages/openstack_dashboard/wsgi/django.wsgi \ + "$DESTDIR"/var/lib/horizon/openstack_dashboard/django.wsgi +# Create the horizon document root for apache configuration +- mkdir -p "$DESTDIR"/var/lib/horizon/.blackhole -- cgit v1.2.1 From a30754d8d810f6d651939c65ef916d6d218c31c4 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Mon, 23 Feb 2015 12:22:22 +0000 Subject: Rename stratum to nfs Caused problems with nfs stratum not being built into the system. Thanks to Richard Ipsum for helping spot this. --- systems/openstack-server.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index 1292072a..3cabc6d4 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -31,7 +31,7 @@ strata: morph: strata/connectivity.morph - name: networking-utils morph: strata/networking-utils.morph -- name: nfs.morph +- name: nfs morph: strata/nfs.morph - name: databases morph: strata/databases.morph -- cgit v1.2.1 From 3a3cf514b1082cd9a280a1c9f51cea9bf1e4c392 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Wed, 25 Feb 2015 12:44:33 +0000 Subject: Add xfs recognition to openstack bsp --- strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 7d29d8f1..39e62c7e 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -40,6 +40,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e CONFIG_XFS_FS +- scripts/config -e CONFIG_LIBCRC32C - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP -- cgit v1.2.1 From b1e46478fa50ae0fa2bb0885f22acabe30971ac0 Mon Sep 17 00:00:00 2001 From: Patrick Darley Date: Wed, 25 Feb 2015 16:22:15 +0000 Subject: Add ntpd to openstack system --- systems/openstack-server.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index 3cabc6d4..f0294d33 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -53,6 +53,8 @@ strata: morph: strata/openstack-services.morph - name: ansible morph: strata/ansible.morph +- name: ntpd + morph: strata/ntpd.morph configuration-extensions: - set-hostname - add-config-files -- cgit v1.2.1