Merge lp:~matsubara/charms/trusty/nova-compute-power/trusty into lp:~zulcss/charms/trusty/nova-compute-power/trusty

[Diogo Matsubara]

Fixes to nova_compute_proxy.py to avoid install hook errors:

- fix variable name typo: s/self.respository/self.repository/
- remove trailing command from ssh_key argument as this makes it be interpreted as a tuple
- remove _ from self.key_filename attribute
- remove unnecessary key argument from POWERProxy._write_key() method

[lp:~matsubara/charms/trusty/nova-compute-power/trusty]

80. By Diogo Matsubara on 2014-10-07

add openstack-origin to config.yaml to avoid charmhelpers errors

[Diogo Matsubara (matsubara)]

Added openstack-origin option to config.yaml to avoid charmhelpers errors such as http://pastebin.ubuntu.com/8508559/ and http://pastebin.ubuntu.com/8510347/

[lp:~matsubara/charms/trusty/nova-compute-power/trusty]

81. By Diogo Matsubara on 2014-10-14

fix command to create bridge in the power host

82. By Diogo Matsubara on 2014-10-29

fix typos in README file

Unmerged revisions

82. By Diogo Matsubara on 2014-10-29

fix typos in README file

81. By Diogo Matsubara on 2014-10-14

fix command to create bridge in the power host

80. By Diogo Matsubara on 2014-10-07

add openstack-origin to config.yaml to avoid charmhelpers errors

79. By Diogo Matsubara on 2014-10-06

small fixes to charm to avoid install errors: typo in var name, trailing comma, private attribute, unnecessary arg for write_key() method

=== modified file 'README'
--- README	2014-06-20 19:13:19 +0000
+++ README	2014-10-29 18:12:02 +0000
@@ -8,9 +8,9 @@
 
 * Generate a ssh key that the charm can use to login to the compute node
   to start installing RPMS and configuration file
-* A yum repoistiory which contains the apprioate IBM Openstack Icehouse 
+* A yum repository which contains the appropriate IBM Openstack Icehouse 
   RPMs.
-* Sudo password-les configured for the user on the compute node.
+* Sudo password-less configured for the user on the compute node.
 
 Once you have this setup you must configure the charm as follow:
 
@@ -18,7 +18,7 @@
    charm.
 2. Create a config.yaml that has the following:
 
-	* power-user: username used to access and configure the power node.
+    * power-user: username used to access and configure the power node.
     * power-repo: Yum repository url.
     * power-hosts: IP address of power node
 
 
=== modified file 'config.yaml'
--- config.yaml	2014-06-16 15:18:37 +0000
+++ config.yaml	2014-10-29 18:12:02 +0000
@@ -1,4 +1,19 @@
 options:
+  openstack-origin:
+    default: distro
+    type: string
+    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.
   openstack-release:
     type: string
     default: icehouse
 
=== modified file 'hooks/fabfile.py'
--- hooks/fabfile.py	2014-06-16 15:18:37 +0000
+++ hooks/fabfile.py	2014-10-29 18:12:02 +0000
@@ -34,7 +34,7 @@
 
 
 def add_bridge():
-    sudo('ovs-vsctl -- --may-exist add br-int')
+    sudo('ovs-vsctl -- --may-exist add-br br-int')
 
 
 def enable_shell(user):
 
=== modified file 'hooks/nova_compute_proxy.py'
--- hooks/nova_compute_proxy.py	2014-06-16 15:57:42 +0000
+++ hooks/nova_compute_proxy.py	2014-10-29 18:12:02 +0000
@@ -62,16 +62,16 @@
         if None in [user, ssh_key, hosts, repository]:
             raise Exception('Missing configuration')
         self.user = user
-        self.ssh_key = ssh_key,
+        self.ssh_key = ssh_key
         self.hosts = hosts.split()
-        self.respository = repository
+        self.repository = repository
         self.password = password
         self.conf_path = os.path.join('/var/lib/charm',
                                       service_name())
-        self._key_filename = self._write_key()
+        self.key_filename = self._write_key()
         self._init_fabric()
 
-    def _write_key(self, key):
+    def _write_key(self):
         return os.path.join(charm_dir(), 'files', self.ssh_key)
 
     def _init_fabric(self):
@@ -89,7 +89,7 @@
 
     def _setup_yum(self):
         log('Setup yum')
-        context = {'yum_repo': self.respository}
+        context = {'yum_repo': self.repository}
         _, filename = tempfile.mkstemp()
         with open(filename, 'w') as f:
             f.write(_render_template('yum.template', context))