removed unneeded service commands. removed reference to removed defaults.yml config file. lowered pbr version requirement.

kollacli/common.py

@@ -41,15 +41,12 @@ class Deploy(Command):
             inventory_string = '-i ' + os.path.join(kollacli_home,
                                                     'kollacli/ansible',
                                                     'json_generator.py ')
-            default_string = '-e @' + os.path.join(kolla_etc,
-                                                   'defaults.yml')
             globals_string = ' -e @' + os.path.join(kolla_etc,
                                                     'globals.yml')
             passwords_string = ' -e @' + os.path.join(kolla_etc,
                                                       'passwords.yml')
             site_string = ' ' + os.path.join(kolla_home, 'ansible/site.yml')
-            cmd = (command_string + inventory_string +
-                   default_string + globals_string)
+            cmd = (command_string + inventory_string + globals_string)
             cmd = cmd + passwords_string + site_string
             self.log.debug('cmd:' + cmd)
             output, error = \

kollacli/service.py

@@ -16,42 +16,10 @@ import traceback
 
 from kollacli.ansible.inventory import Inventory
 from kollacli.exceptions import CommandError
-from kollacli.i18n import _
 
-from cliff.command import Command
 from cliff.lister import Lister
 
 
-class ServiceActivate(Command):
-    "Service Activate"
-
-    log = logging.getLogger(__name__)
-
-    def take_action(self, parsed_args):
-        self.log.info(_("service activate"))
-        self.app.stdout.write(parsed_args)
-
-
-class ServiceDeactivate(Command):
-    "Service Deactivate"
-
-    log = logging.getLogger(__name__)
-
-    def take_action(self, parsed_args):
-        self.log.info(_("service deactivate"))
-        self.app.stdout.write(parsed_args)
-
-
-class ServiceAutodeploy(Command):
-    "Service Autodeploy"
-
-    log = logging.getLogger(__name__)
-
-    def take_action(self, parsed_args):
-        self.log.info(_("service autodeploy"))
-        self.app.stdout.write(parsed_args)
-
-
 class ServiceList(Lister):
     "Service List"
 

requirements.txt

@@ -5,6 +5,6 @@ docker-py>=1.3
 jsonpickle>=0.9
 oslo.i18n>=1.5.0  # Apache-2.0
 paramiko
-pbr>=0.11,<2.0
+pbr>=0.10,<2.0
 PyYAML
 six>=1.9.0

setup.cfg

@@ -45,9 +45,6 @@ kolla.cli =
     host_check = kollacli.host:HostCheck
     host_install = kollacli.host:HostInstall
     host_uninstall = kollacli.host:HostUninstall
-    service_activate = kollacli.service:ServiceEnable
-    service_deactivate = kollacli.service:ServiceDisable
-    service_autodeploy = kollacli.service:ServiceAutodeploy
     service_list = kollacli.service:ServiceList
     property_set = kollacli.property:PropertySet
     property_clear = kollacli.property:PropertyClear