From f398e6501b400f6c32fb4d1ba920ac41d09a9795 Mon Sep 17 00:00:00 2001 From: Adam Coldrick Date: Tue, 28 Apr 2015 13:10:58 +0000 Subject: Morph build deffc157ea9749848e5770b25da08214 System branch: master --- clusters/ci.morph | 55 +++- clusters/jetson-upgrade.morph | 3 +- clusters/openstack-installer.morph | 237 ----------------- clusters/openstack-one-node.morph | 1 + clusters/openstack-three-node-installer.morph | 286 +++++++++++++++++++++ clusters/openstack-two-node-installer.morph | 4 +- clusters/release.morph | 6 +- ntpd.configure | 54 ---- openstack-cinder.configure | 2 +- openstack-ironic.configure | 51 ++-- openstack/manifest | 4 +- .../usr/lib/systemd/system/iscsi-setup.service | 12 + .../openstack-ceilometer-alarm-evaluator.service | 2 +- .../openstack-ceilometer-alarm-notifier.service | 2 +- .../system/openstack-ceilometer-api.service | 2 +- .../system/openstack-ceilometer-collector.service | 2 +- .../system/openstack-ceilometer-setup.service | 3 +- .../system/openstack-cinder-iscsi-setup.service | 12 - .../systemd/system/openstack-cinder-setup.service | 9 - .../system/openstack-neutron-db-setup.service | 2 +- .../systemd/system/openstack-nova-db-setup.service | 2 +- openstack/usr/share/openstack/cinder-iscsi.yml | 15 -- openstack/usr/share/openstack/iscsi.yml | 15 ++ .../bsp-armv7-highbank/linux-armv7-highbank.morph | 1 + .../linux-armv7-versatile.morph | 2 + .../linux-armv7b-highbank.morph | 1 + .../linux-armv7b-vexpress-tc2.morph | 2 + .../linux-armv8b64-generic.morph | 2 + .../linux-armv8l64-generic.morph | 2 + strata/bsp-jetson/linux-jetson-tk1.morph | 2 + strata/bsp-ppc64-generic/linux-ppc64.morph | 2 + strata/bsp-wandboard/linux-armv7-wandboard.morph | 2 + .../bsp-x86_32-generic/linux-x86-32-generic.morph | 2 + .../bsp-x86_64-generic/linux-x86-64-generic.morph | 2 + strata/foundation.morph | 4 +- strata/libsoup-common.morph | 10 + strata/libsoup-common/libsoup.morph | 6 + strata/morph-utils.morph | 5 +- strata/nfs.morph | 2 +- strata/ntpd/ntpd.morph | 41 +++ strata/openstack-services.morph | 41 +-- strata/openstack-services/ceilometer.morph | 2 +- strata/ostree-core.morph | 17 ++ strata/python-pygobject.morph | 13 + strata/python-pygobject/pygobject.morph | 5 + strata/trove.morph | 2 +- strata/unionfs-fuse-group.morph | 13 + strata/unionfs-fuse-group/unionfs-fuse.morph | 7 + strata/virtualization.morph | 15 +- strata/virtualization/libsoup.morph | 6 - strata/virtualization/pygobject.morph | 5 - swift/etc/ntp.conf | 4 + swift/manifest | 2 +- systems/build-system-armv7lhf-highbank.morph | 8 + systems/build-system-armv7lhf-jetson.morph | 6 + systems/build-system-armv8b64.morph | 6 + systems/build-system-armv8l64.morph | 6 + systems/build-system-ppc64.morph | 6 + systems/build-system-x86_32-chroot.morph | 6 + systems/build-system-x86_32.morph | 6 + systems/build-system-x86_64-chroot.morph | 6 + systems/build-system-x86_64.morph | 6 + systems/ceph-service-x86_64-generic.morph | 6 + .../cross-bootstrap-system-armv7lhf-generic.morph | 10 + .../cross-bootstrap-system-armv8b64-generic.morph | 10 + .../cross-bootstrap-system-armv8l64-generic.morph | 10 + systems/cross-bootstrap-system-ppc64-generic.morph | 10 + .../cross-bootstrap-system-x86_64-generic.morph | 10 + systems/devel-system-armv7-chroot.morph | 6 + systems/devel-system-armv7-highbank.morph | 8 + systems/devel-system-armv7-versatile.morph | 6 + systems/devel-system-armv7-wandboard.morph | 6 + systems/devel-system-armv7b-chroot.morph | 6 + systems/devel-system-armv7b-highbank.morph | 8 + systems/devel-system-armv7lhf-chroot.morph | 6 + systems/devel-system-armv7lhf-highbank.morph | 8 + systems/devel-system-armv7lhf-jetson.morph | 6 + systems/devel-system-armv7lhf-wandboard.morph | 6 + systems/devel-system-armv8b64.morph | 6 + systems/devel-system-armv8l64.morph | 6 + systems/devel-system-ppc64-chroot.morph | 6 + systems/devel-system-ppc64-generic.morph | 6 + systems/devel-system-x86_32-chroot.morph | 6 + systems/devel-system-x86_32-generic.morph | 6 + systems/devel-system-x86_64-chroot.morph | 6 + systems/devel-system-x86_64-generic.morph | 6 + systems/devel-system-x86_64-vagrant.morph | 6 + systems/installer-system-armv8b64.morph | 6 + systems/installer-system-x86_64.morph | 6 + systems/openstack-system-x86_64.morph | 4 + systems/swift-system-x86_64.morph | 1 - systems/trove-system-x86_64.morph | 6 + systems/xfce-system.morph | 6 + 93 files changed, 831 insertions(+), 431 deletions(-) delete mode 100644 clusters/openstack-installer.morph create mode 100644 clusters/openstack-three-node-installer.morph delete mode 100644 ntpd.configure create mode 100644 openstack/usr/lib/systemd/system/iscsi-setup.service delete mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service delete mode 100644 openstack/usr/lib/systemd/system/openstack-cinder-setup.service delete mode 100644 openstack/usr/share/openstack/cinder-iscsi.yml create mode 100644 openstack/usr/share/openstack/iscsi.yml create mode 100644 strata/libsoup-common.morph create mode 100644 strata/libsoup-common/libsoup.morph create mode 100644 strata/ostree-core.morph create mode 100644 strata/python-pygobject.morph create mode 100644 strata/python-pygobject/pygobject.morph create mode 100644 strata/unionfs-fuse-group.morph create mode 100644 strata/unionfs-fuse-group/unionfs-fuse.morph delete mode 100644 strata/virtualization/libsoup.morph delete mode 100644 strata/virtualization/pygobject.morph diff --git a/clusters/ci.morph b/clusters/ci.morph index 2c391477..8322b170 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -20,16 +20,17 @@ systems: DISK_SIZE: 4G - morph: systems/build-system-armv7lhf-jetson.morph deploy: - devel-system-armv7lhf-jetson: + build-system-armv7lhf-jetson: type: rawdisk location: build-system-armv7lhf-jetson.img BOOTLOADER_CONFIG_FORMAT: extlinux BOOTLOADER_INSTALL: none + BOOT_DEVICE: /dev/mmcblk0p1 DISK_SIZE: 2G DTB_PATH: boot/tegra124-jetson-tk1.dtb KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - ROOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 - morph: systems/weston-system-x86_64-generic.morph deploy: weston-system-x86_64-generic: @@ -44,8 +45,56 @@ systems: location: weston-system-armv7lhf-jetson.img BOOTLOADER_CONFIG_FORMAT: extlinux BOOTLOADER_INSTALL: none + BOOT_DEVICE: /dev/mmcblk0p1 DISK_SIZE: 4G DTB_PATH: boot/tegra124-jetson-tk1.dtb KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - ROOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 +- morph: systems/openstack-system-x86_64.morph + deploy: + openstack-system-x86_64: + type: rawdisk + location: baserock-openstack-system-x86_64.img + CEILOMETER_DB_PASSWORD: veryinsecure + CEILOMETER_DB_USER: ceilometerDB + CEILOMETER_SERVICE_PASSWORD: veryinsecure + CEILOMETER_SERVICE_USER: ceilometer + CINDER_DB_PASSWORD: veryinsecure + CINDER_DB_USER: cinderDB + CINDER_DEVICE: /dev/sdb + CINDER_SERVICE_PASSWORD: veryinsecure + CINDER_SERVICE_USER: cinder + CONTROLLER_HOST_ADDRESS: onenode + DISK_SIZE: 5G + GLANCE_DB_PASSWORD: veryinsecure + GLANCE_DB_USER: glanceDB + GLANCE_SERVICE_PASSWORD: veryinsecure + GLANCE_SERVICE_USER: glance + HOSTNAME: onenode + HOSTS_CONTROLLER: 127.0.0.1 onenode + INSTALL_FILES: openstack/manifest + IRONIC_DB_PASSWORD: veryinsecure + IRONIC_DB_USER: ironicDB + IRONIC_SERVICE_PASSWORD: veryinsecure + IRONIC_SERVICE_USER: ironic + KEYSTONE_ADMIN_PASSWORD: veryinsecure + KEYSTONE_DB_PASSWORD: veryinsecure + KEYSTONE_DB_USER: keystoneDB + KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 + MANAGEMENT_INTERFACE_IP_ADDRESS: 127.0.0.1 + METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret + METERING_SECRET: insecureceilometersecret + NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_DB_USER: neutronDB + NEUTRON_SERVICE_PASSWORD: veryinsecure + NEUTRON_SERVICE_USER: neutron + NOVA_DB_PASSWORD: veryinsecure + NOVA_DB_USER: novaDB + NOVA_SERVICE_PASSWORD: veryinsecure + NOVA_SERVICE_USER: nova + NOVA_VIRT_TYPE: qemu + RABBITMQ_HOST: onenode + RABBITMQ_PASSWORD: veryinsecure + RABBITMQ_PORT: 5672 + RABBITMQ_USER: rabbitmq diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph index 93e0d443..30479a87 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph @@ -5,11 +5,12 @@ systems: deploy-defaults: BOOTLOADER_CONFIG_FORMAT: extlinux BOOTLOADER_INSTALL: none + BOOT_DEVICE: /dev/mmcblk0p1 DTB_PATH: boot/tegra124-jetson-tk1.dtb FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2 KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - ROOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 TROVE_HOST: TROVE_HOST TROVE_ID: TROVE_ID deploy: diff --git a/clusters/openstack-installer.morph b/clusters/openstack-installer.morph deleted file mode 100644 index c158c448..00000000 --- a/clusters/openstack-installer.morph +++ /dev/null @@ -1,237 +0,0 @@ -name: openstack-installer -kind: cluster -description: |2 - - This cluster creates disk images that may be `dd`'d onto install media to - produce an OpenStack cluster when instanciated. - - Alternatively it may be used to install directly onto a physical disk by - running: - - morph deploy clusters/openstack-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 ane networking configuration. -systems: -- morph: systems/installer-system-x86_64.morph - deploy: - network-installer: - type: rawdisk - location: installer-openstack-network-x86_64.img - DISK_SIZE: 6G - HOSTNAME: installer-x86_64 - INITRAMFS_PATH: boot/initramfs.gz - INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f - INSTALLER_ROOTFS_TO_INSTALL: /rootfs - INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda - KERNEL_ARGS: init=/usr/lib/baserock-installer/installer - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - network-initramfs: &id001 - type: initramfs - location: boot/initramfs.gz - - morph: systems/openstack-system-x86_64.morph - deploy: - network-to-install: - type: sysroot - location: rootfs - CINDER_DB_PASSWORD: veryinsecure - CINDER_DB_USER: cinderDB - CINDER_DEVICE: /dev/sdb - CINDER_ENABLE_COMPUTE: false - CINDER_ENABLE_CONTROLLER: false - CINDER_ENABLE_STORAGE: false - CINDER_SERVICE_PASSWORD: veryinsecure - CINDER_SERVICE_USER: cinder - CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt - EXTERNAL_INTERFACE: enp3s0 - GLANCE_DB_PASSWORD: veryinsecure - GLANCE_DB_USER: glanceDB - GLANCE_SERVICE_PASSWORD: veryinsecure - GLANCE_SERVICE_USER: glance - HOSTNAME: threenode-network - HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt - HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt - HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt - HOSTS_SELF: 10.24.1.83 threenode-network - INITRAMFS_PATH: boot/initramfs.gz - INSTALL_FILES: openstack/manifest - KEYSTONE_ADMIN_PASSWORD: veryinsecure - KEYSTONE_DB_PASSWORD: veryinsecure - KEYSTONE_DB_USER: keystoneDB - KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 - MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1 - METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret - NETWORK_CONFIG: enp3s0:dhcp;enp2s0:static,address=10.0.0.1,netmask=255.255.255.0 - NEUTRON_DB_PASSWORD: veryinsecure - NEUTRON_DB_USER: neutronDB - NEUTRON_ENABLE_AGENT: false - NEUTRON_ENABLE_CONTROLLER: false - NEUTRON_ENABLE_MANAGER: true - NEUTRON_SERVICE_PASSWORD: veryinsecure - NEUTRON_SERVICE_USER: neutron - NOVA_DB_PASSWORD: veryinsecure - NOVA_DB_USER: novaDB - NOVA_ENABLE_COMPUTE: false - NOVA_ENABLE_CONTROLLER: false - NOVA_SERVICE_PASSWORD: veryinsecure - NOVA_SERVICE_USER: nova - NOVA_VIRT_TYPE: kvm - RABBITMQ_HOST: threenode-controller.os-mgmt - RABBITMQ_PASSWORD: veryinsecure - RABBITMQ_PORT: 5672 - RABBITMQ_USER: rabbitmq - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - network-to-install-initramfs: *id001 -- morph: systems/installer-system-x86_64.morph - deploy: - controller-installer: - type: rawdisk - location: installer-openstack-controller-x86_64.img - DISK_SIZE: 6G - HOSTNAME: installer-x86_64 - INITRAMFS_PATH: boot/initramfs.gz - INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f - INSTALLER_ROOTFS_TO_INSTALL: /rootfs - INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda - KERNEL_ARGS: init=/usr/lib/baserock-installer/installer - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - controller-initramfs: *id001 - - morph: systems/openstack-system-x86_64.morph - deploy: - controller-to-install: - type: sysroot - location: rootfs - CINDER_DB_PASSWORD: veryinsecure - CINDER_DB_USER: cinderDB - CINDER_DEVICE: /dev/sdb - CINDER_ENABLE_COMPUTE: false - CINDER_ENABLE_CONTROLLER: true - CINDER_ENABLE_STORAGE: false - CINDER_SERVICE_PASSWORD: veryinsecure - CINDER_SERVICE_USER: cinder - CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt - EXTERNAL_INTERFACE: enp2s0 - GLANCE_DB_PASSWORD: veryinsecure - GLANCE_DB_USER: glanceDB - GLANCE_SERVICE_PASSWORD: veryinsecure - GLANCE_SERVICE_USER: glance - HOSTNAME: threenode-controller - HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt - HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt - HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt - HOSTS_SELF: 10.0.0.2 threenode-controller - INITRAMFS_PATH: boot/initramfs.gz - INSTALL_FILES: openstack/manifest - KEYSTONE_ADMIN_PASSWORD: veryinsecure - KEYSTONE_DB_PASSWORD: veryinsecure - KEYSTONE_DB_USER: keystoneDB - KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 - MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.2 - METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret - NETWORK_CONFIG: enp2s0:dhcp;enp0s26u1u2:static,address=10.0.0.2,netmask=255.255.255.0 - NEUTRON_DB_PASSWORD: veryinsecure - NEUTRON_DB_USER: neutronDB - NEUTRON_ENABLE_AGENT: false - NEUTRON_ENABLE_CONTROLLER: true - NEUTRON_ENABLE_MANAGER: false - NEUTRON_SERVICE_PASSWORD: veryinsecure - NEUTRON_SERVICE_USER: neutron - NOVA_DB_PASSWORD: veryinsecure - NOVA_DB_USER: novaDB - NOVA_ENABLE_COMPUTE: false - NOVA_ENABLE_CONTROLLER: true - NOVA_SERVICE_PASSWORD: veryinsecure - NOVA_SERVICE_USER: nova - NOVA_VIRT_TYPE: kvm - RABBITMQ_HOST: threenode-controller.os-mgmt - RABBITMQ_PASSWORD: veryinsecure - RABBITMQ_PORT: 5672 - RABBITMQ_USER: rabbitmq - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - controller-to-install-initramfs: *id001 -- morph: systems/installer-system-x86_64.morph - deploy: - compute-installer: - type: rawdisk - location: installer-openstack-compute-x86_64.img - DISK_SIZE: 6G - HOSTNAME: installer-x86_64 - INITRAMFS_PATH: boot/initramfs.gz - INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f - INSTALLER_ROOTFS_TO_INSTALL: /rootfs - INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda - KERNEL_ARGS: init=/usr/lib/baserock-installer/installer - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - compute-initramfs: *id001 - - morph: systems/openstack-system-x86_64.morph - deploy: - compute-to-install: - type: sysroot - location: rootfs - CINDER_DB_PASSWORD: veryinsecure - CINDER_DB_USER: cinderDB - CINDER_DEVICE: /dev/sdb - CINDER_ENABLE_COMPUTE: true - CINDER_ENABLE_CONTROLLER: false - CINDER_ENABLE_STORAGE: true - CINDER_SERVICE_PASSWORD: veryinsecure - CINDER_SERVICE_USER: cinder - CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt - EXTERNAL_INTERFACE: eno1 - GLANCE_DB_PASSWORD: veryinsecure - GLANCE_DB_USER: glanceDB - GLANCE_SERVICE_PASSWORD: veryinsecure - GLANCE_SERVICE_USER: glance - HOSTNAME: threenode-compute - HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt - HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt - HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt - HOSTS_SELF: 10.0.0.3 threenode-compute - INITRAMFS_PATH: boot/initramfs.gz - INSTALL_FILES: openstack/manifest - KEYSTONE_ADMIN_PASSWORD: veryinsecure - KEYSTONE_DB_PASSWORD: veryinsecure - KEYSTONE_DB_USER: keystoneDB - KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 - MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3 - METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret - NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0 - NEUTRON_DB_PASSWORD: veryinsecure - NEUTRON_DB_USER: neutronDB - NEUTRON_ENABLE_AGENT: true - NEUTRON_ENABLE_CONTROLLER: false - NEUTRON_ENABLE_MANAGER: false - NEUTRON_SERVICE_PASSWORD: veryinsecure - NEUTRON_SERVICE_USER: neutron - NOVA_DB_PASSWORD: veryinsecure - NOVA_DB_USER: novaDB - NOVA_ENABLE_COMPUTE: true - NOVA_ENABLE_CONTROLLER: false - NOVA_SERVICE_PASSWORD: veryinsecure - NOVA_SERVICE_USER: nova - NOVA_VIRT_TYPE: kvm - RABBITMQ_HOST: threenode-controller.os-mgmt - RABBITMQ_PASSWORD: veryinsecure - RABBITMQ_PORT: 5672 - RABBITMQ_USER: rabbitmq - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - compute-to-install-initramfs: *id001 diff --git a/clusters/openstack-one-node.morph b/clusters/openstack-one-node.morph index a7e3fa98..b109ae2b 100644 --- a/clusters/openstack-one-node.morph +++ b/clusters/openstack-one-node.morph @@ -60,6 +60,7 @@ systems: INSTALL_FILES: openstack/manifest IRONIC_DB_PASSWORD: veryinsecure IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: true IRONIC_SERVICE_PASSWORD: veryinsecure IRONIC_SERVICE_USER: ironic KEYSTONE_ADMIN_PASSWORD: veryinsecure diff --git a/clusters/openstack-three-node-installer.morph b/clusters/openstack-three-node-installer.morph new file mode 100644 index 00000000..4c476ea2 --- /dev/null +++ b/clusters/openstack-three-node-installer.morph @@ -0,0 +1,286 @@ +name: openstack-three-node-installer +kind: cluster +description: |2 + + 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-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 ane 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 and METADATA_PROXY_SHARED_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 + deploy: + network-installer: + type: rawdisk + location: installer-openstack-network-x86_64.img + DISK_SIZE: 6G + HOSTNAME: installer-x86_64 + INITRAMFS_PATH: boot/initramfs.gz + INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f + INSTALLER_ROOTFS_TO_INSTALL: /rootfs + INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda + KERNEL_ARGS: init=/usr/lib/baserock-installer/installer + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + network-initramfs: &id001 + type: initramfs + location: boot/initramfs.gz + - morph: systems/openstack-system-x86_64.morph + deploy: + network-to-install: + type: sysroot + location: rootfs + CINDER_DB_PASSWORD: veryinsecure + CINDER_DB_USER: cinderDB + CINDER_DEVICE: /dev/sdb + CINDER_ENABLE_COMPUTE: false + CINDER_ENABLE_CONTROLLER: false + CINDER_ENABLE_STORAGE: false + CINDER_SERVICE_PASSWORD: veryinsecure + CINDER_SERVICE_USER: cinder + CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt + EXTERNAL_INTERFACE: enp3s0 + GLANCE_DB_PASSWORD: veryinsecure + GLANCE_DB_USER: glanceDB + GLANCE_SERVICE_PASSWORD: veryinsecure + GLANCE_SERVICE_USER: glance + HOSTNAME: threenode-network + HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt + HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt + HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt + HOSTS_SELF: 10.0.0.1 threenode-network + INITRAMFS_PATH: boot/initramfs.gz + INSTALL_FILES: openstack/manifest + IRONIC_DB_PASSWORD: veryinsecure + IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: false + IRONIC_SERVICE_PASSWORD: veryinsecure + IRONIC_SERVICE_USER: ironic + KEYSTONE_ADMIN_PASSWORD: veryinsecure + KEYSTONE_DB_PASSWORD: veryinsecure + KEYSTONE_DB_USER: keystoneDB + KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 + MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.1 + METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret + NETWORK_CONFIG: enp3s0:dhcp;enp2s0:static,address=10.0.0.1,netmask=255.255.255.0 + NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_DB_USER: neutronDB + NEUTRON_ENABLE_AGENT: false + NEUTRON_ENABLE_CONTROLLER: false + NEUTRON_ENABLE_MANAGER: true + NEUTRON_SERVICE_PASSWORD: veryinsecure + NEUTRON_SERVICE_USER: neutron + NOVA_DB_PASSWORD: veryinsecure + NOVA_DB_USER: novaDB + NOVA_ENABLE_COMPUTE: false + NOVA_ENABLE_CONTROLLER: false + NOVA_SERVICE_PASSWORD: veryinsecure + NOVA_SERVICE_USER: nova + NOVA_VIRT_TYPE: kvm + RABBITMQ_HOST: threenode-controller.os-mgmt + RABBITMQ_PASSWORD: veryinsecure + RABBITMQ_PORT: 5672 + RABBITMQ_USER: rabbitmq + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + network-to-install-initramfs: *id001 +- morph: systems/installer-system-x86_64.morph + deploy: + controller-installer: + type: rawdisk + location: installer-openstack-controller-x86_64.img + DISK_SIZE: 6G + HOSTNAME: installer-x86_64 + INITRAMFS_PATH: boot/initramfs.gz + INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f + INSTALLER_ROOTFS_TO_INSTALL: /rootfs + INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda + KERNEL_ARGS: init=/usr/lib/baserock-installer/installer + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + controller-initramfs: *id001 + - morph: systems/openstack-system-x86_64.morph + deploy: + controller-to-install: + type: sysroot + location: rootfs + CINDER_DB_PASSWORD: veryinsecure + CINDER_DB_USER: cinderDB + CINDER_DEVICE: /dev/sdb + CINDER_ENABLE_COMPUTE: false + CINDER_ENABLE_CONTROLLER: false + CINDER_ENABLE_STORAGE: false + CINDER_SERVICE_PASSWORD: veryinsecure + CINDER_SERVICE_USER: cinder + CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt + EXTERNAL_INTERFACE: enp2s0 + GLANCE_DB_PASSWORD: veryinsecure + GLANCE_DB_USER: glanceDB + GLANCE_SERVICE_PASSWORD: veryinsecure + GLANCE_SERVICE_USER: glance + HOSTNAME: threenode-controller + HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt + HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt + HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt + HOSTS_SELF: 10.0.0.2 threenode-controller + INITRAMFS_PATH: boot/initramfs.gz + INSTALL_FILES: openstack/manifest + IRONIC_DB_PASSWORD: veryinsecure + IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: true + IRONIC_SERVICE_PASSWORD: veryinsecure + IRONIC_SERVICE_USER: ironic + KEYSTONE_ADMIN_PASSWORD: veryinsecure + KEYSTONE_DB_PASSWORD: veryinsecure + KEYSTONE_DB_USER: keystoneDB + KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 + MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.2 + METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret + NETWORK_CONFIG: enp2s0:dhcp;enp0s26u1u2:static,address=10.0.0.2,netmask=255.255.255.0 + NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_DB_USER: neutronDB + NEUTRON_ENABLE_AGENT: false + NEUTRON_ENABLE_CONTROLLER: true + NEUTRON_ENABLE_MANAGER: false + NEUTRON_SERVICE_PASSWORD: veryinsecure + NEUTRON_SERVICE_USER: neutron + NOVA_DB_PASSWORD: veryinsecure + NOVA_DB_USER: novaDB + NOVA_ENABLE_COMPUTE: false + NOVA_ENABLE_CONTROLLER: true + NOVA_SERVICE_PASSWORD: veryinsecure + NOVA_SERVICE_USER: nova + NOVA_VIRT_TYPE: kvm + RABBITMQ_HOST: threenode-controller.os-mgmt + RABBITMQ_PASSWORD: veryinsecure + RABBITMQ_PORT: 5672 + RABBITMQ_USER: rabbitmq + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + controller-to-install-initramfs: *id001 +- morph: systems/installer-system-x86_64.morph + deploy: + compute-installer: + type: rawdisk + location: installer-openstack-compute-x86_64.img + DISK_SIZE: 6G + HOSTNAME: installer-x86_64 + INITRAMFS_PATH: boot/initramfs.gz + INSTALLER_POST_INSTALL_COMMAND: sync; poweroff -f + INSTALLER_ROOTFS_TO_INSTALL: /rootfs + INSTALLER_TARGET_STORAGE_DEVICE: /dev/sda + KERNEL_ARGS: init=/usr/lib/baserock-installer/installer + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + compute-initramfs: *id001 + - morph: systems/openstack-system-x86_64.morph + deploy: + compute-to-install: + type: sysroot + location: rootfs + CINDER_DB_PASSWORD: veryinsecure + CINDER_DB_USER: cinderDB + CINDER_DEVICE: /dev/sdb + CINDER_ENABLE_COMPUTE: true + CINDER_ENABLE_CONTROLLER: false + CINDER_ENABLE_STORAGE: true + CINDER_SERVICE_PASSWORD: veryinsecure + CINDER_SERVICE_USER: cinder + CONTROLLER_HOST_ADDRESS: threenode-controller.os-mgmt + EXTERNAL_INTERFACE: eno1 + GLANCE_DB_PASSWORD: veryinsecure + GLANCE_DB_USER: glanceDB + GLANCE_SERVICE_PASSWORD: veryinsecure + GLANCE_SERVICE_USER: glance + HOSTNAME: threenode-compute + HOSTS_COMPUTE: 10.0.0.3 threenode-compute.os-mgmt + HOSTS_CONTROL: 10.0.0.2 threenode-controller.os-mgmt + HOSTS_NETWORK: 10.0.0.1 threenode-network.os-mgmt + HOSTS_SELF: 10.0.0.3 threenode-compute + INITRAMFS_PATH: boot/initramfs.gz + INSTALL_FILES: openstack/manifest + IRONIC_DB_PASSWORD: veryinsecure + IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: false + IRONIC_SERVICE_PASSWORD: veryinsecure + IRONIC_SERVICE_USER: ironic + KEYSTONE_ADMIN_PASSWORD: veryinsecure + KEYSTONE_DB_PASSWORD: veryinsecure + KEYSTONE_DB_USER: keystoneDB + KEYSTONE_TEMPORARY_ADMIN_TOKEN: 22f3aa1cf538e3f6d5e8 + MANAGEMENT_INTERFACE_IP_ADDRESS: 10.0.0.3 + METADATA_PROXY_SHARED_SECRET: novaneutronmetasecret + NETWORK_CONFIG: eno1:dhcp;enp0s29u1u3:static,address=10.0.0.3,netmask=255.255.255.0 + NEUTRON_DB_PASSWORD: veryinsecure + NEUTRON_DB_USER: neutronDB + NEUTRON_ENABLE_AGENT: true + NEUTRON_ENABLE_CONTROLLER: false + NEUTRON_ENABLE_MANAGER: false + NEUTRON_SERVICE_PASSWORD: veryinsecure + NEUTRON_SERVICE_USER: neutron + NOVA_DB_PASSWORD: veryinsecure + NOVA_DB_USER: novaDB + NOVA_ENABLE_COMPUTE: true + NOVA_ENABLE_CONTROLLER: false + NOVA_SERVICE_PASSWORD: veryinsecure + NOVA_SERVICE_USER: nova + NOVA_VIRT_TYPE: kvm + RABBITMQ_HOST: threenode-controller.os-mgmt + RABBITMQ_PASSWORD: veryinsecure + RABBITMQ_PORT: 5672 + RABBITMQ_USER: rabbitmq + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + compute-to-install-initramfs: *id001 diff --git a/clusters/openstack-two-node-installer.morph b/clusters/openstack-two-node-installer.morph index 393f4ca5..05bdcc6e 100644 --- a/clusters/openstack-two-node-installer.morph +++ b/clusters/openstack-two-node-installer.morph @@ -6,7 +6,7 @@ description: |2 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 instanciated. + produce an OpenStack cluster when instantiated. Alternatively it may be used to install directly onto a physical disk by running: @@ -98,6 +98,7 @@ systems: INSTALL_FILES: openstack/manifest IRONIC_DB_PASSWORD: veryinsecure IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: true IRONIC_SERVICE_PASSWORD: veryinsecure IRONIC_SERVICE_USER: ironic KEYSTONE_ADMIN_PASSWORD: veryinsecure @@ -172,6 +173,7 @@ systems: INSTALL_FILES: openstack/manifest IRONIC_DB_PASSWORD: veryinsecure IRONIC_DB_USER: ironicDB + IRONIC_ENABLE_SERVICE: false IRONIC_SERVICE_PASSWORD: veryinsecure IRONIC_SERVICE_USER: ironic KEYSTONE_ADMIN_PASSWORD: veryinsecure diff --git a/clusters/release.morph b/clusters/release.morph index cbfa7431..5364d9d6 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -36,11 +36,12 @@ systems: location: build-system-armv7lhf-jetson.img BOOTLOADER_CONFIG_FORMAT: extlinux BOOTLOADER_INSTALL: none + BOOT_DEVICE: /dev/mmcblk0p1 DISK_SIZE: 2G DTB_PATH: boot/tegra124-jetson-tk1.dtb KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - ROOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: genivi-baseline-system-x86_64-generic: @@ -55,8 +56,9 @@ systems: location: genivi-baseline-system-armv7lhf-jetson.img BOOTLOADER_CONFIG_FORMAT: extlinux BOOTLOADER_INSTALL: none + BOOT_DEVICE: /dev/mmcblk0p1 DISK_SIZE: 4G DTB_PATH: boot/tegra124-jetson-tk1.dtb KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - ROOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 diff --git a/ntpd.configure b/ntpd.configure deleted file mode 100644 index fd39d9e9..00000000 --- a/ntpd.configure +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# -# Copyright © 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, see . - - -set -e - -ROOT="$1" - -# NTP conflicts with systemd-timesyncd, -# so if we want to use NTP then we need to disable systemd-timesyncd -rm "$ROOT/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service" - -# On at least x86 64 the default rlimit -# ntp sets (32kB) isn't enough, so increase it -cat >> "$ROOT/etc/ntp.conf" << EOF - -# The default rlimit isn't enough in some cases -# so we set a higher limit here -rlimit memlock 256 -EOF - -NTPD_PIDFILE=/run/ntpd.pid -cat > "$ROOT/usr/lib/systemd/system/ntpd.service" << EOF -[Unit] -Description=Network Time Service -After=network.target nss-lookup.target -Conflicts=systemd-timesyncd.service - -[Service] -Type=forking -PIDFile=$NTPD_PIDFILE -ExecStart=/usr/bin/ntpd -u ntp:ntp -p $NTPD_PIDFILE -PrivateTmp=True -Restart=on-failure - -[Install] -WantedBy=multi-user.target -EOF - -ln -s "/usr/lib/systemd/system/ntpd.service" \ - "$ROOT/usr/lib/systemd/system/multi-user.target.wants/ntpd.service" diff --git a/openstack-cinder.configure b/openstack-cinder.configure index a971dc4c..587a0f83 100644 --- a/openstack-cinder.configure +++ b/openstack-cinder.configure @@ -89,7 +89,7 @@ check_bool CINDER_ENABLE_STORAGE ###################################### if "$CINDER_ENABLE_COMPUTE" || "$CINDER_ENABLE_STORAGE"; then - enable openstack-cinder-iscsi-setup + enable iscsi-setup enable target #target.service! enable iscsid fi diff --git a/openstack-ironic.configure b/openstack-ironic.configure index 50d8e5c6..962bbcd1 100644 --- a/openstack-ironic.configure +++ b/openstack-ironic.configure @@ -19,28 +19,38 @@ set -e ROOT="$1" -########################################################################## +enable(){ + ln -sf "/usr/lib/systemd/system/$1.service" \ + "$ROOT/etc/systemd/system/multi-user.target.wants/$1.service" +} + +unnaceptable(){ + eval echo Unexpected value \$$1 for $1 >&2 + exit 1 +} -ln -sf "/usr/lib/systemd/system/openstack-ironic-setup.service" \ - "$ROOT/etc/systemd/system/multi-user.target.wants/openstack-ironic-setup.service" +check_bool(){ + case "$(eval echo \"\$$1\")" in + True|'') + eval "$1=true" + ;; + False) + eval "$1=false" + ;; + *) + unnaceptable "$1" + ;; + esac +} ########################################################################## # Check variables ########################################################################## -if [ -z "$IRONIC_SERVICE_USER" -a \ - -z "$IRONIC_SERVICE_PASSWORD" -a \ - -z "$IRONIC_DB_USER" -a \ - -z "$IRONIC_DB_PASSWORD" -a \ - -z "$RABBITMQ_HOST" -a \ - -z "$RABBITMQ_USER" -a \ - -z "$RABBITMQ_PASSWORD" -a \ - -z "$RABBITMQ_PORT" -a \ - -z "$CONTROLLER_HOST_ADDRESS" -a \ - -z "$MANAGEMENT_INTERFACE_IP_ADDRESS" -a \ - -z "$KEYSTONE_TEMPORARY_ADMIN_TOKEN" ]; then - # No Ironic options defined, do nothing. - exit 0 +check_bool IRONIC_ENABLE_SERVICE + +if ! "$IRONIC_ENABLE_SERVICE"; then + exit 0 fi if [ -z "$IRONIC_SERVICE_USER" -o \ @@ -58,6 +68,15 @@ if [ -z "$IRONIC_SERVICE_USER" -o \ exit 1 fi +###################################### +# Enable relevant openstack services # +###################################### + +enable openstack-ironic-setup +enable iscsi-setup +enable target #target.service! +enable iscsid + ########################################################################## # Generate configuration file ########################################################################## diff --git a/openstack/manifest b/openstack/manifest index 78b030bb..4812c6c3 100644 --- a/openstack/manifest +++ b/openstack/manifest @@ -11,7 +11,6 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0040755 0 0 /usr/share/openstack/cinder 0100644 0 0 /usr/share/openstack/cinder-config.yml 0100644 0 0 /usr/share/openstack/cinder-db.yml -0100644 0 0 /usr/share/openstack/cinder-iscsi.yml 0100644 0 0 /usr/share/openstack/cinder-lvs.yml 0100644 0 0 /usr/share/openstack/cinder/cinder.conf 0100644 0 0 /usr/share/openstack/cinder/api-paste.ini @@ -35,6 +34,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0100644 0 0 /usr/share/openstack/ironic.yml 0100644 0 0 /usr/share/openstack/ironic/ironic.conf 0100644 0 0 /usr/share/openstack/ironic/policy.json +0100644 0 0 /usr/share/openstack/iscsi.yml 0100644 0 0 /usr/share/openstack/keystone.yml 0040755 0 0 /usr/share/openstack/keystone 0100644 0 0 /usr/share/openstack/keystone/logging.conf @@ -128,6 +128,7 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0040755 0 0 /usr/lib/sysctl.d 0100644 0 0 /usr/lib/sysctl.d/neutron.conf 0100644 0 0 /usr/lib/systemd/system/apache-httpd.service +0100644 0 0 /usr/lib/systemd/system/iscsi-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-keystone.service 0100644 0 0 /usr/lib/systemd/system/openstack-keystone-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-glance-setup.service @@ -159,7 +160,6 @@ template 0100644 0 0 /etc/tempest/tempest.conf 0100644 0 0 /usr/lib/systemd/system/rabbitmq-server.service 0100644 0 0 /usr/lib/systemd/system/openstack-cinder-config-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-cinder-db-setup.service -0100644 0 0 /usr/lib/systemd/system/openstack-cinder-iscsi-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-cinder-lv-setup.service 0100644 0 0 /usr/lib/systemd/system/openstack-cinder-api.service 0100644 0 0 /usr/lib/systemd/system/openstack-cinder-scheduler.service diff --git a/openstack/usr/lib/systemd/system/iscsi-setup.service b/openstack/usr/lib/systemd/system/iscsi-setup.service new file mode 100644 index 00000000..c9e5ee59 --- /dev/null +++ b/openstack/usr/lib/systemd/system/iscsi-setup.service @@ -0,0 +1,12 @@ +[Unit] +Description=Run iscsi-setup Ansible scripts +Before=iscsid.service target.service +Wants= iscsid.service target.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/iscsi.yml + +[Install] +WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service index 1976417c..a6a2ce56 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-evaluator.service @@ -1,6 +1,6 @@ [Unit] Description=OpenStack ceilometer alarm evaluation service -After=syslog.target network-online.target openstack-ceilometer-setup.service +After=syslog.target network-online.target Wants=network-online.target [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service index 070d063d..1a4a0b04 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-alarm-notifier.service @@ -1,6 +1,6 @@ [Unit] Description=OpenStack ceilometer alarm notification service -After=syslog.target network-online.target openstack-ceilometer-setup.service +After=syslog.target network-online.target Wants=network-online.target [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service index 3981553b..77d8836d 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-api.service @@ -1,6 +1,6 @@ [Unit] Description=OpenStack ceilometer API service -After=syslog.target network-online.target openstack-ceilometer-setup.service +After=syslog.target network-online.target Wants=network-online.target [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service index c7171451..98eff608 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-collector.service @@ -1,6 +1,6 @@ [Unit] Description=OpenStack ceilometer collection service -After=syslog.target network-online.target openstack-ceilometer-setup.service +After=syslog.target network-online.target Wants=network-online.target [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service index 9936c822..16eacb55 100644 --- a/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-ceilometer-setup.service @@ -1,6 +1,7 @@ [Unit] Description=Run ceilometer-setup Ansible scripts -After=local-fs.target openstack-keystone-setup.service postgres-server.service openstack-cinder-setup.service openstack-nova-setup.service openstack-neutron-setup.service openstack-glance-setup.service +After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service +Wants=postgres-server.service openstack-keystone.service [Service] Type=oneshot diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service deleted file mode 100644 index 157f30fc..00000000 --- a/openstack/usr/lib/systemd/system/openstack-cinder-iscsi-setup.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Run cinder-iscsi-setup Ansible scripts -Before=iscsid.service target.service -Wants= iscsid.service target.service - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/cinder-iscsi.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-cinder-setup.service b/openstack/usr/lib/systemd/system/openstack-cinder-setup.service deleted file mode 100644 index bac80b6b..00000000 --- a/openstack/usr/lib/systemd/system/openstack-cinder-setup.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Run cinder-setup Ansible scripts -After=local-fs.target openstack-keystone-setup.service postgres-server.service - -[Service] -ExecStart=/usr/bin/ansible-playbook -v -M /usr/share/ansible/ansible-openstack-modules -i /usr/share/openstack/hosts /usr/share/openstack/cinder.yml - -[Install] -WantedBy=multi-user.target diff --git a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service index 4b30e78a..68874a6e 100644 --- a/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-neutron-db-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run neutron-db-setup Ansible scripts ConditionPathExists=/etc/openstack/neutron.conf -After=network-online.target openstack-keystone.service postgres-server.service openstack-keystone-setup.service +After=network-online.target openstack-keystone.service postgres-server.service openstack-keystone-setup.service openstack-neutron-config-setup.service Wants=network-online.target openstack-keystone.service postgres-server.service [Service] diff --git a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service index 80db0be5..5a280917 100644 --- a/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service +++ b/openstack/usr/lib/systemd/system/openstack-nova-db-setup.service @@ -1,7 +1,7 @@ [Unit] Description=Run nova-db-setup Ansible scripts ConditionPathExists=/etc/openstack/neutron.conf -After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service +After=postgres-server.service openstack-keystone.service openstack-keystone-setup.service openstack-nova-config-setup.service Wants=postgres-server.service openstack-keystone.service [Service] diff --git a/openstack/usr/share/openstack/cinder-iscsi.yml b/openstack/usr/share/openstack/cinder-iscsi.yml deleted file mode 100644 index b80377ae..00000000 --- a/openstack/usr/share/openstack/cinder-iscsi.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- hosts: localhost - tasks: - - name: Update kernel module dependencies - command: depmod -a - - - name: generate InitiatorName for iscsi - shell: iscsi-iname - register: initiator_name - - - lineinfile: - dest: /etc/iscsi/initiatorname.iscsi - regexp: '^InitiatorName=$' - line: 'InitiatorName={{ initiator_name.stdout }}' - backrefs: yes diff --git a/openstack/usr/share/openstack/iscsi.yml b/openstack/usr/share/openstack/iscsi.yml new file mode 100644 index 00000000..b80377ae --- /dev/null +++ b/openstack/usr/share/openstack/iscsi.yml @@ -0,0 +1,15 @@ +--- +- hosts: localhost + tasks: + - name: Update kernel module dependencies + command: depmod -a + + - name: generate InitiatorName for iscsi + shell: iscsi-iname + register: initiator_name + + - lineinfile: + dest: /etc/iscsi/initiatorname.iscsi + regexp: '^InitiatorName=$' + line: 'InitiatorName={{ initiator_name.stdout }}' + backrefs: yes diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph index cf0907de..3d61e537 100644 --- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph @@ -8,6 +8,7 @@ configure-commands: - scripts/config -e CONFIG_POSIX_MQUEUE - scripts/config -e CPU_IDLE - scripts/config -e EXT4_FS +- scripts/config -e FUSE_FS - scripts/config -e EXT4_USE_FOR_EXT23 - scripts/config -e PACKET - scripts/config -e UNIX diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph index 9125ee51..7e66ce73 100644 --- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph @@ -7,6 +7,8 @@ configure-commands: - scripts/config -d BTRFS_FS_CHECK_INTEGRITY - scripts/config -e DEVTMPFS - scripts/config -e DEVTMPFS_MOUNT +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e CONFIG_FHANDLE - scripts/config -e CGROUPS - scripts/config -e AUTOFS4_FS diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph index a4de8d6a..e98b304e 100644 --- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph @@ -21,6 +21,7 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -e BTRFS_FS - scripts/config -e TMPFS +- scripts/config -e FUSE_FS - scripts/config -e IKCONFIG - scripts/config -e IKCONFIG_PROC - scripts/config -e CGROUPS diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph index a6c0242d..c232c493 100644 --- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph @@ -20,6 +20,8 @@ configure-commands: - scripts/config -e BLK_DEV_LOOP - scripts/config -e BTRFS_FS - scripts/config -e TMPFS +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e IKCONFIG - scripts/config -e IKCONFIG_PROC - scripts/config -e CGROUPS diff --git a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph index 35fb8f95..2429cf5e 100644 --- a/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph +++ b/strata/bsp-armv8b64-generic/linux-armv8b64-generic.morph @@ -32,6 +32,8 @@ configure-commands: - scripts/config -d EXT4_DEBUG - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP diff --git a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph index 0399ef66..6a5e99b7 100644 --- a/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph +++ b/strata/bsp-armv8l64-generic/linux-armv8l64-generic.morph @@ -30,6 +30,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 4559f2ba..43972811 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -33,6 +33,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-ppc64-generic/linux-ppc64.morph b/strata/bsp-ppc64-generic/linux-ppc64.morph index cd68c872..b8b189c7 100644 --- a/strata/bsp-ppc64-generic/linux-ppc64.morph +++ b/strata/bsp-ppc64-generic/linux-ppc64.morph @@ -31,6 +31,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph index a3a79254..bf337725 100644 --- a/strata/bsp-wandboard/linux-armv7-wandboard.morph +++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph @@ -33,6 +33,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index a8da9549..3d936150 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.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 FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG 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 eb4204f6..31aec686 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.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 FUSE_FS +- scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C - scripts/config -d JBD_DEBUG diff --git a/strata/foundation.morph b/strata/foundation.morph index cc58de5a..3de24fee 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -80,8 +80,8 @@ chunks: - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: d736e4f3e76daca4ab1b1fc444737e5ee20a27cd - unpetrify-ref: baserock/v219-314-gd736e4f-network_fixes + ref: 163ab2961268232e1cb49e990a8ccefe24b7649f + unpetrify-ref: baserock/v219-729-g163ab29-jetson_btrfs_fixes build-depends: - dbus-pre - gobject-introspection diff --git a/strata/libsoup-common.morph b/strata/libsoup-common.morph new file mode 100644 index 00000000..a7495405 --- /dev/null +++ b/strata/libsoup-common.morph @@ -0,0 +1,10 @@ +name: libsoup-common +kind: stratum +build-depends: +- morph: strata/foundation.morph +chunks: +- name: libsoup + morph: strata/libsoup-common/libsoup.morph + repo: upstream:libsoup + ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e + unpetrify-ref: baserock/morph diff --git a/strata/libsoup-common/libsoup.morph b/strata/libsoup-common/libsoup.morph new file mode 100644 index 00000000..0a5ebef6 --- /dev/null +++ b/strata/libsoup-common/libsoup.morph @@ -0,0 +1,6 @@ +name: libsoup +kind: chunk +build-system: autotools +configure-commands: +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --disable-tls-check diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 99a0562f..6020954e 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -2,7 +2,10 @@ name: morph-utils kind: stratum build-depends: - morph: strata/core.morph +- morph: strata/ostree-core.morph - morph: strata/python-cliapp.morph +- morph: strata/python-core.morph +- morph: strata/python-pygobject.morph - morph: strata/python-wsgi.morph chunks: - name: python-ttystatus @@ -38,7 +41,7 @@ chunks: unpetrify-ref: master - name: morph repo: baserock:baserock/morph - ref: ab92ce0343b838b336313f604ea035a60dfcb960 + ref: e62366ed8a32a44dbe034e8d43450338b1b66e12 unpetrify-ref: master build-depends: - cmdtest diff --git a/strata/nfs.morph b/strata/nfs.morph index 0d04812b..9b9aa248 100644 --- a/strata/nfs.morph +++ b/strata/nfs.morph @@ -23,7 +23,7 @@ chunks: - name: nfs-utils morph: strata/nfs/nfs-utils.morph repo: upstream:nfs-utils - ref: 08baf3bc2f66a1ca6401191e19380028d2fc2c6d + ref: 0da9f20a22bb32b2da6b587b4e85dafde087c0f7 unpetrify-ref: baserock/master build-depends: - libevent diff --git a/strata/ntpd/ntpd.morph b/strata/ntpd/ntpd.morph index fe875b35..e4e710cb 100644 --- a/strata/ntpd/ntpd.morph +++ b/strata/ntpd/ntpd.morph @@ -3,6 +3,47 @@ kind: chunk build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" --enable-linuxcaps +post-install-commands: +- | + cat > ntpd.service << EOF + [Unit] + Description=Network Time Service + After=network.target nss-lookup.target + Conflicts=systemd-timesyncd.service + + [Service] + Type=forking + ExecStart=/usr/bin/ntpd -u ntp:ntp + PrivateTmp=True + Restart=on-failure + + [Install] + WantedBy=multi-user.target + EOF +- install -D -m 644 ntpd.service "$DESTDIR"/lib/systemd/system/ntpd.service +- mkdir -p "$DESTDIR"/lib/systemd/system/multi-user.target.wants +- ln -s /lib/systemd/system/ntpd.service "$DESTDIR"/lib/systemd/system/multi-user.target.wants/ntpd.service +- | + cat > ntp.conf << EOF + # We use iburst here to reduce the potential initial delay to set the clock + server 0.pool.ntp.org iburst + server 1.pool.ntp.org iburst + server 2.pool.ntp.org iburst + server 3.pool.ntp.org iburst + + # kod - notify client when packets are denied service, + # rather than just dropping the packets + # + # nomodify - deny queries which attempt to modify the state of the server + # + # notrap - decline to provide mode 6 control message trap service to + # matching hosts + # + # see ntp.conf(5) for more details + restrict -4 default kod notrap nomodify + restrict -6 default kod notrap nomodify + EOF +- install -D -m 644 ntp.conf "$DESTDIR"/etc/ntp.conf system-integration: ntpd-misc: 00-add-ntpd-user: diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index f27ca21f..83e7f1ae 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -600,24 +600,6 @@ chunks: - netifaces - pastedeploy - python-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 @@ -740,8 +722,8 @@ chunks: - name: ceilometer morph: strata/openstack-services/ceilometer.morph repo: upstream:openstack/ceilometer - ref: 94579bfc81b820380d03703e4e2311b3bd25c022 - unpetrify-ref: 2014.2 + ref: 1129b7013359bf242a2ea53be9d4faeccfbfac5a + unpetrify-ref: 2014.2.1 build-depends: - alembic - anyjson @@ -765,25 +747,6 @@ chunks: - 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 diff --git a/strata/openstack-services/ceilometer.morph b/strata/openstack-services/ceilometer.morph index 07d3cf97..a93562a8 100644 --- a/strata/openstack-services/ceilometer.morph +++ b/strata/openstack-services/ceilometer.morph @@ -5,7 +5,7 @@ post-install-commands: - mkdir -p "$DESTDIR"/etc/ceilometer - install -D -m 644 etc/ceilometer/*.json "$DESTDIR"/etc/ceilometer - install -D -m 644 etc/ceilometer/*.yaml "$DESTDIR"/etc/ceilometer -- install -D -m 644 etc/ceilometer/api_paste.ini "DESTDIR"/etc/ceilometer +- install -D -m 644 etc/ceilometer/api_paste.ini "$DESTDIR"/etc/ceilometer/api_paste.ini - install -D -m 640 etc/ceilometer/rootwrap.conf "$DESTDIR"/etc/ceilometer/rootwrap.conf - mkdir -p "$DESTDIR"/etc/ceilometer/rootwrap.d - install -D -m 644 etc/ceilometer/rootwrap.d/* "$DESTDIR"/etc/ceilometer/rootwrap.d/ diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph new file mode 100644 index 00000000..5052bf4b --- /dev/null +++ b/strata/ostree-core.morph @@ -0,0 +1,17 @@ +name: ostree-core +kind: stratum +build-depends: +- morph: strata/foundation.morph +- morph: strata/core.morph +- morph: strata/libsoup-common.morph +chunks: +- name: libgsystem + repo: upstream:libgsystem + ref: 8231b8ad4a4ee35e4b11fae5f6e7cddabf1c51ae + unpetrify-ref: master +- name: ostree + repo: upstream:ostree + ref: c9704e9802dfeda9b5a138535c59e98df3dd7196 + unpetrify-ref: baserock/morph + build-depends: + - libgsystem diff --git a/strata/python-pygobject.morph b/strata/python-pygobject.morph new file mode 100644 index 00000000..68b30b72 --- /dev/null +++ b/strata/python-pygobject.morph @@ -0,0 +1,13 @@ +name: python-pygobject +kind: stratum +description: | + Python GObject bindings +build-depends: +- morph: strata/python-core.morph +- morph: strata/foundation.morph +chunks: +- name: pygobject + morph: strata/python-pygobject/pygobject.morph + repo: upstream:pygobject + ref: 276341d7ddab180020c31e6837bd28fd25784de0 + unpetrify-ref: baserock/morph diff --git a/strata/python-pygobject/pygobject.morph b/strata/python-pygobject/pygobject.morph new file mode 100644 index 00000000..a423537e --- /dev/null +++ b/strata/python-pygobject/pygobject.morph @@ -0,0 +1,5 @@ +name: pygobject +kind: chunk +build-system: autotools +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --disable-cairo diff --git a/strata/trove.morph b/strata/trove.morph index 40588c05..984050b7 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -71,7 +71,7 @@ chunks: - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup - ref: 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 + ref: 16de74536e0846ba1d2e5101618df9146c785a41 unpetrify-ref: master - name: lua-scrypt morph: strata/trove/lua-scrypt.morph diff --git a/strata/unionfs-fuse-group.morph b/strata/unionfs-fuse-group.morph new file mode 100644 index 00000000..9cc2c69e --- /dev/null +++ b/strata/unionfs-fuse-group.morph @@ -0,0 +1,13 @@ +name: unionfs-fuse-group +kind: stratum +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. +build-depends: +- 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 diff --git a/strata/unionfs-fuse-group/unionfs-fuse.morph b/strata/unionfs-fuse-group/unionfs-fuse.morph new file mode 100644 index 00000000..7fa36e41 --- /dev/null +++ b/strata/unionfs-fuse-group/unionfs-fuse.morph @@ -0,0 +1,7 @@ +name: unionfs-fuse +kind: chunk +description: User-space union file system. +build-commands: +- make PREFIX="$PREFIX" +install-commands: +- make PREFIX="$PREFIX" DESTDIR="$DESTDIR" install diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 1fe9442b..bdcab292 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -6,7 +6,9 @@ description: | kernel history to check which config are needed for openvswitch, libvirt, or ebtables, for example. build-depends: +- morph: strata/libsoup-common.morph - morph: strata/python-core.morph +- morph: strata/python-pygobject.morph - morph: strata/connman-common.morph - morph: strata/lvm.morph - morph: strata/xorg-util-macros-common.morph @@ -75,24 +77,11 @@ chunks: build-depends: - libvirt - urlgrabber -- name: pygobject - morph: strata/virtualization/pygobject.morph - repo: upstream:pygobject - ref: 276341d7ddab180020c31e6837bd28fd25784de0 - unpetrify-ref: baserock/morph -- name: libsoup - morph: strata/virtualization/libsoup.morph - repo: upstream:libsoup - ref: ce764489e358bad6b49418f5c8bc7b25a4b1815e - unpetrify-ref: baserock/morph - name: libosinfo morph: strata/virtualization/libosinfo.morph repo: upstream:libosinfo ref: a86c74c4d3f62bb0e315ab7fc78ec9f7746bdd12 unpetrify-ref: baserock/morph - build-depends: - - libsoup - - pygobject - name: virt-manager repo: upstream:virt-manager ref: 8b7ebd4538ffbd2d246fdeee4f1bb1c452585575 diff --git a/strata/virtualization/libsoup.morph b/strata/virtualization/libsoup.morph deleted file mode 100644 index 0a5ebef6..00000000 --- a/strata/virtualization/libsoup.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libsoup -kind: chunk -build-system: autotools -configure-commands: -- NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --disable-tls-check diff --git a/strata/virtualization/pygobject.morph b/strata/virtualization/pygobject.morph deleted file mode 100644 index a423537e..00000000 --- a/strata/virtualization/pygobject.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: pygobject -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --disable-cairo diff --git a/swift/etc/ntp.conf b/swift/etc/ntp.conf index b50886a4..54522871 100644 --- a/swift/etc/ntp.conf +++ b/swift/etc/ntp.conf @@ -19,3 +19,7 @@ server 3.pool.ntp.org iburst restrict -4 default kod notrap nomodify restrict -6 default kod notrap nomodify {% endif %} + +# The default rlimit isn't enough in some cases +# so we set a higher limit here +rlimit memlock 256 diff --git a/swift/manifest b/swift/manifest index 63ea2c2c..7fd76206 100644 --- a/swift/manifest +++ b/swift/manifest @@ -11,5 +11,5 @@ 0100644 0 0 /usr/share/swift/etc/rsyncd.j2 0100644 0 0 /usr/lib/systemd/system/swift-storage-setup.service 0100644 0 0 /usr/lib/systemd/system/swift-storage.service -template 0100644 0 0 /etc/ntp.conf +template overwrite 0100644 0 0 /etc/ntp.conf overwrite 0100644 0 0 /usr/lib/systemd/system/rsync.service diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 83fea92e..4e9a5cd3 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -20,6 +20,8 @@ strata: morph: strata/python-cliapp.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: morph-utils morph: strata/morph-utils.morph - name: nfs @@ -36,6 +38,12 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph +- name: unionfs-fuse-group + morph: strata/unionfs-fuse-group.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 53bda1a5..d4fa0b62 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -36,6 +38,10 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index b79487e5..53f78f16 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -20,8 +20,14 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 63dcb432..c6f18bb9 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -38,6 +40,10 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 8613bd4c..f74f00a3 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -36,6 +38,10 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 7c423139..f8c0a3bd 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -16,6 +16,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -36,6 +38,10 @@ strata: morph: strata/devtools.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 0989375b..b74e7576 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -38,6 +40,10 @@ strata: morph: strata/devtools.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index f3ab9e12..a1672881 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -16,6 +16,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -36,6 +38,10 @@ strata: morph: strata/devtools.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index cfc2fdeb..fdfe1d4c 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -38,6 +40,10 @@ strata: morph: strata/devtools.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 95b17dc0..e585c2d6 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -24,8 +24,14 @@ strata: morph: strata/ntpd.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 f0a2780b..e07faa38 100644 --- a/systems/cross-bootstrap-system-armv7lhf-generic.morph +++ b/systems/cross-bootstrap-system-armv7lhf-generic.morph @@ -7,8 +7,18 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-core + morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph - name: morph-utils morph: strata/morph-utils.morph - name: cross-bootstrap diff --git a/systems/cross-bootstrap-system-armv8b64-generic.morph b/systems/cross-bootstrap-system-armv8b64-generic.morph index ed2cbc89..7084333a 100644 --- a/systems/cross-bootstrap-system-armv8b64-generic.morph +++ b/systems/cross-bootstrap-system-armv8b64-generic.morph @@ -7,8 +7,18 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-core + morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 2bf192d3..b05357c9 100644 --- a/systems/cross-bootstrap-system-armv8l64-generic.morph +++ b/systems/cross-bootstrap-system-armv8l64-generic.morph @@ -7,8 +7,18 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-core + morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 9d736f94..a7953aa0 100644 --- a/systems/cross-bootstrap-system-ppc64-generic.morph +++ b/systems/cross-bootstrap-system-ppc64-generic.morph @@ -7,8 +7,18 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-core + morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 ac919d66..25397fe3 100644 --- a/systems/cross-bootstrap-system-x86_64-generic.morph +++ b/systems/cross-bootstrap-system-x86_64-generic.morph @@ -7,8 +7,18 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: foundation + morph: strata/foundation.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-core + morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 18f82d3b..d6c78c13 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -45,6 +47,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 40303dce..dae24fff 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -46,6 +48,12 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph +- name: unionfs-fuse-group + morph: strata/unionfs-fuse-group.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 8f689705..b0eafe82 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -46,6 +48,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index f139ebc4..df521772 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -46,6 +48,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 5ce8c9c7..2982f422 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -37,6 +39,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 51de3509..b1710b78 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -42,6 +44,12 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph +- name: unionfs-fuse-group + morph: strata/unionfs-fuse-group.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index e6db8b26..894686fe 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -45,6 +47,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 03ad8fd0..928f9ce2 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -49,6 +51,12 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph +- name: unionfs-fuse-group + morph: strata/unionfs-fuse-group.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index a07a66d2..14a3f193 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -49,6 +51,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index b2191c8c..44c9e4e8 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -49,6 +51,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index c5e32beb..488574ed 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -18,6 +18,8 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -48,6 +50,10 @@ strata: morph: strata/devtools.morph - name: ansible morph: strata/ansible.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index 64df4716..e84caa74 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -48,6 +50,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 0c4f3b46..44df4803 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -43,6 +45,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 6ad076ea..a6bf2f0d 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -46,6 +48,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 5e2e11bf..1cc2add1 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -45,6 +47,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 2a6f8178..8baf62aa 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -50,6 +52,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index e679cca3..8e8ff87a 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -47,6 +49,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 82fc0cae..0f4bb371 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -50,6 +52,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 647e627c..4c3e0b33 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-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph - name: morph-utils @@ -48,6 +50,10 @@ strata: morph: strata/ansible.morph - name: swift morph: strata/swift.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/installer-system-armv8b64.morph b/systems/installer-system-armv8b64.morph index 774cab0d..14f79651 100644 --- a/systems/installer-system-armv8b64.morph +++ b/systems/installer-system-armv8b64.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-armv8b64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/installer-system-x86_64.morph b/systems/installer-system-x86_64.morph index 84153961..fb9448b6 100644 --- a/systems/installer-system-x86_64.morph +++ b/systems/installer-system-x86_64.morph @@ -16,8 +16,14 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph - name: morph-utils morph: strata/morph-utils.morph - name: installer-utils diff --git a/systems/openstack-system-x86_64.morph b/systems/openstack-system-x86_64.morph index ecd99cc7..631fedb2 100644 --- a/systems/openstack-system-x86_64.morph +++ b/systems/openstack-system-x86_64.morph @@ -9,6 +9,8 @@ strata: morph: strata/core.morph - name: python-core morph: strata/python-core.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-common morph: strata/python-common.morph - name: foundation @@ -55,6 +57,8 @@ strata: morph: strata/ansible.morph - name: ntpd morph: strata/ntpd.morph +- name: libsoup-common + morph: strata/libsoup-common.morph configuration-extensions: - set-hostname - add-config-files diff --git a/systems/swift-system-x86_64.morph b/systems/swift-system-x86_64.morph index 385f9cd5..442c2609 100644 --- a/systems/swift-system-x86_64.morph +++ b/systems/swift-system-x86_64.morph @@ -31,4 +31,3 @@ configuration-extensions: - install-files - fstab - swift-storage -- ntpd diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index ab50f7f6..5881cb51 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -17,8 +17,14 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.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 dad3d3dc..9570c1f6 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -35,8 +35,14 @@ strata: morph: strata/tools.morph - name: python-cliapp morph: strata/python-cliapp.morph +- name: python-pygobject + morph: strata/python-pygobject.morph - name: python-wsgi morph: strata/python-wsgi.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: ostree-core + morph: strata/ostree-core.morph - name: morph-utils morph: strata/morph-utils.morph - name: xfce -- cgit v1.2.1