Merge lp:~andreserl/maas/maas_lp1553791 into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

Change maas-provision to maas-rack

[Andres Rodriguez (andreserl)]

https://code.launchpad.net/~andreserl/maas/lp1553791/+merge/288296

[Blake Rouse (blake-rouse)]

Just mentioned this in my other review, lol. Looks good!

review: Approve

=== modified file 'HACKING.txt'
--- HACKING.txt	2016-02-04 10:00:05 +0000
+++ HACKING.txt	2016-03-07 14:36:44 +0000
@@ -226,7 +226,7 @@
 you want to boot some real hardware. By default, it's set to start up on
 port 5244 for testing purposes. Make these changes::
 
-    * Use ``bin/maas-provision`` to change the tftp-port setting to 69
+    * Use ``bin/maas-rack`` to change the tftp-port setting to 69
     * Install the ``authbind``package:
 
       $ sudo apt-get install authbind
@@ -285,9 +285,9 @@
 configuration to do. First, run this tool to generate a configuration that
 will work with MAAS::
 
-    $ maas-provision generate-dhcp-config [options]
+    $ maas-rack generate-dhcp-config [options]
 
-Run ``maas-provision generate-dhcp-config -h`` to see the options. You will
+Run ``maas-rack generate-dhcp-config -h`` to see the options. You will
 need to provide various IP details such as the range of IP addresses to assign
 to clients. You can use the generated output to configure your system's ISC
 DHCP server, by inserting the configuration in the ``/var/lib/maas/dhcpd.conf``
 
=== modified file 'INSTALL.txt'
--- INSTALL.txt	2016-03-01 19:02:08 +0000
+++ INSTALL.txt	2016-03-07 14:36:44 +0000
@@ -131,7 +131,7 @@
 Once you have copied the secret, you can install it in the Cluster
 Controller. At the command line, type::
 
- $ sudo maas-provision
+ $ sudo maas-rack
 
 Once installed, you will need to reconfigure the Cluster Controller
 to correctly point to the API hostname or IP address of the Region
 
=== modified file 'Makefile'
--- Makefile	2016-03-04 18:09:49 +0000
+++ Makefile	2016-03-07 14:36:44 +0000
@@ -52,7 +52,7 @@
     bin/database \
     bin/maas \
     bin/maas-probe-dhcp \
-    bin/maas-provision \
+    bin/maas-rack \
     bin/maas-region-admin \
     bin/twistd.rack \
     bin/twistd.region \
@@ -129,13 +129,13 @@
 	$(buildout) install testing-test
 	@touch --no-create $@
 
-bin/maas-probe-dhcp bin/maas-provision bin/twistd.rack: \
+bin/maas-probe-dhcp bin/maas-rack bin/twistd.rack: \
     bin/buildout buildout.cfg versions.cfg setup.py
 	$(buildout) install rack
 	@touch --no-create $@
 
 bin/test.rack: \
-	  bin/buildout buildout.cfg versions.cfg setup.py bin/maas-provision
+	  bin/buildout buildout.cfg versions.cfg setup.py bin/maas-rack
 	$(buildout) install rack-test
 	@touch --no-create $@
 
 
=== modified file 'buildout.cfg'
--- buildout.cfg	2016-02-04 10:34:29 +0000
+++ buildout.cfg	2016-03-07 14:36:44 +0000
@@ -190,13 +190,13 @@
 eggs =
 entry-points =
   maas-probe-dhcp=provisioningserver.dhcp.probe:main
-  maas-provision=provisioningserver.__main__:main
+  maas-rack=provisioningserver.__main__:main
   twistd.rack=twisted.scripts.twistd:run
 extra-paths =
   ${common:extra-paths}
 scripts =
   maas-probe-dhcp
-  maas-provision
+  maas-rack
   twistd.rack
 initialization =
   ${common:initialization}
 
=== modified file 'docs/development/cluster-registration.rst'
--- docs/development/cluster-registration.rst	2016-02-04 10:00:05 +0000
+++ docs/development/cluster-registration.rst	2016-03-07 14:36:44 +0000
@@ -23,7 +23,7 @@
 
 The cluster obviously needs to know where the region controller is, and
 this is configured in a file ``/etc/maas/rackd.conf``. This should
-only ever be modified via the ``maas-provision`` command.
+only ever be modified via the ``maas-rack`` command.
 
 .. _first-cluster:
 
 
=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
--- etc/maas/templates/dhcp/dhcpd.conf.template	2016-03-02 05:03:06 +0000
+++ etc/maas/templates/dhcp/dhcpd.conf.template	2016-03-07 14:36:44 +0000
@@ -89,7 +89,7 @@
    set cllt = binary-to-ascii(10, 32, "", encode-int(lease-time, 32));
    set clht = pick-first-value(option host-name, "(none)");
    execute(
-       "sudo", "maas-provision", "dhcp-notify",
+       "sudo", "maas-rack", "dhcp-notify",
        "--action", "commit", "--mac", clhw,
        "--ip-family", "ipv4", "--ip", clip,
        "--lease-time", cllt, "--hostname", clht);
@@ -98,7 +98,7 @@
    set clhw = binary-to-ascii(16, 8, ":", substring(hardware, 1, 6));
    set clip = binary-to-ascii(10, 8, ".", leased-address);
    execute(
-       "sudo", "maas-provision", "dhcp-notify",
+       "sudo", "maas-rack", "dhcp-notify",
        "--action", "expiry", "--mac", clhw,
        "--ip-family", "ipv4", "--ip", clip);
 }
@@ -106,7 +106,7 @@
    set clhw = binary-to-ascii(16, 8, ":", substring(hardware, 1, 6));
    set clip = binary-to-ascii(10, 8, ".", leased-address);
    execute(
-       "sudo", "maas-provision", "dhcp-notify",
+       "sudo", "maas-rack", "dhcp-notify",
        "--action", "release", "--mac", clhw,
        "--ip-family", "ipv4", "--ip", clip);
 }
 
=== modified file 'services/rackd/run'
--- services/rackd/run	2016-02-10 20:24:35 +0000
+++ services/rackd/run	2016-03-07 14:36:44 +0000
@@ -19,12 +19,12 @@
 
 # Configure the rack's UUID to match sampledata, and also use a high
 # port for TFTP to match this branch's etc/services.
-bin/maas-provision config \
+bin/maas-rack config \
     --uuid adfd3977-f251-4f2c-8d61-745dbd690bf2 \
     --tftp-port 5244
 
 # Wait for the installation of the shared-secret.
-until bin/maas-provision check-for-shared-secret; do sleep 2; done
+until bin/maas-rack check-for-shared-secret; do sleep 2; done
 
 # Exec the Provisioning Server.
 script="$(readlink -f bin/twistd.rack)"
 
=== modified file 'src/provisioningserver/dhcp/tests/test_notifier.py'
--- src/provisioningserver/dhcp/tests/test_notifier.py	2016-02-17 20:26:00 +0000
+++ src/provisioningserver/dhcp/tests/test_notifier.py	2016-03-07 14:36:44 +0000
@@ -1,7 +1,7 @@
 # Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for maas-provision dhcp-notify command."""
+"""Tests for maas-rack dhcp-notify command."""
 
 __all__ = []
 
@@ -67,7 +67,7 @@
         self.addCleanup(service.stopService)
 
         call_and_check([
-            "%s/bin/maas-provision" % root,
+            "%s/bin/maas-rack" % root,
             "dhcp-notify",
             '--action', action,
             '--mac', mac,
 
=== modified file 'src/provisioningserver/utils/fs.py'
--- src/provisioningserver/utils/fs.py	2016-02-26 00:03:29 +0000
+++ src/provisioningserver/utils/fs.py	2016-03-07 14:36:44 +0000
@@ -56,9 +56,9 @@
 
 
 def get_maas_provision_command():
-    """Return path to the maas-provision command.
+    """Return path to the maas-rack command.
 
-    In production mode this will just return 'maas-provision', but in
+    In production mode this will just return 'maas-rack', but in
     development mode it will return the path for the current development
     environment.
     """
@@ -66,9 +66,9 @@
     from provisioningserver.config import is_dev_environment
     if is_dev_environment():
         from maastesting import root
-        return os.path.join(root, "bin", "maas-provision")
+        return os.path.join(root, "bin", "maas-rack")
     else:
-        return "maas-provision"
+        return "maas-rack"
 
 
 def _write_temp_file(content, filename):
 
=== modified file 'src/provisioningserver/utils/tests/test_fs.py'
--- src/provisioningserver/utils/tests/test_fs.py	2016-02-26 00:38:54 +0000
+++ src/provisioningserver/utils/tests/test_fs.py	2016-03-07 14:36:44 +0000
@@ -313,13 +313,13 @@
     def test__returns_just_command_for_production(self):
         self.patch(provisioningserver.config, "is_dev_environment")
         provisioningserver.config.is_dev_environment.return_value = False
-        self.assertEqual("maas-provision", get_maas_provision_command())
+        self.assertEqual("maas-rack", get_maas_provision_command())
 
     def test__returns_full_path_for_development(self):
         self.patch(provisioningserver.config, "is_dev_environment")
         provisioningserver.config.is_dev_environment.return_value = True
         self.assertEqual(
-            root.rstrip("/") + "/bin/maas-provision",
+            root.rstrip("/") + "/bin/maas-rack",
             get_maas_provision_command())
 
 
 
=== modified file 'src/provisioningserver/utils/tests/test_script.py'
--- src/provisioningserver/utils/tests/test_script.py	2015-12-03 23:28:19 +0000
+++ src/provisioningserver/utils/tests/test_script.py	2016-03-07 14:36:44 +0000
@@ -194,7 +194,7 @@
 
     def test_script_executable(self):
         content = factory.make_string()
-        script = [os.path.join(bindir, "maas-provision"), 'atomic-write']
+        script = [os.path.join(bindir, "maas-rack"), 'atomic-write']
         target_file = self.make_file()
         script.extend(('--filename', target_file, '--mode', '615'))
         cmd = Popen(script, stdin=PIPE, env=select_c_utf8_locale())