diff options
author | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-03-03 10:00:22 +0000 |
---|---|---|
committer | Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> | 2015-03-03 10:00:22 +0000 |
commit | 41af8a0d9a261ff4aabbf750b27e3a8450159931 (patch) | |
tree | 36501e5ba3a29935cd623617497531851d726c21 | |
parent | 518be94b335d97e0df431f3ad57ca9ce128d4940 (diff) | |
parent | 79cf42e6bc6c3a5570467c69338d0ed749fb1c4e (diff) | |
download | definitions-baserock/franred/openstack-v3.tar.gz |
Merge branch 'patrick/integrate-swift-v2' into baserock/franred/openstack-v3baserock/franred/openstack-v3
-rw-r--r-- | strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph | 2 | ||||
-rw-r--r-- | systems/openstack-server.morph | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph index 7d29d8f1..39e62c7e 100644 --- a/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph +++ b/strata/bsp-x86_64-openstack/linux-x86-64-openstack.morph @@ -40,6 +40,8 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG +- scripts/config -e CONFIG_XFS_FS +- scripts/config -e CONFIG_LIBCRC32C - scripts/config -d JBD_DEBUG - scripts/config -d JBD2_DEBUG - scripts/config -e BLK_DEV_LOOP diff --git a/systems/openstack-server.morph b/systems/openstack-server.morph index 71972fbe..1e5e9da2 100644 --- a/systems/openstack-server.morph +++ b/systems/openstack-server.morph @@ -31,7 +31,7 @@ strata: morph: strata/connectivity.morph - name: networking-utils morph: strata/networking-utils.morph -- name: nfs.morph +- name: nfs morph: strata/nfs.morph - name: databases morph: strata/databases.morph @@ -53,6 +53,8 @@ strata: morph: strata/openstack-services.morph - name: ansible morph: strata/ansible.morph +- name: ntpd + morph: strata/ntpd.morph configuration-extensions: - set-hostname - add-config-files |