Revert accidental commits

config.yaml

@@ -1,16 +1,4 @@
 options:
-  power_ip:
-    type: string
-    description: IPs of the PowerKVM machines
-  power_user:
-    type: string
-    description: Username of the PowerKVM machines
-  power_key:
-    type: string
-    description: power user ssh key file
-  power_repo:
-    type: string
-    descrption: url of the power repo
   openstack-origin:
     default: distro
     type: string

hooks/nova_compute_context.py

@@ -147,8 +147,7 @@ class CloudComputeContext(context.OSContextGenerator):
         '''Install but do not upgrade required packages'''
         required = filter_installed_packages(packages)
         if required:
-            log('Noting to do')
-            #apt_install(required, fatal=True)
+            apt_install(required, fatal=True)
 
     @property
     def network_manager(self):

hooks/nova_compute_hooks.py

@@ -34,8 +34,6 @@ from charmhelpers.contrib.openstack.utils import (
 from charmhelpers.contrib.storage.linux.ceph import ensure_ceph_keyring
 from charmhelpers.payload.execd import execd_preinstall
 
-from nova_compute_proxy import launch_power
-
 from nova_compute_utils import (
     create_libvirt_secret,
     determine_packages,
@@ -67,8 +65,7 @@ def install():
     execd_preinstall()
     configure_installation_source(config('openstack-origin'))
     apt_update()
-    packages = ['nova-common', 'libvirt-bin', 'fabric']
-    apt_install(packages, fatal=True)
+    apt_install(determine_packages(), fatal=True)
 
 
 @hooks.hook('config-changed')
@@ -200,14 +197,12 @@ def compute_changed():
     import_authorized_keys()
     import_authorized_keys(user='nova', prefix='nova')
     import_keystone_ca_cert()
-    launch_power()
 
 
 @hooks.hook('ceph-relation-joined')
 @restart_on_change(restart_map())
 def ceph_joined():
-    apt_update()
-    #apt_install(filter_installed_packages(['ceph-common']), fatal=True)
+    apt_install(filter_installed_packages(['ceph-common']), fatal=True)
 
 
 @hooks.hook('ceph-relation-changed')

hooks/nova_compute_proxy.py

@@ -1,33 +0,0 @@
-import tempfile
-
-
-from charmhelpers.core.hookenv import (
-    unit_get,
-    cached,
-    log
-    config
-)
-
-from charmhelpers.fetch import (
-    apt_install,
-    filter_installed_packages
-)
-
-try:
-    import jinja2
-except ImportError:
-    apt_install(filter_installed_packages(['python-jinja2']),
-                                        fatal=True)
-    import jinja2
-
-try:
-    from fabric.api import cd, env, local, parallel, serial
-    from fabric.api import put, run, settings, sudo
-except ImportError:
-    apt_install(filter_installed_packages(['fabric']),
-                fatal=True)
-
-
-def launch_power():
-    log('Power launched')
-    print config

hooks/nova_compute_utils.py

@@ -51,19 +51,19 @@ NOVA_CONF = '%s/nova.conf' % NOVA_CONF_DIR
 
 BASE_RESOURCE_MAP = {
     QEMU_CONF: {
-        'services': [],
+        'services': ['libvirt-bin'],
         'contexts': [],
     },
     LIBVIRTD_CONF: {
-        'services': [],
-        'contexts': [],
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtContext()],
     },
     LIBVIRT_BIN: {
-        'services': [],
-        'contexts': [],
+        'services': ['libvirt-bin'],
+        'contexts': [NovaComputeLibvirtContext()],
     },
     NOVA_CONF: {
-        'services': [],
+        'services': ['nova-compute'],
         'contexts': [context.AMQPContext(ssl_dir=NOVA_CONF_DIR),
                      context.SharedDBContext(
                          relation_prefix='nova', ssl_dir=NOVA_CONF_DIR),
@@ -376,7 +376,7 @@ def do_openstack_upgrade():
     ]
 
     apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
-    #apt_install(determine_packages(), fatal=True)
+    apt_install(determine_packages(), fatal=True)
 
     # Regenerate configs in full for new release
     configs = register_configs()

templates/power/openstack.repo

@@ -1,5 +0,0 @@
-[openstack-pkvm]
-name=PowerKVM OpenStack local repository
-baseurl={{ yum-repo }}
-gpgcheck=0
-enabled=1