Update error in install-rdo.rst and update default port

Nova placement use port 8778, to avoid confusion, Update
senlin default port from  8778 to 8777. And update
spelling mistakes in install-rdo.rst

Change-Id: I342b1badf3910ea07ea64523cdb8a19a8a0ccb06

api-ref/source/samples/receiver-create-response.json

@@ -7,7 +7,7 @@
             ]
         },
         "channel": {
-            "alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
+            "alarm_url": "http://node1:8777/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
         },
         "cluster_id": "ae63a10b-4a90-452c-aef1-113a0b255ee3",
         "created_at": "2015-06-27T05:09:43",

api-ref/source/samples/receiver-show-response.json

@@ -7,7 +7,7 @@
             ]
         },
         "channel": {
-            "alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
+            "alarm_url": "http://node1:8777/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
         },
         "cluster_id": "ae63a10b-4a90-452c-aef1-113a0b255ee3",
         "created_at": "2015-06-27T05:09:43",

api-ref/source/samples/receiver-update-response.json

@@ -7,7 +7,7 @@
             ]
         },
         "channel": {
-            "alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=2"
+            "alarm_url": "http://node1:8777/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=2"
         },
         "cluster_id": "ae63a10b-4a90-452c-aef1-113a0b255ee3",
         "created_at": "2015-06-27T05:09:43",

api-ref/source/samples/receivers-list-response.json

@@ -8,7 +8,7 @@
                 ]
             },
             "channel": {
-                "alarm_url": "http://node1:8778/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
+                "alarm_url": "http://node1:8777/v1/webhooks/e03dd2e5-8f2e-4ec1-8c6a-74ba891e5422/trigger?V=2&count=1"
             },
             "cluster_id": "ae63a10b-4a90-452c-aef1-113a0b255ee3",
             "created_at": "2015-06-27T05:09:43",

devstack/files/apache-senlin-api.template

@@ -2,7 +2,7 @@
     Require all granted
 </Directory>
 
-<VirtualHost *:8778>
+<VirtualHost *:8777>
     WSGIDaemonProcess senlin-api processes=%APIWORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV%
     WSGIProcessGroup senlin-api
     WSGIScriptAlias / %SENLIN_BIN_DIR%/senlin-wsgi-api

doc/source/install/install-rdo.rst

@@ -70,7 +70,7 @@ Replace ``Senlin_DBPASS`` with a suitable password.
 
 ::
 
-        $openstack user create --project services --password-prompt senlin
+        $openstack user create --project service --password-prompt senlin
         User Password:
         Repeat User Password:
         +-----------+----------------------------------+
@@ -86,7 +86,7 @@ Replace ``Senlin_DBPASS`` with a suitable password.
 
 ::
 
-        $ openstack role add --project services --user senlin admin
+        $ openstack role add --project service --user senlin admin
 
      .. note::
 
@@ -125,7 +125,7 @@ Replace ``Senlin_DBPASS`` with a suitable password.
       | service_id   | 9130295921b04601a81f95c417b9f113 |
       | service_name | senlin                           |
       | service_type | clustering                       |
-      | url          | http://controller:8778           |
+      | url          | http://controller:8777           |
       +--------------+----------------------------------+
 
       $ openstack endpoint create senlin --region RegionOne \
@@ -141,7 +141,7 @@ Replace ``Senlin_DBPASS`` with a suitable password.
       | service_id   | 9130295921b04601a81f95c417b9f113 |
       | service_name | senlin                           |
       | service_type | clustering                       |
-      | url          | http://controller:8778           |
+      | url          | http://controller:8777           |
       +--------------+----------------------------------+
 
       $ openstack endpoint create senlin --region RegionOne \
@@ -157,7 +157,7 @@ Replace ``Senlin_DBPASS`` with a suitable password.
       | service_id   | 9130295921b04601a81f95c417b9f113 |
       | service_name | senlin                           |
       | service_type | clustering                       |
-      | url          | http://controller:8778           |
+      | url          | http://controller:8777           |
       +--------------+----------------------------------+
 
 Install and configure components

doc/source/scenarios/autoscaling_ceilometer.rst

@@ -145,7 +145,7 @@ by two nodes every time it is triggered:
   |            |   "trust_id": "432f81d339444cac959bab2fd9ba92fa"                                |
   |            | }                                                                               |
   | channel    | {                                                                               |
-  |            |   "alarm_url": "http://node1:8778/v1/webhooks/ba...5a/trigger?V=2&count=2       |
+  |            |   "alarm_url": "http://node1:8777/v1/webhooks/ba...5a/trigger?V=2&count=2       |
   |            | }                                                                               |
   | cluster_id | b75d25e7-e84d-4742-abf7-d8a3001e25a9                                            |
   | created_at | 2016-08-01T02:17:14Z                                                            |
@@ -191,7 +191,7 @@ triggering. For convenience, we export that value to an environment variable:
 
 .. code-block:: console
 
-  $ export ALRM_URL01="http://node1:8778/v1/webhooks/ba...5a/trigger?V=2&count=2"
+  $ export ALRM_URL01="http://node1:8777/v1/webhooks/ba...5a/trigger?V=2&count=2"
 
 Similar to the example above, you can create other receivers for different
 kinds of cluster operations or the same cluster operation with different

doc/source/tutorial/receivers.rst

@@ -48,7 +48,7 @@ The output from the command will be something like this:
   |            |   "trust_id": "1bc958f5780b4ad38fb6583701a9f39b"                        |
   |            | }                                                                       |
   | channel    | {                                                                       |
-  |            |   "alarm_url": "http://node1:8778/v1/webhooks/5dacde18-.../trigger?V=2" |
+  |            |   "alarm_url": "http://node1:8777/v1/webhooks/5dacde18-.../trigger?V=2" |
   |            | }                                                                       |
   | cluster_id | 7fb3d988-3bc1-4539-bd5d-3f72e8d6e0c7                                    |
   | created_at | 2016-05-23T01:36:39                                                     |
@@ -79,7 +79,7 @@ action using tools like ``curl``.
 
 .. code-block:: console
 
-  $ curl -X POST http://node1:8778/v1/webhooks/5dacde18-661e-4db4-b7a8-f2a6e3466f98/trigger?V=2
+  $ curl -X POST http://node1:8777/v1/webhooks/5dacde18-661e-4db4-b7a8-f2a6e3466f98/trigger?V=2
 
 After a while, you can check that the cluster has been shrunk by 1 node.
 

doc/source/user/receivers.rst

@@ -107,7 +107,7 @@ using the option :option:`--type`, for example:
   |            |   "trust_id": "2e76547947954e6ea62b61a658ffb8e5"          |
   |            | }                                                         |
   | channel    | {                                                         |
-  |            |   "alarm_url": "http://10.20.10.17:8778/v1/webhooks/...." |
+  |            |   "alarm_url": "http://10.20.10.17:8777/v1/webhooks/...." |
   |            | }                                                         |
   | cluster_id | 9f1883a7-6837-4fe4-b621-6ec6ba6c3668                      |
   | created_at | 2018-02-24T09:23:48Z                                      |

senlin/conf/api.py

@@ -19,7 +19,7 @@ API_OPTS = [
     cfg.IPOpt('bind_host', default='0.0.0.0',
               help=_('Address to bind the server. Useful when '
                      'selecting a particular network interface.')),
-    cfg.PortOpt('bind_port', default=8778,
+    cfg.PortOpt('bind_port', default=8777,
                 help=_('The port on which the server will listen.')),
     cfg.IntOpt('backlog', default=4096,
                help=_("Number of backlog requests "

senlin/conf/receiver.py

@@ -23,7 +23,7 @@ RECEIVER_OPTS = [
                help=_('The address for notifying and triggering receivers. '
                       'It is useful for case Senlin API service is running '
                       'behind a proxy.')),
-    cfg.PortOpt('port', default=8778, deprecated_group='webhook',
+    cfg.PortOpt('port', default=8777, deprecated_group='webhook',
                 help=_('The port for notifying and triggering receivers. '
                        'It is useful for case Senlin API service is running '
                        'behind a proxy.')),

senlin/tests/unit/api/openstack/test_versions.py

@@ -41,7 +41,7 @@ class VersionControllerTest(base.SenlinTestCase):
         environ = {
             'REQUEST_METHOD': 'GET',
             'SERVER_NAME': 'host',
-            'SERVER_PORT': 8778,
+            'SERVER_PORT': 8777,
             'SCRIPT_NAME': '/',
             'PATH_INFO': '/',
             'wsgi.url_scheme': 'http',

senlin/tests/unit/api/openstack/v1/test_actions.py

@@ -36,7 +36,7 @@ class ActionControllerTest(shared.ControllerTest, base.SenlinTestCase):
 
         # Create WSGI controller instance
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = actions.ActionController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_cluster_policies.py

@@ -33,7 +33,7 @@ class ClusterPolicyControllerTest(shared.ControllerTest, base.SenlinTestCase):
 
         # Create WSGI controller instance
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = cp_mod.ClusterPolicyController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_clusters.py

@@ -37,7 +37,7 @@ class ClusterControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(ClusterControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = clusters.ClusterController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_events.py

@@ -33,7 +33,7 @@ class EventControllerTest(shared.ControllerTest, base.SenlinTestCase):
         # Create WSGI controller instance
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = events.EventController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_nodes.py

@@ -34,7 +34,7 @@ class NodeControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(NodeControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = nodes.NodeController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_policies.py

@@ -34,7 +34,7 @@ class PolicyControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(PolicyControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = policies.PolicyController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_policy_types.py

@@ -30,7 +30,7 @@ class PolicyTypeControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(PolicyTypeControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = policy_types.PolicyTypeController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_profile_types.py

@@ -30,7 +30,7 @@ class ProfileTypeControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(ProfileTypeControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = profile_types.ProfileTypeController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_profiles.py

@@ -33,7 +33,7 @@ class ProfileControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(ProfileControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = profiles.ProfileController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_receivers.py

@@ -32,7 +32,7 @@ class ReceiverControllerTest(shared.ControllerTest, base.SenlinTestCase):
         super(ReceiverControllerTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = receivers.ReceiverController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_services.py

@@ -44,7 +44,7 @@ class ServicesControllerTest(shared.ControllerTest, base.SenlinTestCase):
 
         # Create WSGI controller instance
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = services.ServiceController(options=cfgopts)

senlin/tests/unit/api/openstack/v1/test_webhooks.py

@@ -32,7 +32,7 @@ class WebhookControllerBaseTest(shared.ControllerTest, base.SenlinTestCase):
         super(WebhookControllerBaseTest, self).setUp()
 
         class DummyConfig(object):
-            bind_port = 8778
+            bind_port = 8777
 
         cfgopts = DummyConfig()
         self.controller = webhooks.WebhookController(options=cfgopts)

senlin/tests/unit/engine/receivers/test_message.py

@@ -115,7 +115,7 @@ class TestMessage(base.SenlinTestCase):
         message = mmod.Message('message', None, None, id=UUID)
         res = message._generate_subscriber_url()
 
-        expected = 'trust+http://test-host:8778/v1/receivers/%s/notify' % UUID
+        expected = 'trust+http://test-host:8777/v1/receivers/%s/notify' % UUID
         self.assertEqual(expected, res)
 
     def test_to_dict(self):

senlin/tests/unit/engine/receivers/test_webhook.py

@@ -68,7 +68,7 @@ class TestWebhook(base.SenlinTestCase):
         channel = webhook.initialize_channel(self.context)
 
         expected = {
-            'alarm_url': ('http://test-host:8778/v1/webhooks/%s/trigger'
+            'alarm_url': ('http://test-host:8777/v1/webhooks/%s/trigger'
                           '?V=2' % UUID1)
         }
         self.assertEqual(expected, channel)

tools/setup-service

@@ -18,7 +18,7 @@ if [ $# -ne 2 ]; then
   exit -1
 fi
 
-PORT=8778
+PORT=8777
 HOST=$1 # Put your host IP here
 SVC_PASSWD=$2
 OS_REGION_NAME=${OS_REGION_NAME:-RegionOne}