From 157bad1e6b7a231c1f6d264f057f7f144863c744 Mon Sep 17 00:00:00 2001 From: Alexander Tivelkov Date: Mon, 13 Jul 2015 18:52:57 +0300 Subject: [PATCH] Sync ApacheHttpServer app with apps.openstack.org The package with Apache Http Server hosted at apps.openstack.org was modified at some point to include IP address reporting and list of dependent images. That change was never put into this repository. This patch synchronizes the state of the package. Change-Id: Ib44496bba5a081cc363becc84e898c24ad43f3a2 --- ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml | 6 ++++++ ApacheHTTPServer/package/images.lst | 8 ++++++++ 2 files changed, 14 insertions(+) create mode 100755 ApacheHTTPServer/package/images.lst diff --git a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml index b7b46c5c..3fd37368 100644 --- a/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml +++ b/ApacheHTTPServer/package/Classes/ApacheHttpServer.yaml @@ -58,4 +58,10 @@ Methods: - $._environment.reporter.report($this, 'Instance is created. Deploying Apache') - $.instance.agent.call($template, $resources) - $._environment.reporter.report($this, 'Apache is installed.') + - If: $.instance.assignFloatingIp + Then: + - $host: $.instance.floatingIpAddress + Else: + - $host: $.instance.ipAddresses[0] + - $._environment.reporter.report($this, format('Apache is available at http://{0}', $host)) - $.setAttr(deployed, true) diff --git a/ApacheHTTPServer/package/images.lst b/ApacheHTTPServer/package/images.lst new file mode 100755 index 00000000..1c25bb14 --- /dev/null +++ b/ApacheHTTPServer/package/images.lst @@ -0,0 +1,8 @@ +Images: +- Name: 'debian-8-m-agent.qcow2' + Hash: 'c05398176ff18ca4d011b3550fa174e3' + Meta: + title: 'Debian 8 x64 (pre-installed murano-agent)' + type: 'linux' + DiskFormat: qcow2 + ContainerFormat: bare