Rename config option for consistency across charms: nova-release -> openstack-origin.
This commit is contained in:
parent
ee4f0bcf07
commit
7b5647b52d
15
config.yaml
15
config.yaml
|
@ -1,8 +1,19 @@
|
||||||
options:
|
options:
|
||||||
nova-release:
|
openstack-origin:
|
||||||
default: distro
|
default: distro
|
||||||
type: string
|
type: string
|
||||||
description: Nova PPA from which to install. (distro, trunk, milestone, milestone-proposed)
|
description: |
|
||||||
|
Repository from which to install. May be one of the following:
|
||||||
|
distro (default), ppa:somecustom/ppa, a deb url sources entry,
|
||||||
|
or a supported Cloud Archive release pocket.
|
||||||
|
|
||||||
|
Supported Cloud Archive sources include: cloud:precise-folsom,
|
||||||
|
cloud:precise-folsom/updates, cloud:precise-folsom/staging,
|
||||||
|
cloud:precise-folsom/proposed.
|
||||||
|
|
||||||
|
Note that updating this setting to a source that is known to
|
||||||
|
provide a later version of OpenStack will trigger a software
|
||||||
|
upgrade.
|
||||||
nova-config:
|
nova-config:
|
||||||
default: /etc/nova/nova.conf
|
default: /etc/nova/nova.conf
|
||||||
type: string
|
type: string
|
||||||
|
|
|
@ -12,7 +12,7 @@ function install_hook {
|
||||||
local virt_type=$(config-get virt-type)
|
local virt_type=$(config-get virt-type)
|
||||||
local compute_pkg=$(determine_compute_package "$virt_type")
|
local compute_pkg=$(determine_compute_package "$virt_type")
|
||||||
apt-get -y install python-software-properties || exit 1
|
apt-get -y install python-software-properties || exit 1
|
||||||
configure_install_source $(config-get nova-release)
|
configure_install_source $(config-get openstack-origin)
|
||||||
apt-get update || exit 1
|
apt-get update || exit 1
|
||||||
apt-get -y install $compute_pkg $PACKAGES || exit 1
|
apt-get -y install $compute_pkg $PACKAGES || exit 1
|
||||||
service_ctl all stop
|
service_ctl all stop
|
||||||
|
@ -21,9 +21,9 @@ function install_hook {
|
||||||
function config_changed() {
|
function config_changed() {
|
||||||
|
|
||||||
# Determine whether or not we should do an upgrade, based on whether or not
|
# Determine whether or not we should do an upgrade, based on whether or not
|
||||||
# the version offered in nova-release is greater than what is installed.
|
# the version offered in openstack-origin is greater than what is installed.
|
||||||
|
|
||||||
local install_src=$(config-get nova-release)
|
local install_src=$(config-get openstack-origin)
|
||||||
local cur=$(get_os_codename_package "nova-common")
|
local cur=$(get_os_codename_package "nova-common")
|
||||||
local available=$(get_os_codename_install_source "$install_src")
|
local available=$(get_os_codename_install_source "$install_src")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue