diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-01-09 10:04:10 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-01-09 12:23:58 -0500 |
commit | 0d6067258d09fdd47c95828e5e0e9b0f9987a529 (patch) | |
tree | dbce7395b11e577bbcd633fa0daeae24697df42e /meta-openstack/recipes-extended | |
parent | 96dd0da3edc2f56de99d84ef96effdbf366a3041 (diff) | |
download | meta-cloud-services-0d6067258d09fdd47c95828e5e0e9b0f9987a529.tar.gz |
chef: remove the use of chef
The use of chef was never complete, had isses with updating binary
database files and had a cumbersome implementation. Since we are using
Ansible in meta-overc we are dropping the use of chef here and will
look to being at par with meta-overc by using Ansible if/when we get
time to look at runtime configuration in meta-cloud-services.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-extended')
3 files changed, 6 insertions, 16 deletions
diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb index 01ee924..c6b3529 100644 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb | |||
@@ -28,19 +28,15 @@ do_install_prepend() { | |||
28 | 28 | ||
29 | do_install_append() { | 29 | do_install_append() { |
30 | install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg | 30 | install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg |
31 | if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then | 31 | |
32 | sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg | 32 | sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg |
33 | sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg | 33 | sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg |
34 | fi | 34 | |
35 | ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init | 35 | ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init |
36 | ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints | 36 | ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints |
37 | } | 37 | } |
38 | 38 | ||
39 | inherit setuptools update-rc.d openstackchef | 39 | inherit setuptools update-rc.d |
40 | |||
41 | CHEF_SERVICES_CONF_FILES := " \ | ||
42 | ${sysconfdir}/cloud/cloud.cfg \ | ||
43 | " | ||
44 | 40 | ||
45 | PACKAGES += "${PN}-systemd" | 41 | PACKAGES += "${PN}-systemd" |
46 | 42 | ||
diff --git a/meta-openstack/recipes-extended/glusterfs/glusterfs_3.4.2.bbappend b/meta-openstack/recipes-extended/glusterfs/glusterfs_3.4.2.bbappend deleted file mode 100644 index b52d27a..0000000 --- a/meta-openstack/recipes-extended/glusterfs/glusterfs_3.4.2.bbappend +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | # | ||
2 | # Copyright (C) 2013 Wind River Systems, Inc. | ||
3 | # | ||
4 | inherit openstackchef | ||
5 | |||
6 | |||
diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb index 6ac3e59..101d098 100644 --- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb +++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb | |||
@@ -46,7 +46,7 @@ do_install() { | |||
46 | mv ${D}/plugins ${RABBIT_LIB_DIR}/plugins | 46 | mv ${D}/plugins ${RABBIT_LIB_DIR}/plugins |
47 | } | 47 | } |
48 | 48 | ||
49 | inherit useradd update-rc.d openstackchef | 49 | inherit useradd update-rc.d |
50 | 50 | ||
51 | USERADD_PACKAGES = "${PN}" | 51 | USERADD_PACKAGES = "${PN}" |
52 | GROUPADD_PARAM_${PN} = "--system rabbitmq" | 52 | GROUPADD_PARAM_${PN} = "--system rabbitmq" |