From 81a016dbcd7bbf9fde791386fcc294fca0a59d71 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 15 Nov 2014 17:18:13 -0300 Subject: [PATCH] Rename apts to debs apts aren't a thing, debs are. apt-get installs debs, like yum installs rpms. Another option would be to rename rpms to yums, but that is even sillier, considering then for suse we'd have to call it "zypper-suse" or something, even though it would want to consume yums-general as a base. Include a symlink to the old name to help out with grenade. The symlink should go away later. This is a long-standing annoyance of mine. Related-to: I915f0e59c13d8cf5fb3549c6202f8aa2f8be0856 Change-Id: I0416180db5b6add996ce5b48c6966c1b68adbcb0 --- files/apts | 1 + files/{apts => debs}/baremetal | 0 files/{apts => debs}/ceilometer-collector | 0 files/{apts => debs}/ceph | 0 files/{apts => debs}/cinder | 0 files/{apts => debs}/dstat | 0 files/{apts => debs}/general | 0 files/{apts => debs}/glance | 0 files/{apts => debs}/heat | 0 files/{apts => debs}/horizon | 0 files/{apts => debs}/ironic | 0 files/{apts => debs}/keystone | 0 files/{apts => debs}/ldap | 0 files/{apts => debs}/n-api | 0 files/{apts => debs}/n-cpu | 0 files/{apts => debs}/n-novnc | 0 files/{apts => debs}/neutron | 0 files/{apts => debs}/nova | 0 files/{apts => debs}/openvswitch | 0 files/{apts => debs}/postgresql | 0 files/{apts => debs}/q-agt | 0 files/{apts => debs}/q-l3 | 0 files/{apts => debs}/qpid | 0 files/{apts => debs}/ryu | 0 files/{apts => debs}/swift | 0 files/{apts => debs}/tempest | 0 files/{apts => debs}/tls-proxy | 0 files/{apts => debs}/trema | 0 files/{apts => debs}/trove | 0 files/{apts => debs}/zaqar-server | 0 functions-common | 4 ++-- 31 files changed, 3 insertions(+), 2 deletions(-) create mode 120000 files/apts rename files/{apts => debs}/baremetal (100%) rename files/{apts => debs}/ceilometer-collector (100%) rename files/{apts => debs}/ceph (100%) rename files/{apts => debs}/cinder (100%) rename files/{apts => debs}/dstat (100%) rename files/{apts => debs}/general (100%) rename files/{apts => debs}/glance (100%) rename files/{apts => debs}/heat (100%) rename files/{apts => debs}/horizon (100%) rename files/{apts => debs}/ironic (100%) rename files/{apts => debs}/keystone (100%) rename files/{apts => debs}/ldap (100%) rename files/{apts => debs}/n-api (100%) rename files/{apts => debs}/n-cpu (100%) rename files/{apts => debs}/n-novnc (100%) rename files/{apts => debs}/neutron (100%) rename files/{apts => debs}/nova (100%) rename files/{apts => debs}/openvswitch (100%) rename files/{apts => debs}/postgresql (100%) rename files/{apts => debs}/q-agt (100%) rename files/{apts => debs}/q-l3 (100%) rename files/{apts => debs}/qpid (100%) rename files/{apts => debs}/ryu (100%) rename files/{apts => debs}/swift (100%) rename files/{apts => debs}/tempest (100%) rename files/{apts => debs}/tls-proxy (100%) rename files/{apts => debs}/trema (100%) rename files/{apts => debs}/trove (100%) rename files/{apts => debs}/zaqar-server (100%) diff --git a/files/apts b/files/apts new file mode 120000 index 0000000000..ef926de053 --- /dev/null +++ b/files/apts @@ -0,0 +1 @@ +debs/ \ No newline at end of file diff --git a/files/apts/baremetal b/files/debs/baremetal similarity index 100% rename from files/apts/baremetal rename to files/debs/baremetal diff --git a/files/apts/ceilometer-collector b/files/debs/ceilometer-collector similarity index 100% rename from files/apts/ceilometer-collector rename to files/debs/ceilometer-collector diff --git a/files/apts/ceph b/files/debs/ceph similarity index 100% rename from files/apts/ceph rename to files/debs/ceph diff --git a/files/apts/cinder b/files/debs/cinder similarity index 100% rename from files/apts/cinder rename to files/debs/cinder diff --git a/files/apts/dstat b/files/debs/dstat similarity index 100% rename from files/apts/dstat rename to files/debs/dstat diff --git a/files/apts/general b/files/debs/general similarity index 100% rename from files/apts/general rename to files/debs/general diff --git a/files/apts/glance b/files/debs/glance similarity index 100% rename from files/apts/glance rename to files/debs/glance diff --git a/files/apts/heat b/files/debs/heat similarity index 100% rename from files/apts/heat rename to files/debs/heat diff --git a/files/apts/horizon b/files/debs/horizon similarity index 100% rename from files/apts/horizon rename to files/debs/horizon diff --git a/files/apts/ironic b/files/debs/ironic similarity index 100% rename from files/apts/ironic rename to files/debs/ironic diff --git a/files/apts/keystone b/files/debs/keystone similarity index 100% rename from files/apts/keystone rename to files/debs/keystone diff --git a/files/apts/ldap b/files/debs/ldap similarity index 100% rename from files/apts/ldap rename to files/debs/ldap diff --git a/files/apts/n-api b/files/debs/n-api similarity index 100% rename from files/apts/n-api rename to files/debs/n-api diff --git a/files/apts/n-cpu b/files/debs/n-cpu similarity index 100% rename from files/apts/n-cpu rename to files/debs/n-cpu diff --git a/files/apts/n-novnc b/files/debs/n-novnc similarity index 100% rename from files/apts/n-novnc rename to files/debs/n-novnc diff --git a/files/apts/neutron b/files/debs/neutron similarity index 100% rename from files/apts/neutron rename to files/debs/neutron diff --git a/files/apts/nova b/files/debs/nova similarity index 100% rename from files/apts/nova rename to files/debs/nova diff --git a/files/apts/openvswitch b/files/debs/openvswitch similarity index 100% rename from files/apts/openvswitch rename to files/debs/openvswitch diff --git a/files/apts/postgresql b/files/debs/postgresql similarity index 100% rename from files/apts/postgresql rename to files/debs/postgresql diff --git a/files/apts/q-agt b/files/debs/q-agt similarity index 100% rename from files/apts/q-agt rename to files/debs/q-agt diff --git a/files/apts/q-l3 b/files/debs/q-l3 similarity index 100% rename from files/apts/q-l3 rename to files/debs/q-l3 diff --git a/files/apts/qpid b/files/debs/qpid similarity index 100% rename from files/apts/qpid rename to files/debs/qpid diff --git a/files/apts/ryu b/files/debs/ryu similarity index 100% rename from files/apts/ryu rename to files/debs/ryu diff --git a/files/apts/swift b/files/debs/swift similarity index 100% rename from files/apts/swift rename to files/debs/swift diff --git a/files/apts/tempest b/files/debs/tempest similarity index 100% rename from files/apts/tempest rename to files/debs/tempest diff --git a/files/apts/tls-proxy b/files/debs/tls-proxy similarity index 100% rename from files/apts/tls-proxy rename to files/debs/tls-proxy diff --git a/files/apts/trema b/files/debs/trema similarity index 100% rename from files/apts/trema rename to files/debs/trema diff --git a/files/apts/trove b/files/debs/trove similarity index 100% rename from files/apts/trove rename to files/debs/trove diff --git a/files/apts/zaqar-server b/files/debs/zaqar-server similarity index 100% rename from files/apts/zaqar-server rename to files/debs/zaqar-server diff --git a/functions-common b/functions-common index e890b75d13..24507fef91 100644 --- a/functions-common +++ b/functions-common @@ -945,7 +945,7 @@ function get_or_create_endpoint { function _get_package_dir { local pkg_dir if is_ubuntu; then - pkg_dir=$FILES/apts + pkg_dir=$FILES/debs elif is_fedora; then pkg_dir=$FILES/rpms elif is_suse; then @@ -975,7 +975,7 @@ function apt_get { } # get_packages() collects a list of package names of any type from the -# prerequisite files in ``files/{apts|rpms}``. The list is intended +# prerequisite files in ``files/{debs|rpms}``. The list is intended # to be passed to a package installer such as apt or yum. # # Only packages required for the services in 1st argument will be