summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-07-16 11:09:21 +0100
committerBaserock Gerrit <gerrit@baserock.org>2015-07-19 20:20:21 +0000
commit2b9a378e7024dae98d16ce2de1468f65a095f309 (patch)
treeba118fba9a32ccdc7c3df67dde80d8c4b0373d83
parent7d3a901a14c1b3d6f636af9e60a5f84f5ad0777c (diff)
downloaddefinitions-2b9a378e7024dae98d16ce2de1468f65a095f309.tar.gz
Reformat all definitions according to a consistent style
This was done using the 'indent' tool, which uses a fork of PyYAML named 'ruamel.yaml' to rewrite YAML files without losing comments, ordering, or certain elements of formatting. My aim with doing this is to open the door to automated editing of the reference system definitions using the 'ruamel.yaml' library. This can be used to implement automated migration when we want to make changes to the YAML format that we use to represent Baserock system definitions. Although this looks drastic, remember that it's actually only altered 65 out of 608 .morph files -- the vast majority already pass unchanged through my version of ruamel.yaml. Change-Id: I95ec978714b5bd1c02c90183336a9fbb846cb692
-rw-r--r--clusters/cephclient.morph26
-rw-r--r--clusters/ci.morph39
-rw-r--r--clusters/example-swift-storage-cluster.morph14
-rw-r--r--clusters/jetson-upgrade.morph17
-rw-r--r--clusters/mason-openstack.morph2
-rw-r--r--clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph6
-rw-r--r--clusters/moonshot-m2-armv8b64.morph36
-rw-r--r--clusters/moonshot-pxe-armv8b64.morph16
-rw-r--r--clusters/moonshot-pxe-armv8l64.morph4
-rw-r--r--clusters/openstack-one-node-swift.morph24
-rw-r--r--clusters/openstack-one-node.morph8
-rw-r--r--clusters/openstack-three-node-installer.morph183
-rw-r--r--clusters/openstack-two-node-installer.morph163
-rw-r--r--clusters/release.morph26
-rw-r--r--clusters/zookeeper.morph36
-rw-r--r--strata/audio-bluetooth.morph4
-rw-r--r--strata/audio-bluetooth/pulseaudio.morph3
-rw-r--r--strata/bsp-jetson/nouveau-drm.morph16
-rw-r--r--strata/bsp-x86_both-tools.morph2
-rw-r--r--strata/build-essential.morph4
-rw-r--r--strata/build-essential/busybox.morph32
-rw-r--r--strata/build-essential/gcc.morph7
-rw-r--r--strata/build-essential/stage2-busybox.morph22
-rw-r--r--strata/ceph-service/boost.morph2
-rw-r--r--strata/ceph-service/ceph.morph3
-rw-r--r--strata/ceph-service/leveldb.morph2
-rw-r--r--strata/chef/erubis-master.morph4
-rw-r--r--strata/chef/hoe-master.morph1
-rw-r--r--strata/chef/libyajl2-1.0.1.morph4
-rw-r--r--strata/chef/plist-master.morph1
-rw-r--r--strata/foundation/btrfs-progs.morph3
-rw-r--r--strata/foundation/time-zone-database.morph3
-rw-r--r--strata/libdrm-common/drm.morph10
-rw-r--r--strata/llvm-common/llvm.morph3
-rw-r--r--strata/lvm/lvm2.morph2
-rw-r--r--strata/networking-utils.morph8
-rw-r--r--strata/networking-utils/libnet.morph3
-rw-r--r--strata/nfs/nfs-utils.morph3
-rw-r--r--strata/ntpd/ntpd.morph2
-rw-r--r--strata/openstack-common.morph4
-rw-r--r--strata/openstack-services.morph5
-rw-r--r--strata/openstack-services/open-iscsi.morph3
-rw-r--r--strata/python-tools.morph4
-rw-r--r--strata/qt5-tools-qtwebkit.morph2
-rw-r--r--strata/tools/gdb.morph3
-rw-r--r--strata/tools/procps-ng.morph4
-rw-r--r--strata/unionfs-fuse-group.morph19
-rw-r--r--strata/unionfs-fuse-group/unionfs-fuse.morph3
-rw-r--r--strata/virtualization.morph8
-rw-r--r--strata/x-common.morph4
-rw-r--r--strata/xstatic.morph10
-rw-r--r--strata/zookeeper-server.morph3
-rw-r--r--strata/zookeeper/zookeeper-client.morph26
-rw-r--r--strata/zookeeper/zookeeper-server.morph52
-rw-r--r--strata/zookeeper/zookeeper.morph20
-rw-r--r--systems/build-system-armv7lhf-highbank.morph3
-rw-r--r--systems/build-system-armv7lhf-jetson.morph3
-rw-r--r--systems/build-system-ppc64.morph3
-rw-r--r--systems/build-system-x86_32-chroot.morph3
-rw-r--r--systems/build-system-x86_32.morph3
-rw-r--r--systems/build-system-x86_64-chroot.morph3
-rw-r--r--systems/build-system-x86_64.morph3
-rw-r--r--systems/installer-system-armv8b64.morph3
-rw-r--r--systems/installer-system-x86_64.morph3
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph3
65 files changed, 489 insertions, 455 deletions
diff --git a/clusters/cephclient.morph b/clusters/cephclient.morph
index 2585fbdf..9eaf92ee 100644
--- a/clusters/cephclient.morph
+++ b/clusters/cephclient.morph
@@ -3,18 +3,18 @@ kind: cluster
systems:
- morph: systems/ceph-service-x86_64-generic.morph
deploy:
- ceph-node-virtualbox-image:
- type: extensions/virtualbox-ssh
- SYSTEM: systems/ceph-service-x86_64-generic.morph
- location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi
- # HOST_IPADDR and NETMASK should be set to the IP address and netmask of the virtualbox host on the host-only interface.
- #HOST_IPADDR: 10.0.100.100
- #NETMASK: 255.255.255.0
+ ceph-node-virtualbox-image:
+ type: extensions/virtualbox-ssh
+ SYSTEM: systems/ceph-service-x86_64-generic.morph
+ location: vbox+ssh://user@machine/ChefNode4/home/user/chefnode4.vdi
+ # HOST_IPADDR and NETMASK should be set to the IP address and netmask of the virtualbox host on the host-only interface.
+ #HOST_IPADDR: 10.0.100.100
+ #NETMASK: 255.255.255.0
- # This is an example of how to configure the three interfaces necessary to support ceph in the BCPC configuration.
- #NETWORK_CONFIG: lo:loopback;enp0s3:static,address=10.0.100.14,netmask=255.255.255.0;enp0s8:static,address=172.16.100.14,netmask=255.255.255.0;enp0s9:static,address=192.168.100.14,netmask=255.255.255.0
- DISK_SIZE: 8G
- HOSTNAME: CephNode4
+ # This is an example of how to configure the three interfaces necessary to support ceph in the BCPC configuration.
+ #NETWORK_CONFIG: lo:loopback;enp0s3:static,address=10.0.100.14,netmask=255.255.255.0;enp0s8:static,address=172.16.100.14,netmask=255.255.255.0;enp0s9:static,address=192.168.100.14,netmask=255.255.255.0
+ DISK_SIZE: 8G
+ HOSTNAME: CephNode4
- # You must install authorized_keys in chef/root/.ssh/ before this will work.
- INSTALL_FILES: install-files/chef/manifest
+ # You must install authorized_keys in chef/root/.ssh/ before this will work.
+ INSTALL_FILES: install-files/chef/manifest
diff --git a/clusters/ci.morph b/clusters/ci.morph
index 69b7c76a..fc3e50a7 100644
--- a/clusters/ci.morph
+++ b/clusters/ci.morph
@@ -24,12 +24,13 @@ systems:
type: extensions/rawdisk
location: build-system-armv7lhf-jetson.img
DISK_SIZE: 2G
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
- morph: systems/weston-system-x86_64-generic.morph
deploy:
weston-system-x86_64-generic:
@@ -43,12 +44,13 @@ systems:
type: extensions/rawdisk
location: weston-system-armv7lhf-jetson.img
DISK_SIZE: 4G
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
genivi-baseline-system-x86_64-generic:
@@ -62,12 +64,13 @@ systems:
type: extensions/rawdisk
location: genivi-baseline-system-armv7lhf-jetson.img
DISK_SIZE: 4G
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
- morph: systems/openstack-system-x86_64.morph
deploy:
openstack-system-x86_64:
diff --git a/clusters/example-swift-storage-cluster.morph b/clusters/example-swift-storage-cluster.morph
index e5e7b6ab..ddab6481 100644
--- a/clusters/example-swift-storage-cluster.morph
+++ b/clusters/example-swift-storage-cluster.morph
@@ -11,13 +11,13 @@ systems:
SWIFT_REPLICAS: 3
SWIFT_MIN_PART_HOURS: 1
- SWIFT_STORAGE_DEVICES: [{ ip: <node0 management ip>, device: sdb, weight: 100 },
- { ip: <node0 management ip>, device: sdc, weight: 100 },
- { ip: <node0 management ip>, device: sdd, weight: 100 },
-
- { ip: <node1 management ip>, device: sdb, weight: 100 },
- { ip: <node1 management ip>, device: sdc, weight: 100 },
- { ip: <node1 management ip>, device: sdd, weight: 100 }]
+ SWIFT_STORAGE_DEVICES:
+ - {ip: <node0 management ip>, device: sdb, weight: 100}
+ - {ip: <node0 management ip>, device: sdc, weight: 100}
+ - {ip: <node0 management ip>, device: sdd, weight: 100}
+ - {ip: <node1 management ip>, device: sdb, weight: 100}
+ - {ip: <node1 management ip>, device: sdc, weight: 100}
+ - {ip: <node1 management ip>, device: sdd, weight: 100}
# This value can be any random string or number
# but each node in your swift cluster must have the same value
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index e6ec97e0..c335445b 100644
--- a/clusters/jetson-upgrade.morph
+++ b/clusters/jetson-upgrade.morph
@@ -5,14 +5,15 @@ systems:
deploy-defaults:
TROVE_HOST: TROVE_HOST
TROVE_ID: TROVE_ID
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2
deploy:
self:
- type: extensions/ssh-rsync
- location: root@127.0.0.1
+ type: extensions/ssh-rsync
+ location: root@127.0.0.1
diff --git a/clusters/mason-openstack.morph b/clusters/mason-openstack.morph
index 935e2496..cc7c1d4d 100644
--- a/clusters/mason-openstack.morph
+++ b/clusters/mason-openstack.morph
@@ -34,6 +34,6 @@ systems:
OPENSTACK_TENANT_ID: 7d7ebfe23367490b973a10fa426c3aec
OPENSTACK_IMAGENAME: mason-openstack
OPENSTACK_NETWORK_ID: 71f5151a-b7c3-405d-a841-d1b07e5db099
- CLOUD_INIT: yes
+ CLOUD_INIT: true
KERNEL_ARGS: console=ttyS0 console=tty0
TEST_INFRASTRUCTURE_TYPE: openstack
diff --git a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
index 9647e7a7..3154fa26 100644
--- a/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
+++ b/clusters/minimal-system-armv5l-openbmc-aspeed-deploy.morph
@@ -6,8 +6,8 @@ systems:
minimal-system-armv5l-openbmc-aspeed:
type: extensions/jffs2
location: minimal-system-armv5l-openbmc-aspeed.img
- ROOT_DEVICE: "/dev/mtdblock"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
+ ROOT_DEVICE: /dev/mtdblock
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
ERASE_BLOCK: 64
INIT_SYSTEM: busybox
diff --git a/clusters/moonshot-m2-armv8b64.morph b/clusters/moonshot-m2-armv8b64.morph
index c6d62ca2..caa460c3 100644
--- a/clusters/moonshot-m2-armv8b64.morph
+++ b/clusters/moonshot-m2-armv8b64.morph
@@ -14,32 +14,32 @@ systems:
PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
PXEBOOT_ROOTFS_RSYNC_ADDRESS: rsync://192.168.0.1/srv/nfsboot/
PXEBOOT_PXE_REBOOT_COMMAND: |
- ssh Administrator@10.0.1.10 set node power off force c31n1
- ssh Administrator@10.0.1.10 set node boot pxe c31n1
- # Nodes are powered on twice as sometimes powering them on
- # once is not enough
- ssh Administrator@10.0.1.10 set node power on c31n1
- ssh Administrator@10.0.1.10 set node power on c31n1
+ ssh Administrator@10.0.1.10 set node power off force c31n1
+ ssh Administrator@10.0.1.10 set node boot pxe c31n1
+ # Nodes are powered on twice as sometimes powering them on
+ # once is not enough
+ ssh Administrator@10.0.1.10 set node power on c31n1
+ ssh Administrator@10.0.1.10 set node power on c31n1
PXEBOOT_REBOOT_COMMAND: |
- ssh Administrator@10.0.1.10 set node power off force c31n1
- ssh Administrator@10.0.1.10 set node boot m.2 c31n1
- ssh Administrator@10.0.1.10 set node power on c31n1
- ssh Administrator@10.0.1.10 set node power on c31n1
+ ssh Administrator@10.0.1.10 set node power off force c31n1
+ ssh Administrator@10.0.1.10 set node boot m.2 c31n1
+ ssh Administrator@10.0.1.10 set node power on c31n1
+ ssh Administrator@10.0.1.10 set node power on c31n1
INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda
INSTALLER_ROOTFS_TO_INSTALL: /rootfs
INSTALLER_POST_INSTALL_COMMAND: |
- while : ; do
- echo "enter 'installed' in your deployment machine to finish the installation"
- sleep 2
- done
- INSTALLER_CREATE_BOOT_PARTITION: yes
+ while : ; do
+ echo "enter 'installed' in your deployment machine to finish the installation"
+ sleep 2
+ done
+ INSTALLER_CREATE_BOOT_PARTITION: true
HOSTNAME: installer-system-c31n1
DTB_PATH: boot/m400-1003.dtb
KERNEL_ARGS: console=ttyS0,9600n8r init=/usr/lib/baserock-installer/installer
INSTALL_FILES: install-files/moonshot/manifest
- MOONSHOT_KERNEL: yes
+ MOONSHOT_KERNEL: true
subsystems:
- morph: systems/devel-system-armv8b64.morph
deploy:
@@ -49,8 +49,8 @@ systems:
HOSTNAME: baserock-c31n1
DTB_PATH: boot/m400-1003.dtb
INSTALL_FILES: install-files/moonshot/manifest
- MOONSHOT_KERNEL: yes
+ MOONSHOT_KERNEL: true
BOOT_DEVICE: /dev/sda1
ROOT_DEVICE: /dev/sda2
BOOTLOADER_CONFIG_FORMAT: extlinux
- BOOTLOADER_INSTALL: "none"
+ BOOTLOADER_INSTALL: none
diff --git a/clusters/moonshot-pxe-armv8b64.morph b/clusters/moonshot-pxe-armv8b64.morph
index ffee0392..af59817a 100644
--- a/clusters/moonshot-pxe-armv8b64.morph
+++ b/clusters/moonshot-pxe-armv8b64.morph
@@ -15,16 +15,16 @@ systems:
PXEBOOT_CONFIG_TFTP_ADDRESS: sftp://192.168.0.1/srv/nfsboot/tftp/
PXEBOOT_ROOTFS_RSYNC_ADDRESS: rsync://192.168.0.1/srv/nfsboot/
PXEBOOT_PXE_REBOOT_COMMAND: |
- ssh Administrator@10.0.1.10 set node power off force c31n1
- ssh Administrator@10.0.1.10 set node boot pxe c31n1
- # Nodes are powered on twice as sometimes powering them on
- # once is not enough
- ssh Administrator@10.0.1.10 set node power on c31n1
- ssh Administrator@10.0.1.10 set node power on c31n1
- PXE_INSTALLER: no
+ ssh Administrator@10.0.1.10 set node power off force c31n1
+ ssh Administrator@10.0.1.10 set node boot pxe c31n1
+ # Nodes are powered on twice as sometimes powering them on
+ # once is not enough
+ ssh Administrator@10.0.1.10 set node power on c31n1
+ ssh Administrator@10.0.1.10 set node power on c31n1
+ PXE_INSTALLER: false
HOSTNAME: baserock-c31n1
DTB_PATH: boot/m400-1003.dtb
KERNEL_ARGS: console=ttyS0,9600n8r rw
INSTALL_FILES: install-files/moonshot/manifest
- MOONSHOT_KERNEL: yes
+ MOONSHOT_KERNEL: true
diff --git a/clusters/moonshot-pxe-armv8l64.morph b/clusters/moonshot-pxe-armv8l64.morph
index 62ee92a2..80771d52 100644
--- a/clusters/moonshot-pxe-armv8l64.morph
+++ b/clusters/moonshot-pxe-armv8l64.morph
@@ -17,6 +17,6 @@ systems:
KERNEL_ARGS: console=ttyS0,9600n8r rw
DTB_PATH: boot/m400-1003.dtb
HOSTNAME: baserock-m400-node31
- MOONSHOT_KERNEL: yes
+ MOONSHOT_KERNEL: true
INSTALL_FILES: install-files/moonshot/manifest
- PXE_INSTALLER: no
+ PXE_INSTALLER: false
diff --git a/clusters/openstack-one-node-swift.morph b/clusters/openstack-one-node-swift.morph
index de7066d6..fc289538 100644
--- a/clusters/openstack-one-node-swift.morph
+++ b/clusters/openstack-one-node-swift.morph
@@ -51,7 +51,7 @@ systems:
## Swift config options
#########################################################################
- SWIFT_CONTROLLER: True
+ SWIFT_CONTROLLER: true
SWIFT_ADMIN_PASSWORD: insecure
@@ -59,13 +59,13 @@ systems:
SWIFT_REPLICAS: 3
SWIFT_MIN_PART_HOURS: 1
- SWIFT_STORAGE_DEVICES: [{ ip: <storage node 0 management ip>, device: sdb, weight: 100 },
- { ip: <storage node 0 management ip>, device: sdc, weight: 100 },
- { ip: <storage node 0 management ip>, device: sdd, weight: 100 },
-
- { ip: <storage node 1 management ip>, device: sdb, weight: 100 },
- { ip: <storage node 1 management ip>, device: sdc, weight: 100 },
- { ip: <storage node 1 management ip>, device: sdd, weight: 100 }]
+ SWIFT_STORAGE_DEVICES:
+ - {ip: <storage node 0 management ip>, device: sdb, weight: 100}
+ - {ip: <storage node 0 management ip>, device: sdc, weight: 100}
+ - {ip: <storage node 0 management ip>, device: sdd, weight: 100}
+ - {ip: <storage node 1 management ip>, device: sdb, weight: 100}
+ - {ip: <storage node 1 management ip>, device: sdc, weight: 100}
+ - {ip: <storage node 1 management ip>, device: sdd, weight: 100}
# This value can be any random string or number
# but each node in your swift cluster must have the same values
@@ -91,13 +91,13 @@ systems:
CONTROLLER_HOST_ADDRESS: onenode
MANAGEMENT_INTERFACE_IP_ADDRESS: <management ip>
- KEYSTONE_ENABLE_SERVICE: True
+ KEYSTONE_ENABLE_SERVICE: true
KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
KEYSTONE_ADMIN_PASSWORD: veryinsecure
KEYSTONE_DB_USER: keystoneDB
KEYSTONE_DB_PASSWORD: veryinsecure
- GLANCE_ENABLE_SERVICE: True
+ GLANCE_ENABLE_SERVICE: true
GLANCE_SERVICE_USER: glance
GLANCE_SERVICE_PASSWORD: veryinsecure
GLANCE_DB_USER: glanceDB
@@ -108,7 +108,7 @@ systems:
NOVA_DB_USER: novaDB
NOVA_DB_PASSWORD: veryinsecure
NOVA_VIRT_TYPE: qemu
- NOVA_BAREMETAL_SCHEDULING: no
+ NOVA_BAREMETAL_SCHEDULING: false
CINDER_SERVICE_USER: cinder
CINDER_SERVICE_PASSWORD: veryinsecure
@@ -123,7 +123,7 @@ systems:
NEUTRON_DB_PASSWORD: veryinsecure
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
- IRONIC_ENABLE_SERVICE: True
+ IRONIC_ENABLE_SERVICE: true
IRONIC_SERVICE_USER: ironic
IRONIC_SERVICE_PASSWORD: veryinsecure
IRONIC_DB_USER: ironicDB
diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph
index ab12f9b3..1b31996a 100644
--- a/clusters/openstack-one-node.morph
+++ b/clusters/openstack-one-node.morph
@@ -55,13 +55,13 @@ systems:
CONTROLLER_HOST_ADDRESS: onenode
MANAGEMENT_INTERFACE_IP_ADDRESS: <management ip>
- KEYSTONE_ENABLE_SERVICE: True
+ KEYSTONE_ENABLE_SERVICE: true
KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
KEYSTONE_ADMIN_PASSWORD: veryinsecure
KEYSTONE_DB_USER: keystoneDB
KEYSTONE_DB_PASSWORD: veryinsecure
- GLANCE_ENABLE_SERVICE: True
+ GLANCE_ENABLE_SERVICE: true
GLANCE_SERVICE_USER: glance
GLANCE_SERVICE_PASSWORD: veryinsecure
GLANCE_DB_USER: glanceDB
@@ -72,7 +72,7 @@ systems:
NOVA_DB_USER: novaDB
NOVA_DB_PASSWORD: veryinsecure
NOVA_VIRT_TYPE: qemu
- NOVA_BAREMETAL_SCHEDULING: no
+ NOVA_BAREMETAL_SCHEDULING: false
CINDER_SERVICE_USER: cinder
CINDER_SERVICE_PASSWORD: veryinsecure
@@ -87,7 +87,7 @@ systems:
NEUTRON_DB_PASSWORD: veryinsecure
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
- IRONIC_ENABLE_SERVICE: True
+ IRONIC_ENABLE_SERVICE: true
IRONIC_SERVICE_USER: ironic
IRONIC_SERVICE_PASSWORD: veryinsecure
IRONIC_DB_USER: ironicDB
diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph
index b9c72364..87c7056b 100644
--- a/clusters/openstack-three-node-installer.morph
+++ b/clusters/openstack-three-node-installer.morph
@@ -1,59 +1,58 @@
name: openstack-three-node-installer
kind: cluster
description: |
-
- This is a cluster morphology for deploying an installer for an x86_64
- OpenStack system spread across three nodes.
-
- This cluster creates disk images that may be `dd`'d onto install media to
- produce an OpenStack cluster when instantiated.
-
- Alternatively it may be used to install directly onto a physical disk by
- running:
-
- morph deploy clusters/openstack-three-node-installer.morph \
- network-installer network-installer.location=/dev/vdb
-
- Substituting network-installer for either compute-installer or
- controller-installer will produce different configurations, and it is possible
- to substitue /dev/vdb for a different path to a disk image to install to a
- different disk image.
-
- Substitute the values of HOSTNAME, NETWORK_CONFIG, EXTERNAL_INTERFACE,
- MANAGEMENT_IP_ADDRESS, CONTROLLER_HOST_ADDRESS, RABBITMQ_HOST and HOSTS_* to
- match your hardware and networking configuration.
-
- Requirements to be able to run and test the system:
-
- - DISK_SIZE should be bigger than 5G
- - The system has to have available at least 4G of RAM, but once
- you start instantiating VMs you will need more.
- - The IP of the system can't change, and you need to know it beforehand,
- that is, the system needs a static IP address.
-
- This cluster is configurable, but with the following constraints:
-
- - The hostname in RABBITMQ_HOST has to match CONTROLLER_HOST_ADDRESS,
- and HOST_CONTROLLER.
- - HOSTS_CONTROLLER is only needed if the hostname (see previous point)
- is not a FQDN.
- - The IP listed in MANAGEMENT_INTERFACE_IP_ADDRESS has to match the one
- used in HOSTS_CONTROLLER.
- - CINDER_DEVICE should be a path to a storage device ready to be
- used/formated for cinder data.
- - EXTERNAL_INTERFACE is required when the system has more than one network
- interface.
-
- You can also have a look at the following suggestions:
-
- - NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
- system is being deployed to.
- - We recommend changing all the PASSWORDs variables, also the
- KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
- METERING_SECRET.
- - Setting NOVA_BAREMETAL_SCHEDULING with an YAML truth value will configure
- Nova to schedule baremetal machines through the Ironic driver, instead of
- sheduling virtual machines.
+ This is a cluster morphology for deploying an installer for an x86_64
+ OpenStack system spread across three nodes.
+
+ This cluster creates disk images that may be `dd`'d onto install media to
+ produce an OpenStack cluster when instantiated.
+
+ Alternatively it may be used to install directly onto a physical disk by
+ running:
+
+ morph deploy clusters/openstack-three-node-installer.morph \
+ network-installer network-installer.location=/dev/vdb
+
+ Substituting network-installer for either compute-installer or
+ controller-installer will produce different configurations, and it is possible
+ to substitue /dev/vdb for a different path to a disk image to install to a
+ different disk image.
+
+ Substitute the values of HOSTNAME, NETWORK_CONFIG, EXTERNAL_INTERFACE,
+ MANAGEMENT_IP_ADDRESS, CONTROLLER_HOST_ADDRESS, RABBITMQ_HOST and HOSTS_* to
+ match your hardware and networking configuration.
+
+ Requirements to be able to run and test the system:
+
+ - DISK_SIZE should be bigger than 5G
+ - The system has to have available at least 4G of RAM, but once
+ you start instantiating VMs you will need more.
+ - The IP of the system can't change, and you need to know it beforehand,
+ that is, the system needs a static IP address.
+
+ This cluster is configurable, but with the following constraints:
+
+ - The hostname in RABBITMQ_HOST has to match CONTROLLER_HOST_ADDRESS,
+ and HOST_CONTROLLER.
+ - HOSTS_CONTROLLER is only needed if the hostname (see previous point)
+ is not a FQDN.
+ - The IP listed in MANAGEMENT_INTERFACE_IP_ADDRESS has to match the one
+ used in HOSTS_CONTROLLER.
+ - CINDER_DEVICE should be a path to a storage device ready to be
+ used/formated for cinder data.
+ - EXTERNAL_INTERFACE is required when the system has more than one network
+ interface.
+
+ You can also have a look at the following suggestions:
+
+ - NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
+ system is being deployed to.
+ - We recommend changing all the PASSWORDs variables, also the
+ KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
+ METERING_SECRET.
+ - Setting NOVA_BAREMETAL_SCHEDULING with an YAML truth value will configure
+ Nova to schedule baremetal machines through the Ironic driver, instead of
+ sheduling virtual machines.
systems:
- morph: systems/installer-system-x86_64.morph
@@ -66,7 +65,7 @@ systems:
HOSTNAME: installer-x86_64
INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda
INSTALLER_ROOTFS_TO_INSTALL: /rootfs
- INSTALLER_POST_INSTALL_COMMAND: 'sync; poweroff -f'
+ INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
- morph: systems/initramfs-x86_64.morph
@@ -90,30 +89,30 @@ systems:
RABBITMQ_PASSWORD: veryinsecure
# This token needs to be unique and secret
- KEYSTONE_ENABLE_SERVICE: False
+ KEYSTONE_ENABLE_SERVICE: false
KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
KEYSTONE_ADMIN_PASSWORD: veryinsecure
KEYSTONE_DB_USER: keystoneDB
KEYSTONE_DB_PASSWORD: veryinsecure
- GLANCE_ENABLE_SERVICE: False
+ GLANCE_ENABLE_SERVICE: false
GLANCE_SERVICE_USER: glance
GLANCE_SERVICE_PASSWORD: veryinsecure
GLANCE_DB_USER: glanceDB
GLANCE_DB_PASSWORD: veryinsecure
- NOVA_ENABLE_CONTROLLER: False
- NOVA_ENABLE_COMPUTE: False
+ NOVA_ENABLE_CONTROLLER: false
+ NOVA_ENABLE_COMPUTE: false
NOVA_SERVICE_USER: nova
NOVA_SERVICE_PASSWORD: veryinsecure
NOVA_DB_USER: novaDB
NOVA_DB_PASSWORD: veryinsecure
NOVA_VIRT_TYPE: kvm
- NOVA_BAREMETAL_SCHEDULING: no
+ NOVA_BAREMETAL_SCHEDULING: false
- CINDER_ENABLE_CONTROLLER: False
- CINDER_ENABLE_COMPUTE: False
- CINDER_ENABLE_STORAGE: False
+ CINDER_ENABLE_CONTROLLER: false
+ CINDER_ENABLE_COMPUTE: false
+ CINDER_ENABLE_STORAGE: false
CINDER_SERVICE_USER: cinder
CINDER_SERVICE_PASSWORD: veryinsecure
CINDER_DB_USER: cinderDB
@@ -121,16 +120,16 @@ systems:
# Storage device to be used by Cinder
CINDER_DEVICE: /dev/sdb
- NEUTRON_ENABLE_AGENT: False
- NEUTRON_ENABLE_MANAGER: True
- NEUTRON_ENABLE_CONTROLLER: False
+ NEUTRON_ENABLE_AGENT: false
+ NEUTRON_ENABLE_MANAGER: true
+ NEUTRON_ENABLE_CONTROLLER: false
NEUTRON_SERVICE_USER: neutron
NEUTRON_SERVICE_PASSWORD: veryinsecure
NEUTRON_DB_USER: neutronDB
NEUTRON_DB_PASSWORD: veryinsecure
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
- IRONIC_ENABLE_SERVICE: False
+ IRONIC_ENABLE_SERVICE: false
IRONIC_SERVICE_USER: ironic
IRONIC_SERVICE_PASSWORD: veryinsecure
IRONIC_DB_USER: ironicDB
@@ -140,8 +139,8 @@ systems:
CEILOMETER_SERVICE_PASSWORD: veryinsecure
CEILOMETER_DB_USER: ceilometerDB
CEILOMETER_DB_PASSWORD: veryinsecure
- CEILOMETER_ENABLE_CONTROLLER: False
- CEILOMETER_ENABLE_COMPUTE: False
+ CEILOMETER_ENABLE_CONTROLLER: false
+ CEILOMETER_ENABLE_COMPUTE: false
METERING_SECRET: insecureceilometersecret
CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt
@@ -154,7 +153,7 @@ systems:
EXTERNAL_INTERFACE: enp3s0
NETWORK_CONFIG: enp3s0:dhcp;enp2s0:static,address=10.0.0.1,netmask=255.255.255.0
- SYNC_TIME_WITH_CONTROLLER: True
+ SYNC_TIME_WITH_CONTROLLER: true
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
@@ -174,31 +173,31 @@ systems:
<<: *stack-node
HOSTNAME: threenode-controller
- KEYSTONE_ENABLE_SERVICE: True
+ KEYSTONE_ENABLE_SERVICE: true
- GLANCE_ENABLE_SERVICE: True
+ GLANCE_ENABLE_SERVICE: true
- NOVA_ENABLE_CONTROLLER: True
+ NOVA_ENABLE_CONTROLLER: true
- CINDER_ENABLE_CONTROLLER: True
- CINDER_ENABLE_COMPUTE: False
- CINDER_ENABLE_STORAGE: False
+ CINDER_ENABLE_CONTROLLER: true
+ CINDER_ENABLE_COMPUTE: false
+ CINDER_ENABLE_STORAGE: false
- NEUTRON_ENABLE_AGENT: False
- NEUTRON_ENABLE_MANAGER: False
- NEUTRON_ENABLE_CONTROLLER: True
+ NEUTRON_ENABLE_AGENT: false
+ NEUTRON_ENABLE_MANAGER: false
+ NEUTRON_ENABLE_CONTROLLER: true
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
- IRONIC_ENABLE_SERVICE: True
+ IRONIC_ENABLE_SERVICE: true
- CEILOMETER_ENABLE_CONTROLLER: True
- CEILOMETER_ENABLE_COMPUTE: False
+ CEILOMETER_ENABLE_CONTROLLER: true
+ CEILOMETER_ENABLE_COMPUTE: false
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.2
HOSTS_SELF: 10.0.0.2 threenode-controller
EXTERNAL_INTERFACE: enp2s0
NETWORK_CONFIG: enp2s0:dhcp;enp0s26u1u2:static,address=10.0.0.2,netmask=255.255.255.0
- SYNC_TIME_WITH_CONTROLLER: False
+ SYNC_TIME_WITH_CONTROLLER: false
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
@@ -218,24 +217,24 @@ systems:
<<: *stack-node
HOSTNAME: threenode-compute
- NOVA_ENABLE_COMPUTE: True
+ NOVA_ENABLE_COMPUTE: true
- CINDER_ENABLE_CONTROLLER: False
- CINDER_ENABLE_COMPUTE: True
- CINDER_ENABLE_STORAGE: True
+ CINDER_ENABLE_CONTROLLER: false
+ CINDER_ENABLE_COMPUTE: true
+ CINDER_ENABLE_STORAGE: true
- NEUTRON_ENABLE_AGENT: True
- NEUTRON_ENABLE_MANAGER: False
- NEUTRON_ENABLE_CONTROLLER: False
+ NEUTRON_ENABLE_AGENT: true
+ NEUTRON_ENABLE_MANAGER: false
+ NEUTRON_ENABLE_CONTROLLER: false
- CEILOMETER_ENABLE_CONTROLLER: False
- CEILOMETER_ENABLE_COMPUTE: True
+ CEILOMETER_ENABLE_CONTROLLER: false
+ CEILOMETER_ENABLE_COMPUTE: true
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
HOSTS_SELF: 10.0.0.3 threenode-compute
EXTERNAL_INTERFACE: eno1
NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0
- SYNC_TIME_WITH_CONTROLLER: True
+ SYNC_TIME_WITH_CONTROLLER: true
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph
index 29c028dc..e9c90cd1 100644
--- a/clusters/openstack-two-node-installer.morph
+++ b/clusters/openstack-two-node-installer.morph
@@ -1,58 +1,57 @@
name: openstack-two-node-installer
kind: cluster
description: |
-
- This is a cluster morphology for deploying an installer for an x86_64
- OpenStack system spread across three nodes.
-
- This cluster creates disk images that may be `dd`'d onto install media to
- produce an OpenStack cluster when instantiated.
-
- Alternatively it may be used to install directly onto a physical disk by
- running:
-
- morph deploy clusters/openstack-two-node-installer.morph \
- controller-installer controller-installer.location=/dev/vdb
-
- Substituting contrller-installer for compute-installer will produce
- different configurations, and it is possible to substitue /dev/vdb for a
- different path to a disk image to install to a different disk image.
-
- Substitute the values of HOSTNAME, NETWORK_CONFIG, EXTERNAL_INTERFACE,
- MANAGEMENT_IP_ADDRESS, CONTROLLER_HOST_ADDRESS, RABBITMQ_HOST and HOSTS_* to
- match your hardware and networking configuration.
-
- Requirements to be able to run and test the system:
-
- - DISK_SIZE should be bigger than 5G
- - The system has to have available at least 4G of RAM, but once
- you start instantiating VMs you will need more.
- - The IP of the system can't change, and you need to know it beforehand,
- that is, the system needs a static IP address.
-
- This cluster is configurable, but with the following constraints:
-
- - The hostname in RABBITMQ_HOST has to match CONTROLLER_HOST_ADDRESS,
- and HOST_CONTROLLER.
- - HOSTS_CONTROLLER is only needed if the hostname (see previous point)
- is not a FQDN.
- - The IP listed in MANAGEMENT_INTERFACE_IP_ADDRESS has to match the one
- used in HOSTS_CONTROLLER.
- - CINDER_DEVICE should be a path to a storage device ready to be
- used/formated for cinder data.
- - EXTERNAL_INTERFACE is required when the system has more than one network
- interface.
-
- You can also have a look at the following suggestions:
-
- - NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
- system is being deployed to.
- - We recommend changing all the PASSWORDs variables, also the
- KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
- METERING_SECRET.
- - Setting NOVA_BAREMETAL_SCHEDULING with a YAML truth value will configure
- Nova to schedule baremetal machines through the Ironic driver, instead of
- sheduling virtual machines.
+ This is a cluster morphology for deploying an installer for an x86_64
+ OpenStack system spread across three nodes.
+
+ This cluster creates disk images that may be `dd`'d onto install media to
+ produce an OpenStack cluster when instantiated.
+
+ Alternatively it may be used to install directly onto a physical disk by
+ running:
+
+ morph deploy clusters/openstack-two-node-installer.morph \
+ controller-installer controller-installer.location=/dev/vdb
+
+ Substituting contrller-installer for compute-installer will produce
+ different configurations, and it is possible to substitue /dev/vdb for a
+ different path to a disk image to install to a different disk image.
+
+ Substitute the values of HOSTNAME, NETWORK_CONFIG, EXTERNAL_INTERFACE,
+ MANAGEMENT_IP_ADDRESS, CONTROLLER_HOST_ADDRESS, RABBITMQ_HOST and HOSTS_* to
+ match your hardware and networking configuration.
+
+ Requirements to be able to run and test the system:
+
+ - DISK_SIZE should be bigger than 5G
+ - The system has to have available at least 4G of RAM, but once
+ you start instantiating VMs you will need more.
+ - The IP of the system can't change, and you need to know it beforehand,
+ that is, the system needs a static IP address.
+
+ This cluster is configurable, but with the following constraints:
+
+ - The hostname in RABBITMQ_HOST has to match CONTROLLER_HOST_ADDRESS,
+ and HOST_CONTROLLER.
+ - HOSTS_CONTROLLER is only needed if the hostname (see previous point)
+ is not a FQDN.
+ - The IP listed in MANAGEMENT_INTERFACE_IP_ADDRESS has to match the one
+ used in HOSTS_CONTROLLER.
+ - CINDER_DEVICE should be a path to a storage device ready to be
+ used/formated for cinder data.
+ - EXTERNAL_INTERFACE is required when the system has more than one network
+ interface.
+
+ You can also have a look at the following suggestions:
+
+ - NOVA_VIRT_TYPE can be either 'kvm' or 'qemu', depending on where the
+ system is being deployed to.
+ - We recommend changing all the PASSWORDs variables, also the
+ KEYSTONE_TEMPORARY_ADMIN_TOKEN, METADATA_PROXY_SHARED_SECRET and
+ METERING_SECRET.
+ - Setting NOVA_BAREMETAL_SCHEDULING with a YAML truth value will configure
+ Nova to schedule baremetal machines through the Ironic driver, instead of
+ sheduling virtual machines.
systems:
- morph: systems/installer-system-x86_64.morph
@@ -65,7 +64,7 @@ systems:
HOSTNAME: installer-x86_64
INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda
INSTALLER_ROOTFS_TO_INSTALL: /rootfs
- INSTALLER_POST_INSTALL_COMMAND: 'sync; poweroff -f'
+ INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f
INITRAMFS_PATH: boot/initramfs.gz
subsystems:
- morph: systems/initramfs-x86_64.morph
@@ -89,30 +88,30 @@ systems:
RABBITMQ_PASSWORD: veryinsecure
# This token needs to be unique and secret
- KEYSTONE_ENABLE_SERVICE: True
+ KEYSTONE_ENABLE_SERVICE: true
KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8
KEYSTONE_ADMIN_PASSWORD: veryinsecure
KEYSTONE_DB_USER: keystoneDB
KEYSTONE_DB_PASSWORD: veryinsecure
- GLANCE_ENABLE_SERVICE: True
+ GLANCE_ENABLE_SERVICE: true
GLANCE_SERVICE_USER: glance
GLANCE_SERVICE_PASSWORD: veryinsecure
GLANCE_DB_USER: glanceDB
GLANCE_DB_PASSWORD: veryinsecure
- NOVA_ENABLE_CONTROLLER: True
- NOVA_ENABLE_COMPUTE: False
+ NOVA_ENABLE_CONTROLLER: true
+ NOVA_ENABLE_COMPUTE: false
NOVA_SERVICE_USER: nova
NOVA_SERVICE_PASSWORD: veryinsecure
NOVA_DB_USER: novaDB
NOVA_DB_PASSWORD: veryinsecure
NOVA_VIRT_TYPE: kvm
- NOVA_BAREMETAL_SCHEDULING: no
+ NOVA_BAREMETAL_SCHEDULING: false
- CINDER_ENABLE_CONTROLLER: True
- CINDER_ENABLE_COMPUTE: False
- CINDER_ENABLE_STORAGE: False
+ CINDER_ENABLE_CONTROLLER: true
+ CINDER_ENABLE_COMPUTE: false
+ CINDER_ENABLE_STORAGE: false
CINDER_SERVICE_USER: cinder
CINDER_SERVICE_PASSWORD: veryinsecure
CINDER_DB_USER: cinderDB
@@ -120,16 +119,16 @@ systems:
# Storage device to be used by Cinder
CINDER_DEVICE: /dev/sdb
- NEUTRON_ENABLE_AGENT: False
- NEUTRON_ENABLE_MANAGER: True
- NEUTRON_ENABLE_CONTROLLER: True
+ NEUTRON_ENABLE_AGENT: false
+ NEUTRON_ENABLE_MANAGER: true
+ NEUTRON_ENABLE_CONTROLLER: true
NEUTRON_SERVICE_USER: neutron
NEUTRON_SERVICE_PASSWORD: veryinsecure
NEUTRON_DB_USER: neutronDB
NEUTRON_DB_PASSWORD: veryinsecure
METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret
- IRONIC_ENABLE_SERVICE: True
+ IRONIC_ENABLE_SERVICE: true
IRONIC_SERVICE_USER: ironic
IRONIC_SERVICE_PASSWORD: veryinsecure
IRONIC_DB_USER: ironicDB
@@ -139,8 +138,8 @@ systems:
CEILOMETER_SERVICE_PASSWORD: veryinsecure
CEILOMETER_DB_USER: ceilometerDB
CEILOMETER_DB_PASSWORD: veryinsecure
- CEILOMETER_ENABLE_CONTROLLER: True
- CEILOMETER_ENABLE_COMPUTE: False
+ CEILOMETER_ENABLE_CONTROLLER: true
+ CEILOMETER_ENABLE_COMPUTE: false
METERING_SECRET: insecureceilometersecret
CONTROLLER_HOST_ADDRESS: twonode-controller.os-mgmt
@@ -151,7 +150,7 @@ systems:
HOSTS_COMPUTE: 10.0.0.3 twonode-compute.os-mgmt
EXTERNAL_INTERFACE: enp3s0
NETWORK_CONFIG: enp3s0:dhcp;enp2s0:static,address=10.0.0.1,netmask=255.255.255.0
- SYNC_TIME_WITH_CONTROLLER: False
+ SYNC_TIME_WITH_CONTROLLER: false
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
@@ -171,31 +170,31 @@ systems:
<<: *stack-node
HOSTNAME: twonode-compute
- KEYSTONE_ENABLE_SERVICE: False
+ KEYSTONE_ENABLE_SERVICE: false
- GLANCE_ENABLE_SERVICE: False
+ GLANCE_ENABLE_SERVICE: false
- NOVA_ENABLE_COMPUTE: True
- NOVA_ENABLE_CONTROLLER: False
+ NOVA_ENABLE_COMPUTE: true
+ NOVA_ENABLE_CONTROLLER: false
- CINDER_ENABLE_CONTROLLER: False
- CINDER_ENABLE_COMPUTE: True
- CINDER_ENABLE_STORAGE: True
+ CINDER_ENABLE_CONTROLLER: false
+ CINDER_ENABLE_COMPUTE: true
+ CINDER_ENABLE_STORAGE: true
- NEUTRON_ENABLE_AGENT: True
- NEUTRON_ENABLE_MANAGER: False
- NEUTRON_ENABLE_CONTROLLER: False
+ NEUTRON_ENABLE_AGENT: true
+ NEUTRON_ENABLE_MANAGER: false
+ NEUTRON_ENABLE_CONTROLLER: false
- IRONIC_ENABLE_SERVICE: False
+ IRONIC_ENABLE_SERVICE: false
- CEILOMETER_ENABLE_CONTROLLER: False
- CEILOMETER_ENABLE_COMPUTE: True
+ CEILOMETER_ENABLE_CONTROLLER: false
+ CEILOMETER_ENABLE_COMPUTE: true
MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3
HOSTS_SELF: 10.0.0.3 twonode-compute
EXTERNAL_INTERFACE: eno1
NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0
- SYNC_TIME_WITH_CONTROLLER: True
+ SYNC_TIME_WITH_CONTROLLER: true
subsystems:
- morph: systems/initramfs-x86_64.morph
deploy:
diff --git a/clusters/release.morph b/clusters/release.morph
index a18af4f0..3f597a38 100644
--- a/clusters/release.morph
+++ b/clusters/release.morph
@@ -46,12 +46,13 @@ systems:
type: extensions/rawdisk
location: build-system-armv7lhf-jetson.img
DISK_SIZE: 2G
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
HOSTNAME: build-system-armv7lhf-jetson
- morph: systems/genivi-baseline-system-x86_64-generic.morph
deploy:
@@ -74,10 +75,11 @@ systems:
type: extensions/rawdisk
location: genivi-baseline-system-armv7lhf-jetson.img
DISK_SIZE: 4G
- BOOT_DEVICE: "/dev/mmcblk0p1"
- ROOT_DEVICE: "/dev/mmcblk0p2"
- DTB_PATH: "boot/tegra124-jetson-tk1.dtb"
- BOOTLOADER_CONFIG_FORMAT: "extlinux"
- BOOTLOADER_INSTALL: "none"
- KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1
+ BOOT_DEVICE: /dev/mmcblk0p1
+ ROOT_DEVICE: /dev/mmcblk0p2
+ DTB_PATH: boot/tegra124-jetson-tk1.dtb
+ BOOTLOADER_CONFIG_FORMAT: extlinux
+ BOOTLOADER_INSTALL: none
+ KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1
+ nouveau.pstate=1
HOSTNAME: genivi-baseline-system-armv7lhf-jetson
diff --git a/clusters/zookeeper.morph b/clusters/zookeeper.morph
index cca6db81..80197726 100644
--- a/clusters/zookeeper.morph
+++ b/clusters/zookeeper.morph
@@ -1,21 +1,21 @@
name: zookeeper
kind: cluster
systems:
- - morph: systems/zookeeper-client-x86_64.morph
- deploy:
- my-client-system:
- type: extensions/kvm
- location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img
- DISK_SIZE: 4G
- RAM_SIZE: 1G
- VCPUS: 1
- HOSTNAME: zkclient
- - morph: systems/zookeeper-server-x86_64.morph
- deploy:
- my-server-system:
- type: extensions/kvm
- location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img
- DISK_SIZE: 4G
- RAM_SIZE: 1G
- VCPUS: 1
- HOSTNAME: zkserver
+- morph: systems/zookeeper-client-x86_64.morph
+ deploy:
+ my-client-system:
+ type: extensions/kvm
+ location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-client.img
+ DISK_SIZE: 4G
+ RAM_SIZE: 1G
+ VCPUS: 1
+ HOSTNAME: zkclient
+- morph: systems/zookeeper-server-x86_64.morph
+ deploy:
+ my-server-system:
+ type: extensions/kvm
+ location: kvm+ssh://username@HOSTNAME/machinename/path/to/zookeeper-server.img
+ DISK_SIZE: 4G
+ RAM_SIZE: 1G
+ VCPUS: 1
+ HOSTNAME: zkserver
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 00a614c9..ba50f873 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -64,7 +64,7 @@ chunks:
morph: strata/audio-bluetooth/ofono.morph
repo: upstream:ofono
ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
- unpetrify-ref: "1.15"
+ unpetrify-ref: '1.15'
build-depends:
- mobile-broadband-provider-info
- bluez
@@ -81,7 +81,7 @@ chunks:
- name: pulseaudio
morph: strata/audio-bluetooth/pulseaudio.morph
repo: upstream:pulseaudio
- ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7
+ ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7
unpetrify-ref: v6.0
build-depends:
- libsndfile
diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph
index 960a6452..be4cb557 100644
--- a/strata/audio-bluetooth/pulseaudio.morph
+++ b/strata/audio-bluetooth/pulseaudio.morph
@@ -5,7 +5,8 @@ build-system: autotools
pre-configure-commands:
- NOCONFIGURE=1 ./bootstrap.sh
configure-commands:
-- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system
+- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple
+ --with-systemduserunitdir=/lib/systemd/system
install-commands:
- make DESTDIR="$DESTDIR" install
- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
diff --git a/strata/bsp-jetson/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
index 33221a70..218091f4 100644
--- a/strata/bsp-jetson/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.morph
@@ -1,12 +1,14 @@
name: nouveau-drm
kind: chunk
build-commands:
- - sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c
- - cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
+- sed -e 's/.*android\/sync.*/#ifdef CONFIG_SYNC\n&\n#endif/' -i drm/nouveau/nouveau_fence.c
+- cd drm/nouveau && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules
install-commands:
- - cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install
+- cd drm/nouveau && make ARCH=arm M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR"
+ modules_install
system-integration:
- nouveau-drm-misc:
- 00-earlyconf:
- - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done)
- - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
+ nouveau-drm-misc:
+ 00-earlyconf:
+ - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko";
+ done)
+ - (cd /lib/modules && for version in *; do depmod -a "$version"; done)
diff --git a/strata/bsp-x86_both-tools.morph b/strata/bsp-x86_both-tools.morph
index f7212054..6ba8a753 100644
--- a/strata/bsp-x86_both-tools.morph
+++ b/strata/bsp-x86_both-tools.morph
@@ -13,7 +13,7 @@ chunks:
- name: syslinux
morph: strata/bsp-x86_both-tools/syslinux.morph
repo: upstream:syslinux
- ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
+ ref: d715b39c0801ecea5e52f9029cea7c76320f93cf
unpetrify-ref: baserock/morph
build-depends:
- nasm
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 0a6f4e68..a774e420 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -147,7 +147,7 @@ chunks:
morph: strata/build-essential/stage2-busybox.morph
repo: upstream:busybox
ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
- unpetrify-ref: 1_23_1
+ unpetrify-ref: '1_23_1'
build-depends:
- stage1-binutils
- stage1-gcc
@@ -305,7 +305,7 @@ chunks:
morph: strata/build-essential/busybox.morph
repo: upstream:busybox
ref: 1ecfe811fe2f70380170ef7d820e8150054e88ca
- unpetrify-ref: 1_23_1
+ unpetrify-ref: '1_23_1'
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index 83c05bb5..1bbd97a6 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -5,12 +5,14 @@ configure-commands:
# Busybox's default config has everything enabled.
- make defconfig KCONFIG_NOTIMESTAMP=1
-- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|' -i .config
-- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|' -i .config
+- sed -e 's|.*UDHCPC_DEFAULT_SCRIPT.*|CONFIG_UDHCPC_DEFAULT_SCRIPT="'"$PREFIX"/share/udhcpc/default.script'"|'
+ -i .config
+- sed -e 's|.*IFUPDOWN_IFSTATE_PATH.*|CONFIG_IFUPDOWN_IFSTATE_PATH="/run/ifstate"|'
+ -i .config
# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+ -i .config'
# We have GAWK, but in GENIVI baseline we want to get rid of it
# - sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
@@ -31,11 +33,16 @@ configure-commands:
- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
# General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+ set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+ -i .config
- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
@@ -52,8 +59,10 @@ configure-commands:
# Now turn on some little bits we do need
- sed -e 's/# CONFIG_BBCONFIG is not set/CONFIG_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/' -i .config
-- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/' -i .config
+- sed -e 's/# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set/CONFIG_FEATURE_COMPRESS_BBCONFIG=y/'
+ -i .config
+- sed -e 's/# CONFIG_FEATURE_MOUNT_HELPERS is not set/CONFIG_FEATURE_MOUNT_HELPERS=y/'
+ -i .config
build-commands:
@@ -64,7 +73,6 @@ install-commands:
if [ "$PREFIX" = /usr ]; then PREFIX=; fi &&
make CONFIG_PREFIX="$DESTDIR$PREFIX" KCONFIG_NOTIMESTAMP=1 install &&
chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-
# Set up man environment variables
- mkdir -p "$DESTDIR"/etc
- |
diff --git a/strata/build-essential/gcc.morph b/strata/build-essential/gcc.morph
index a9d25ac1..f16b3c0e 100644
--- a/strata/build-essential/gcc.morph
+++ b/strata/build-essential/gcc.morph
@@ -15,8 +15,7 @@ products:
# everything else gcc produces is required for compiling
# this is the -devel artifact instead of -misc, since it goes in -devel
# stratum artifacts by default
- include: [ .* ]
-
+ include: [.*]
configure-commands:
- mkdir o
@@ -58,7 +57,7 @@ build-commands:
install-commands:
- cd o && make DESTDIR="$DESTDIR" install
- ln -s gcc "$DESTDIR/$PREFIX/bin/cc"
-- >
+- |
for fortran_alias in f77 f90 f95; do
- ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
+ ln -s gfortran "$DESTDIR/$PREFIX/bin/$fortran_alias"
done
diff --git a/strata/build-essential/stage2-busybox.morph b/strata/build-essential/stage2-busybox.morph
index 73803f89..f271a40d 100644
--- a/strata/build-essential/stage2-busybox.morph
+++ b/strata/build-essential/stage2-busybox.morph
@@ -8,8 +8,8 @@ configure-commands:
- make HOSTCC="/usr/bin/gcc" CROSS_COMPILE=$TARGET_STAGE1- KCONFIG_NOTIMESTAMP=1 defconfig
# Avoid dividing applets between $PREFIX/[s]bin and $PREFIX/usr/[s]bin.
-- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/'' -i .config'
-
+- '[ "$PREFIX" = /usr ] || sed -e ''s/.*INSTALL_NO_USR.*/CONFIG_INSTALL_NO_USR=y/''
+ -i .config'
# We have GAWK.
- sed -e 's/CONFIG_AWK=y.*/# CONFIG_AWK is not set/' -i .config
@@ -30,13 +30,19 @@ configure-commands:
- sed -e 's/CONFIG_RMMOD=y.*/# CONFIG_RMMOD is not set/' -i .config
# General features that we don't need.
-- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_MOUNT_CIFS=y.*/# CONFIG_FEATURE_MOUNT_CIFS is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_EXTRA_QUIET=y.*/# CONFIG_FEATURE_EXTRA_QUIET is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_COREDUMPS=y.*/# CONFIG_FEATURE_INIT_COREDUMPS is not
+ set/' -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SCTTY=y.*/# CONFIG_FEATURE_INIT_SCTTY is not set/'
+ -i .config
+- sed -e 's/CONFIG_FEATURE_INIT_SYSLOG=y.*/# CONFIG_FEATURE_INIT_SYSLOG is not set/'
+ -i .config
- sed -e 's/CONFIG_FEATURE_INITRD=y.*/# CONFIG_FEATURE_INITRD is not set/' -i .config
-- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/' -i .config
+- sed -e 's/CONFIG_FEATURE_USE_INITTAB=y.*/# CONFIG_FEATURE_USE_INITTAB is not set/'
+ -i .config
- sed -e 's/CONFIG_FEATURE_MINIX2=y.*/# CONFIG_FEATURE_MINIX2 is not set/' -i .config
- sed -e 's/CONFIG_FSCK_MINIX=y.*/# CONFIG_FSCK_MINIX is not set/' -i .config
- sed -e 's/CONFIG_HALT=y.*/# CONFIG_HALT is not set/' -i .config
diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph
index cc954076..fa785e3c 100644
--- a/strata/ceph-service/boost.morph
+++ b/strata/ceph-service/boost.morph
@@ -3,6 +3,6 @@ kind: chunk
configure-commands:
- ./bootstrap.sh
build-commands:
-- ./b2
+- ./b2
install-commands:
- ./b2 install --prefix="$DESTDIR$PREFIX"
diff --git a/strata/ceph-service/ceph.morph b/strata/ceph-service/ceph.morph
index a6b06759..56d30ead 100644
--- a/strata/ceph-service/ceph.morph
+++ b/strata/ceph-service/ceph.morph
@@ -3,7 +3,8 @@ kind: chunk
build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops --without-libxfs
+- ./configure --with-nss --prefix="$PREFIX" --sysconfdir=/etc --without-fuse --without-libatomic-ops
+ --without-libxfs
build-commands:
- make
install-commands:
diff --git a/strata/ceph-service/leveldb.morph b/strata/ceph-service/leveldb.morph
index bff2b87a..2b97c6e6 100644
--- a/strata/ceph-service/leveldb.morph
+++ b/strata/ceph-service/leveldb.morph
@@ -4,6 +4,6 @@ build-commands:
- make
install-commands:
- mkdir -p "$DESTDIR$PREFIX"/lib
-- mkdir -p "$DESTDIR$PREFIX"/include
+- mkdir -p "$DESTDIR$PREFIX"/include
- cp --preserve=links libleveldb.* "$DESTDIR$PREFIX"/lib
- cp -r include/leveldb "$DESTDIR$PREFIX"/include
diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph
index f15e0968..05d1a9f9 100644
--- a/strata/chef/erubis-master.morph
+++ b/strata/chef/erubis-master.morph
@@ -1,4 +1,3 @@
----
name: erubis-master
kind: chunk
build-system: manual
@@ -10,7 +9,8 @@ configure-commands:
# Manually do what it seems like the 'rook' build system would do, if it worked
# Values taken from 'Rookbook.props'.
- find -type f -exec sed -e 's/\$Release\$/2.7.0/g' -i \{} \;
-- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com all rights reserved./g' -i \{} \;
+- find -type f -exec sed -e 's/\$Copyright\$/copyright(c) 2006-2011 kuwata-lab.com
+ all rights reserved./g' -i \{} \;
build-commands:
- gem build erubis.gemspec
install-commands:
diff --git a/strata/chef/hoe-master.morph b/strata/chef/hoe-master.morph
index 9fe7ff8e..1a468789 100644
--- a/strata/chef/hoe-master.morph
+++ b/strata/chef/hoe-master.morph
@@ -1,4 +1,3 @@
----
name: hoe-master
kind: chunk
build-system: manual
diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph
index d85d1567..7a21831d 100644
--- a/strata/chef/libyajl2-1.0.1.morph
+++ b/strata/chef/libyajl2-1.0.1.morph
@@ -9,5 +9,5 @@ build-commands:
- USE_SYSTEM_LIBYAJL2=yes gem build libyajl2.gemspec
install-commands:
- mkdir -p "$DESTDIR/$(gem environment home)"
-- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)" --bindir "$DESTDIR/$PREFIX/bin"
- --ignore-dependencies --local ./libyajl2-1.0.1.gem
+- USE_SYSTEM_LIBYAJL2=yes gem install --install-dir "$DESTDIR/$(gem environment home)"
+ --bindir "$DESTDIR/$PREFIX/bin" --ignore-dependencies --local ./libyajl2-1.0.1.gem
diff --git a/strata/chef/plist-master.morph b/strata/chef/plist-master.morph
index bef39f7d..7cf7cbb6 100644
--- a/strata/chef/plist-master.morph
+++ b/strata/chef/plist-master.morph
@@ -1,4 +1,3 @@
----
name: plist-master
kind: chunk
build-system: manual
diff --git a/strata/foundation/btrfs-progs.morph b/strata/foundation/btrfs-progs.morph
index 4e724dc9..807a115f 100644
--- a/strata/foundation/btrfs-progs.morph
+++ b/strata/foundation/btrfs-progs.morph
@@ -5,5 +5,4 @@ pre-configure-commands:
- ./autogen.sh
configure-commands:
# The change in the CFLAGS is needed to make the compilation succeed in armv5l
-- export CFLAGS="-O2 $CFLAGS";
- ./configure --prefix="$PREFIX" --disable-documentation
+- export CFLAGS="-O2 $CFLAGS"; ./configure --prefix="$PREFIX" --disable-documentation
diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph
index c3c89bcf..701d781a 100644
--- a/strata/foundation/time-zone-database.morph
+++ b/strata/foundation/time-zone-database.morph
@@ -7,4 +7,5 @@ install-commands:
# ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get
# installed. Note that tzselect from this chunk will overlap with and override
# the tzselect binary from GLIBC.
-- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install
+- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR"
+ install
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
index a614a831..4b0bdcc1 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.morph
@@ -4,12 +4,14 @@ build-system: autotools
pre-configure-commands:
# Tegra requires a new coherent BO attribute, not currently upstream, so
# patch it here
- - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1 << 4)' include/drm/nouveau_drm.h
+ - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1
+ << 4)' include/drm/nouveau_drm.h
- |
sed -i '/info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;/a\
if (bo->flags & NOUVEAU_BO_COHERENT)\
info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;' nouveau/abi16.c
- - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' nouveau/nouveau.h
+ - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000'
+ nouveau/nouveau.h
configure-commands:
- - NOCONFIGURE=1 ./autogen.sh
- - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
+- NOCONFIGURE=1 ./autogen.sh
+- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
diff --git a/strata/llvm-common/llvm.morph b/strata/llvm-common/llvm.morph
index 9d280062..d47d1837 100644
--- a/strata/llvm-common/llvm.morph
+++ b/strata/llvm-common/llvm.morph
@@ -3,6 +3,7 @@ kind: chunk
description: Low Level Virtual Machine
build-system: autotools
configure-commands:
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host --enable-optimized --disable-assertions
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --enable-shared --enable-targets=host
+ --enable-optimized --disable-assertions
build-commands:
- make $MAKEFLAGS
diff --git a/strata/lvm/lvm2.morph b/strata/lvm/lvm2.morph
index 9b4a68bf..49b5f0fc 100644
--- a/strata/lvm/lvm2.morph
+++ b/strata/lvm/lvm2.morph
@@ -8,7 +8,7 @@ configure-commands:
# '${exec_prefix}/sbin' in the generated .service files.
#
# udev rules *must* go in /lib, they'll be ignored if they go in /usr/lib.
-- >
+- |
./configure --prefix="$PREFIX" \
--sbindir="$PREFIX"/sbin \
--with-udev-prefix=/ \
diff --git a/strata/networking-utils.morph b/strata/networking-utils.morph
index 13a8c72f..880371cd 100644
--- a/strata/networking-utils.morph
+++ b/strata/networking-utils.morph
@@ -1,11 +1,11 @@
name: networking-utils
kind: stratum
description: |
- Stratum which contains utils to works with networks: create, enable, filter...
+ Stratum which contains utils to works with networks: create, enable, filter...
- This stratum requires kernel config flags which are not enabled in the default
- Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get
- an idea of what is needed.
+ This stratum requires kernel config flags which are not enabled in the default
+ Baserock kernel found in the BSP strata. See the Openstack BSP stratum to get
+ an idea of what is needed.
build-depends:
- morph: strata/foundation.morph
chunks:
diff --git a/strata/networking-utils/libnet.morph b/strata/networking-utils/libnet.morph
index c4f2b213..ddb2cf3e 100644
--- a/strata/networking-utils/libnet.morph
+++ b/strata/networking-utils/libnet.morph
@@ -8,7 +8,8 @@ pre-configure-commands:
- cd libnet && ./autogen.sh
configure-commands:
-- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes --with-pic
+- cd libnet && ./configure --prefix="$PREFIX" --disable-samples --enable-shared=yes
+ --with-pic
build-commands:
- cd libnet && make
install-commands:
diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph
index c412e1d0..8116a9f4 100644
--- a/strata/nfs/nfs-utils.morph
+++ b/strata/nfs/nfs-utils.morph
@@ -3,7 +3,8 @@ kind: chunk
build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
+- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal
+ --without-tcp-wrappers
install-commands:
- make DESTDIR="$DESTDIR" install
- mkdir -p "$DESTDIR"/lib/systemd/system
diff --git a/strata/ntpd/ntpd.morph b/strata/ntpd/ntpd.morph
index b13f4312..762762c7 100644
--- a/strata/ntpd/ntpd.morph
+++ b/strata/ntpd/ntpd.morph
@@ -2,7 +2,7 @@ name: ntpd
kind: chunk
build-system: autotools
configure-commands:
- - ./configure --prefix="$PREFIX" --enable-linuxcaps
+- ./configure --prefix="$PREFIX" --enable-linuxcaps
post-install-commands:
- |
cat > ntpd.service << EOF
diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph
index b82b5284..b66d0144 100644
--- a/strata/openstack-common.morph
+++ b/strata/openstack-common.morph
@@ -1,8 +1,8 @@
name: openstack-common
kind: stratum
description: |
- Stratum with the python packages needed to compile openstack
- clients and services.
+ Stratum with the python packages needed to compile openstack
+ clients and services.
build-depends:
- morph: strata/python-common.morph
- morph: strata/foundation.morph
diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph
index 6189527f..1feb1427 100644
--- a/strata/openstack-services.morph
+++ b/strata/openstack-services.morph
@@ -245,7 +245,7 @@ chunks:
morph: strata/openstack-services/qpid-python.morph
repo: upstream:python-packages/qpid-python
ref: 587b0febaf1996db1e483137ed6addb45580ee9e
- unpetrify-ref: 0.30
+ unpetrify-ref: '0.30'
- name: simplegeneric-tarball
repo: upstream:python-packages/simplegeneric-tarball
ref: 601fab9b154c557dfd848d531a8969f4697d1aa2
@@ -364,7 +364,6 @@ chunks:
unpetrify-ref: 0.9.0
build-depends:
- oslo-context
- build-depends:
- oslo-messaging
- posix-ipc-tarball
- name: keystonemiddleware
@@ -659,7 +658,7 @@ chunks:
morph: strata/openstack-services/tempest.morph
repo: upstream:openstack/tempest
ref: 26149b612d01ad605e4d0f41a2d67280c8088cda
- unpetrify-ref: "4"
+ unpetrify-ref: '4'
build-depends:
- tempest-lib
- name: tftp-hpa
diff --git a/strata/openstack-services/open-iscsi.morph b/strata/openstack-services/open-iscsi.morph
index 9d135ab2..6a0b73b3 100644
--- a/strata/openstack-services/open-iscsi.morph
+++ b/strata/openstack-services/open-iscsi.morph
@@ -6,7 +6,8 @@ install-commands:
# Rewrite prefix and exec_prefix which are set to "/usr" and "/" respectively
- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" install
# Install iscsistart app which is not listed by default in PROGRAMS
-- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart" install
+- make prefix="$PREFIX" exec_prefix="$PREFIX" DESTDIR="$DESTDIR" PROGRAMS="usr/iscsistart"
+ install
post-install-commands:
# Configure iscsi daemon
# Point the startup to the installed binary
diff --git a/strata/python-tools.morph b/strata/python-tools.morph
index a84697af..e380530f 100644
--- a/strata/python-tools.morph
+++ b/strata/python-tools.morph
@@ -1,7 +1,7 @@
name: python-tools
kind: stratum
-description: "A stratum for non-essential python tools:
-useful python tools that we don't want to include in core."
+description: |
+ A stratum for useful python tools that we don't want to include in core.
build-depends:
- morph: strata/python-core.morph
chunks:
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
index 53d5a682..bb86d6b5 100644
--- a/strata/qt5-tools-qtwebkit.morph
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -10,7 +10,7 @@ chunks:
morph: strata/qt5-tools/qtwebkit.morph
repo: upstream:qt5/qtwebkit
ref: 586bdc38324dfaeec65389bf7646c82cb35db017
- unpetrify-ref: "5.4.2"
+ unpetrify-ref: 5.4.2
- name: qtwebkit-examples
morph: strata/qt5-tools/qtwebkit-examples.morph
repo: upstream:qt5/qtwebkit-examples
diff --git a/strata/tools/gdb.morph b/strata/tools/gdb.morph
index 808ff7d7..6f60da9e 100644
--- a/strata/tools/gdb.morph
+++ b/strata/tools/gdb.morph
@@ -2,4 +2,5 @@ name: gdb
kind: chunk
build-system: autotools
configure-commands:
-- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof
+- ./configure --prefix="$PREFIX" --disable-werror --disable-gas --disable-binutils
+ --disable-ld --disable-gold --disable-gprof
diff --git a/strata/tools/procps-ng.morph b/strata/tools/procps-ng.morph
index 69df3d4a..e030b36c 100644
--- a/strata/tools/procps-ng.morph
+++ b/strata/tools/procps-ng.morph
@@ -9,11 +9,11 @@ description: |
build-system: autotools
configure-commands:
- - NOCONFIGURE=1 ./autogen.sh
+- NOCONFIGURE=1 ./autogen.sh
# Setting exec-prefix to /usr causes a bunch of stuff to go in /usr/usr/bin
# Setting prefix to / causes files to go in /include and /share
# So don't do either of those things!
- - ./configure --prefix="$PREFIX" --exec-prefix=/
+- ./configure --prefix="$PREFIX" --exec-prefix=/
post-install-commands:
# We need to link the binaries into /bin so that they override the Busybox
diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph
index 2db03d87..acb094ea 100644
--- a/strata/unionfs-fuse-group.morph
+++ b/strata/unionfs-fuse-group.morph
@@ -1,21 +1,20 @@
name: unionfs-fuse-group
kind: stratum
-description:
+description: |
User-space union file system.
- This is used by Morph for systems which are unable to use 'overlayfs'.
- It is slower than 'overlayfs', because it runs outside rather than
- inside the kernel, but 'overlayfs' is only available in Linux 3.18 and
- newer.
+ This is used by Morph for systems which are unable to use 'overlayfs'. It is slower
+ than 'overlayfs', because it runs outside rather than inside the kernel, but 'overlayfs'
+ is only available in Linux 3.18 and newer.
build-depends:
# Depends on foundation for 'fuse', and maybe other stuff.
- morph: strata/foundation.morph
chunks:
- - name: unionfs-fuse
- morph: strata/unionfs-fuse-group/unionfs-fuse.morph
- repo: upstream:unionfs-fuse
- ref: efac5b7aa91ec860f8f430a8d21060fe53a07002
- unpetrify-ref: v0.26
+- name: unionfs-fuse
+ morph: strata/unionfs-fuse-group/unionfs-fuse.morph
+ repo: upstream:unionfs-fuse
+ ref: efac5b7aa91ec860f8f430a8d21060fe53a07002
+ unpetrify-ref: v0.26
diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph
index 9b8ac2c7..98e1ce1f 100644
--- a/strata/unionfs-fuse-group/unionfs-fuse.morph
+++ b/strata/unionfs-fuse-group/unionfs-fuse.morph
@@ -1,8 +1,7 @@
name: unionfs-fuse
kind: chunk
-description:
- User-space union file system.
+description: User-space union file system.
build-system: manual
diff --git a/strata/virtualization.morph b/strata/virtualization.morph
index f2f1a401..ae9a7ea5 100644
--- a/strata/virtualization.morph
+++ b/strata/virtualization.morph
@@ -1,10 +1,10 @@
name: virtualization
kind: stratum
description: |
- Virtualization for baserock
- NOTE: this stratum requires kernel support, please see openstack bsp
- kernel history to check which config are needed for openvswitch or libvirt,
- for example.
+ Virtualization for baserock
+ NOTE: this stratum requires kernel support, please see openstack bsp
+ kernel history to check which config are needed for openvswitch or libvirt,
+ for example.
build-depends:
- morph: strata/libsoup-common.morph
- morph: strata/python-core.morph
diff --git a/strata/x-common.morph b/strata/x-common.morph
index 28e04fcc..33d7b5b6 100644
--- a/strata/x-common.morph
+++ b/strata/x-common.morph
@@ -100,7 +100,7 @@ chunks:
- name: xcb-proto
repo: upstream:xcb-proto
ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640
- unpetrify-ref: "1.11"
+ unpetrify-ref: '1.11'
- name: xorg-lib-libxshmfence
repo: upstream:xorg-lib-libxshmfence
ref: 9c4f070e1304a3503cfab08f68573443025fc4c9
@@ -116,7 +116,7 @@ chunks:
- name: xcb-libxcb
repo: upstream:xcb-libxcb
ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a
- unpetrify-ref: "1.11"
+ unpetrify-ref: '1.11'
build-depends:
- xcb-proto
- xorg-lib-libXau
diff --git a/strata/xstatic.morph b/strata/xstatic.morph
index 0b400dff..deb9d1ec 100644
--- a/strata/xstatic.morph
+++ b/strata/xstatic.morph
@@ -1,13 +1,13 @@
name: xstatic
kind: stratum
description: |
- Stratum with Xstatic and some xstatic libraries.
+ Stratum with Xstatic and some xstatic libraries.
- XStatic is a packaging standard to package external static files as
- a python package, so they are easily usable on all OSes.
+ XStatic is a packaging standard to package external static files as
+ a python package, so they are easily usable on all OSes.
- This conflicts with the 'everything from Git' policy of Baserock,
- but it is required right now for the Openstack system to work.
+ This conflicts with the 'everything from Git' policy of Baserock,
+ but it is required right now for the Openstack system to work.
build-depends:
- morph: strata/foundation.morph
- morph: strata/python-core.morph
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index 97acd2ca..483a3fde 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,6 +1,7 @@
name: zookeeper-server
kind: stratum
-description: This Stratum installs a zookeeper server and small program to populate it with default data.
+description: This Stratum installs a zookeeper server and small program to populate
+ it with default data.
build-depends:
- morph: strata/zookeeper.morph
chunks:
diff --git a/strata/zookeeper/zookeeper-client.morph b/strata/zookeeper/zookeeper-client.morph
index 591c1840..7bc99f08 100644
--- a/strata/zookeeper/zookeeper-client.morph
+++ b/strata/zookeeper/zookeeper-client.morph
@@ -1,17 +1,17 @@
name: zookeeper-client
kind: chunk
build-commands:
- - mkdir -p "$DESTDIR$PREFIX"/zookeeper-client
- - cp -r * "$DESTDIR$PREFIX"/zookeeper-client
- - make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper-client
+- cp -r * "$DESTDIR$PREFIX"/zookeeper-client
+- make -C "$DESTDIR$PREFIX"/zookeeper-client/ZKTest/Release/
post-install-commands:
- - |
- install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service
- [unit]
- Description=Zookeeper client init
- [Service]
- ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198
- RemainAfterExit=yes
- [Install]
- WantedBy=multi-user.target
- EOF
+- |
+ install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-client.service
+ [unit]
+ Description=Zookeeper client init
+ [Service]
+ ExecStart=/usr/zookeeper-client/ZKTest/Release/ZKTest nodeTypeOne 10.24.1.198
+ RemainAfterExit=yes
+ [Install]
+ WantedBy=multi-user.target
+ EOF
diff --git a/strata/zookeeper/zookeeper-server.morph b/strata/zookeeper/zookeeper-server.morph
index 082c063c..502bbda3 100644
--- a/strata/zookeeper/zookeeper-server.morph
+++ b/strata/zookeeper/zookeeper-server.morph
@@ -1,30 +1,30 @@
name: zookeeper-server
kind: chunk
build-commands:
- - mkdir -p "$DESTDIR$PREFIX"/zookeeper_server
- - cp -r * "$DESTDIR$PREFIX"/zookeeper_server
- - make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper_server
+- cp -r * "$DESTDIR$PREFIX"/zookeeper_server
+- make -C "$DESTDIR$PREFIX"/zookeeper_server/zkServerFileSetup/Release/
post-install-commands:
- - |
- install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service
- [unit]
- Description=Zookeeper server
- [Service]
- ExecStart=/usr/zookeeper/bin/zkServer.sh start
- RemainAfterExit=yes
- [Install]
- WantedBy=multi-user.target
- EOF
- - |
- install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service
- [unit]
- Description=Zookeeper server init
- [Service]
- ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup
- RemainAfterExit=no
- [Install]
- WantedBy=multi-user.target
- EOF
- - mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants
- - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service
- - ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service
+- |
+ install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-server.service
+ [unit]
+ Description=Zookeeper server
+ [Service]
+ ExecStart=/usr/zookeeper/bin/zkServer.sh start
+ RemainAfterExit=yes
+ [Install]
+ WantedBy=multi-user.target
+ EOF
+- |
+ install -D -m 644 /proc/self/fd/0 << 'EOF' "$DESTDIR"/etc/systemd/system/zookeeper-init.service
+ [unit]
+ Description=Zookeeper server init
+ [Service]
+ ExecStart=/usr/zookeeper_server/zkServerFileSetup/Release/zkServerFileSetup
+ RemainAfterExit=no
+ [Install]
+ WantedBy=multi-user.target
+ EOF
+- mkdir "$DESTDIR"/etc/systemd/system/multi-user.target.wants
+- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-server.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-server.service
+- ln -s "$DESTDIR"/etc/systemd/system/zookeeper-init.service "$DESTDIR"/etc/systemd/system/multi-user.target.wants/zookeeper-init.service
diff --git a/strata/zookeeper/zookeeper.morph b/strata/zookeeper/zookeeper.morph
index dbe6ccbb..db446a1b 100644
--- a/strata/zookeeper/zookeeper.morph
+++ b/strata/zookeeper/zookeeper.morph
@@ -1,14 +1,14 @@
name: zookeeper
kind: chunk
configure-commands:
- - mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
+- mkdir -p "$DESTDIR$PREFIX"/lib/zookeeper
build-commands:
- - ant -p compile_jute
- - mkdir -p "$DESTDIR$PREFIX"/zookeeper
- - cp -r * "$DESTDIR$PREFIX"/zookeeper
- - cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
- - cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
- - make -C "$DESTDIR$PREFIX"/zookeeper/src/c
- - cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
- - mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg
- - make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
+- ant -p compile_jute
+- mkdir -p "$DESTDIR$PREFIX"/zookeeper
+- cp -r * "$DESTDIR$PREFIX"/zookeeper
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && autoreconf -i
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && ./configure --prefix="$PREFIX" --libdir="$PREFIX"/lib/
+- make -C "$DESTDIR$PREFIX"/zookeeper/src/c
+- cd "$DESTDIR$PREFIX"/zookeeper/src/c && make install
+- mv "$DESTDIR$PREFIX"/zookeeper/conf/zoo_sample.cfg "$DESTDIR$PREFIX"/zookeeper/conf/zoo.cfg
+- make -C "$DESTDIR$PREFIX"/zookeeper/src/c zktest-mt
diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph
index 228c4282..0630fe9b 100644
--- a/systems/build-system-armv7lhf-highbank.morph
+++ b/systems/build-system-armv7lhf-highbank.morph
@@ -1,6 +1,7 @@
name: build-system-armv7lhf-highbank
kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float Calxeda Highbank computers.
+description: The system that should be used for building all other Baserock systems
+ for ARMv7 little-endian hard-float Calxeda Highbank computers.
arch: armv7lhf
strata:
- name: build-essential
diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph
index 137d8384..632747ce 100644
--- a/systems/build-system-armv7lhf-jetson.morph
+++ b/systems/build-system-armv7lhf-jetson.morph
@@ -1,6 +1,7 @@
name: build-system-armv7lhf-jetson
kind: system
-description: The system that should be used for building all other Baserock systems for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+description: The system that should be used for building all other Baserock systems
+ for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
arch: armv7lhf
strata:
- name: build-essential
diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph
index 8ce13dc7..4fcf78eb 100644
--- a/systems/build-system-ppc64.morph
+++ b/systems/build-system-ppc64.morph
@@ -1,6 +1,7 @@
name: build-system-ppc64
kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit POWER computers.
+description: The system that should be used for building all other Baserock systems
+ for 64-bit POWER computers.
arch: ppc64
strata:
- name: build-essential
diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph
index 755d0e69..5269d5cf 100644
--- a/systems/build-system-x86_32-chroot.morph
+++ b/systems/build-system-x86_32-chroot.morph
@@ -1,6 +1,7 @@
name: build-system-x86_32-chroot
kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers, chroot variant.
+description: The system that should be used for building all other Baserock systems
+ for 32-bit Intel x86 computers, chroot variant.
arch: x86_32
strata:
- name: build-essential
diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph
index dd338241..672d2495 100644
--- a/systems/build-system-x86_32.morph
+++ b/systems/build-system-x86_32.morph
@@ -1,6 +1,7 @@
name: build-system-x86_32
kind: system
-description: The system that should be used for building all other Baserock systems for 32-bit Intel x86 computers.
+description: The system that should be used for building all other Baserock systems
+ for 32-bit Intel x86 computers.
arch: x86_32
strata:
- name: build-essential
diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph
index 52c64d67..fa7d4fb8 100644
--- a/systems/build-system-x86_64-chroot.morph
+++ b/systems/build-system-x86_64-chroot.morph
@@ -1,6 +1,7 @@
name: build-system-x86_64-chroot
kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers, chroot variant.
+description: The system that should be used for building all other Baserock systems
+ for 64-bit Intel x86 computers, chroot variant.
arch: x86_64
strata:
- name: build-essential
diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph
index 93ecfb70..b8eb0fdf 100644
--- a/systems/build-system-x86_64.morph
+++ b/systems/build-system-x86_64.morph
@@ -1,6 +1,7 @@
name: build-system-x86_64
kind: system
-description: The system that should be used for building all other Baserock systems for 64-bit Intel x86 computers.
+description: The system that should be used for building all other Baserock systems
+ for 64-bit Intel x86 computers.
arch: x86_64
strata:
- name: build-essential
diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph
index d3a04738..7a5fc855 100644
--- a/systems/installer-system-armv8b64.morph
+++ b/systems/installer-system-armv8b64.morph
@@ -1,6 +1,7 @@
name: installer-system-armv8b64
kind: system
-description: The system that should be used as an Installer to install other Baserock systems.
+description: The system that should be used as an Installer to install other Baserock
+ systems.
arch: armv8b64
strata:
- name: build-essential
diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph
index 62038cd5..2119d103 100644
--- a/systems/installer-system-x86_64.morph
+++ b/systems/installer-system-x86_64.morph
@@ -1,6 +1,7 @@
name: installer-system-x86_64
kind: system
-description: The system that should be used as an Installer to install other Baserock systems.
+description: The system that should be used as an Installer to install other Baserock
+ systems.
arch: x86_64
strata:
- name: build-essential
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index 78ddc8b4..2c5dcc19 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -1,6 +1,7 @@
name: weston-system-armv7lhf-jetson
kind: system
-description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 computers.
+description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1
+ computers.
arch: armv7lhf
strata:
- name: build-essential