From cf679563c7f9b7e2823884bab03dbf48d4c7e6aa Mon Sep 17 00:00:00 2001 From: Frode Nordahl Date: Wed, 23 May 2018 09:05:03 +0200 Subject: [PATCH] Update deploy instructions and amend a few nits Change-Id: Id1efcf016fe322872e1782af5c1a5242c855fda1 --- README.md | 1 - src/README.md | 9 +++++++-- src/lib/charm/openstack/dragent.py | 2 +- src/metadata.yaml | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 1e0ca6a..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/src/README.md b/src/README.md index 3340915..d5bc24d 100644 --- a/src/README.md +++ b/src/README.md @@ -7,9 +7,9 @@ This charm provides the BGP speaker, dynamic routing agent, feature for OpenStac Neutron dynamic routing relies on services from the rabbitmq-server charm and assumes a functioning neutron stack: # The neutron-dynamic-routing charm only requires a relationship to rabbitmq-server - juju deploy neutron-dyanmic-routing + juju deploy neutron-dynamic-routing juju deploy rabbitmq-server - juju add-relation neutron-dyanmic-routing rabbitmq-server + juju add-relation neutron-dynamic-routing rabbitmq-server # For minimum functionality a full neutron stack is required: juju deploy keystone @@ -17,6 +17,11 @@ Neutron dynamic routing relies on services from the rabbitmq-server charm and as juju deploy percona-cluster juju add-relation keystone percona-cluster juju add-relation keystone neutron-api + juju add-relation neutron-api percona-cluster + juju add-relation neutron-api rabbitmq-server + +NOTE: This charm supports OpenStack versions Pike or newer. Specify version + to install using the openstack-origin and source configuration options. # Feature Usage diff --git a/src/lib/charm/openstack/dragent.py b/src/lib/charm/openstack/dragent.py index 457f9a7..18639e7 100644 --- a/src/lib/charm/openstack/dragent.py +++ b/src/lib/charm/openstack/dragent.py @@ -182,7 +182,7 @@ class DRAgentCharm(charms_openstack.charm.OpenStackCharm): # Package for release version detection release_pkg = 'neutron-dynamic-routing-common' - # Package codename map for barbican-common + # Package codename map for neutron-dynamic-routing-common package_codenames = { 'neutron-dynamic-routing-common': collections.OrderedDict([ ('11', 'pike'), diff --git a/src/metadata.yaml b/src/metadata.yaml index 29d9183..32f2670 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -2,7 +2,8 @@ name: neutron-dynamic-routing summary: Neutron Dyanamic Routing Agent maintainer: OpenStack Charmers description: | - Neutron Dyanamic Routing Agent acts as a BGP speaker advertisiging OpenStack networks to the BGP infrastructure. + Neutron Dynamic Routing Agent acts as a BGP speaker advertising OpenStack + networks to the BGP infrastructure. tags: - openstack series: