aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-27 01:31:58 +0000
committerGerrit Code Review <review@openstack.org>2016-08-27 01:31:58 +0000
commit9d484f93507625f6939c1642f6b34efdcf71ce70 (patch)
tree7f9dbc51c23441cdd0fe7dd65aa7ff2f6ac96da7
parent67e4cdd0b22cf2c0ee9fbb4ea15beaa982766e7e (diff)
parent9c0f97d23165bc64f56000df9f3c3a0cb20a50a3 (diff)
Merge "UI profile for tripleo"
-rw-r--r--manifests/profile/base/heat.pp1
-rw-r--r--manifests/profile/base/ironic.pp2
-rw-r--r--manifests/profile/base/keystone.pp1
-rw-r--r--manifests/profile/base/mistral.pp1
-rw-r--r--manifests/profile/base/ui.pp24
5 files changed, 29 insertions, 0 deletions
diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp
index dcf0f21..cafe95e 100644
--- a/manifests/profile/base/heat.pp
+++ b/manifests/profile/base/heat.pp
@@ -56,6 +56,7 @@ class tripleo::profile::base::heat (
notification_driver => $notification_driver,
}
include ::heat::config
+ include ::heat::cors
}
if $step >= 5 {
diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp
index f098d37..da89839 100644
--- a/manifests/profile/base/ironic.pp
+++ b/manifests/profile/base/ironic.pp
@@ -45,5 +45,7 @@ class tripleo::profile::base::ironic (
class { '::ironic':
sync_db => $sync_db,
}
+
+ include ::ironic::cors
}
}
diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp
index d8c8e24..ac97b66 100644
--- a/manifests/profile/base/keystone.pp
+++ b/manifests/profile/base/keystone.pp
@@ -58,6 +58,7 @@ class tripleo::profile::base::keystone (
include ::keystone::config
include ::keystone::wsgi::apache
+ include ::keystone::cors
if $manage_roles {
include ::keystone::roles::admin
diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp
index 0c41193..cffb03e 100644
--- a/manifests/profile/base/mistral.pp
+++ b/manifests/profile/base/mistral.pp
@@ -46,5 +46,6 @@ class tripleo::profile::base::mistral (
include ::mistral::config
include ::mistral::client
include ::mistral::db::sync
+ include ::mistral::cors
}
}
diff --git a/manifests/profile/base/ui.pp b/manifests/profile/base/ui.pp
new file mode 100644
index 0000000..22371d1
--- /dev/null
+++ b/manifests/profile/base/ui.pp
@@ -0,0 +1,24 @@
+# Copyright 2016 Red Hat, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# == Class: tripleo::profile::base::ui
+#
+# UI profile for tripleo
+#
+class tripleo::profile::base::ui () {
+ package {'openstack-tripleo-ui': }
+
+ include ::apache
+}
+