diff --git a/README.md b/README.md index 85c47e0..43cca73 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,24 @@ Murano charm provides a catalog of applications deployable on Openstack cloud. Murano relies on services from the mysql/percona, rabbitmq-server and keystone charms: - juju deploy murano - juju deploy keystone - juju deploy mysql - juju deploy rabbitmq-server - juju add-relation murano rabbitmq-server - juju add-relation murano mysql - juju add-relation murano keystone + $ juju deploy murano + $ juju deploy keystone + $ juju deploy mysql + $ juju deploy rabbitmq-server + $ juju add-relation murano rabbitmq-server + $ juju add-relation murano mysql + $ juju add-relation murano keystone # Build $ git clone https://github.com/viswesn/charm-murano $ cd charm-murano $ charm build -s xenial -o build src +# Config + $ juju config murano ext-network=my_ext_net + $ juju config murano router=my_router + $ juju config murano default_dns=10.166.62.1 + # Bugs Please report bugs on [Launchpad](https://bugs.launchpad.net/charm-murano/+filebug). diff --git a/requirements.txt b/requirements.txt index 8d3d204..604b8c1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,6 @@ # The order of packages is significant, because pip processes them in the order # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.8.0,<1.9.0 -PyYAML>=3.1.0 -simplejson>=2.2.0 -netifaces>=0.10.4 -netaddr>=0.7.12,!=0.7.16 -Jinja2>=2.6 # BSD License (3 clause) -six>=1.9.0 -dnspython>=1.12.0 -psutil>=1.1.1,<2.0.0 \ No newline at end of file +simplejson +charm-tools +flake8 diff --git a/src/config.yaml b/src/config.yaml index abb2803..b562178 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -30,12 +30,18 @@ options: ext-network: default: ext_net type: string - description: External network to connect + description: | + The external network to be connect to download the application packages + on launch of VMs spawned by Murano. router: default: default_router type: string - description: Default router to connect + description: | + The default router to bridge the external network and isolated network + created by Murano for each environment. default_dns: default: 8.8.8.8 type: string - description: Default DNS configuration + description: | + The default DNS used by the VMs spawned by Murano to download the + application packages on poweron. diff --git a/src/lib/charm/openstack/murano.py b/src/lib/charm/openstack/murano.py index b0a5879..6704375 100644 --- a/src/lib/charm/openstack/murano.py +++ b/src/lib/charm/openstack/murano.py @@ -3,8 +3,6 @@ import charmhelpers.core.hookenv as hookenv import charms_openstack.charm import charms_openstack.ip as os_ip -RC_FILE = '/root/novarc' - class MuranoCharm(charms_openstack.charm.HAOpenStackCharm): # Internal name of charm @@ -34,7 +32,6 @@ class MuranoCharm(charms_openstack.charm.HAOpenStackCharm): restart_map = { '/etc/murano/murano.conf': services, - RC_FILE: [''], } ha_resources = ['vips', 'haproxy'] diff --git a/src/novarc b/src/novarc deleted file mode 100644 index 06512e5..0000000 --- a/src/novarc +++ /dev/null @@ -1,19 +0,0 @@ -{% if identity_service.api_version == '3' -%} -export OS_AUTH_URL={{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v3 -export OS_USERNAME={{ identity_service.service_username }} -export OS_PASSWORD={{ identity_service.service_password }} -export OS_USER_DOMAIN_NAME=default -export OS_PROJECT_DOMAIN_NAME=default -export OS_PROJECT_NAME={{ identity_service.service_tenant }} -export OS_REGION_NAME={{ options.region }} -export OS_IDENTITY_API_VERSION=3 -export OS_DNS_ENDPOINT={{ options.service_listen_info.designate_api.url }} -export OS_AUTH_VERSION=3 -{% else -%} -export OS_AUTH_URL={{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v2.0 -export OS_TENANT_NAME={{ identity_service.service_tenant }} -export OS_USERNAME={{ identity_service.service_username }} -export OS_PASSWORD={{ identity_service.service_password }} -export OS_REGION_NAME={{ options.region }} -export OS_DNS_ENDPOINT={{ options.service_listen_info.designate_api.url }} -{% endif -%} diff --git a/src/templates/liberty/.keep b/src/templates/liberty/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/templates/mitaka/novarc b/src/templates/mitaka/novarc deleted file mode 100644 index e138759..0000000 --- a/src/templates/mitaka/novarc +++ /dev/null @@ -1,17 +0,0 @@ -{% if identity_service.api_version == '3' -%} -export OS_AUTH_URL={{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v3 -export OS_USERNAME={{ identity_service.service_username }} -export OS_PASSWORD={{ identity_service.service_password }} -export OS_USER_DOMAIN_NAME=default -export OS_PROJECT_DOMAIN_NAME=default -export OS_PROJECT_NAME={{ identity_service.service_tenant }} -export OS_REGION_NAME={{ options.region }} -export OS_IDENTITY_API_VERSION=3 -export OS_AUTH_VERSION=3 -{% else -%} -export OS_AUTH_URL={{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}/v2.0 -export OS_TENANT_NAME={{ identity_service.service_tenant }} -export OS_USERNAME={{ identity_service.service_username }} -export OS_PASSWORD={{ identity_service.service_password }} -export OS_REGION_NAME={{ options.region }} -{% endif -%}