Merge pull request #1333 from stenwt/sturpin-2016-02-04-rename-openshift-origin

renamed /etc/openshift to /etc/origin

3 files changed, 10 insertions, 10 deletions

diff --git a/playbooks/adhoc/create_pv/create_pv.yaml b/playbooks/adhoc/create_pv/create_pv.yaml
index 347d9f574..81c1ee653 100644
--- a/playbooks/adhoc/create_pv/create_pv.yaml
+++ b/playbooks/adhoc/create_pv/create_pv.yaml
@@ -150,7 +150,7 @@
 
   # We have to use the shell module because we can't set env vars with the command module.
   - name: "Place PV into oc"
-    shell: "KUBECONFIG=/etc/openshift/master/admin.kubeconfig oc create -f {{ pv_template | quote }}"
+    shell: "KUBECONFIG=/etc/origin/master/admin.kubeconfig oc create -f {{ pv_template | quote }}"
     register: oc_output
 
   - debug: var=oc_output
diff --git a/roles/openshift_cluster_metrics/tasks/main.yml b/roles/openshift_cluster_metrics/tasks/main.yml
index 9b7735e54..d45f62eca 100644
--- a/roles/openshift_cluster_metrics/tasks/main.yml
+++ b/roles/openshift_cluster_metrics/tasks/main.yml
@@ -3,12 +3,12 @@
 - name: Install cluster metrics templates
   copy:
     src: cluster-metrics
-    dest: /etc/openshift/
+    dest: /etc/origin/
 
 - name: Create InfluxDB Services
   command: >
     {{ openshift.common.client_binary }} create -f
-    /etc/openshift/cluster-metrics/influxdb.yaml
+    /etc/origin/cluster-metrics/influxdb.yaml
   register: oex_influxdb_services
   failed_when: "'already exists' not in oex_influxdb_services.stderr and oex_influxdb_services.rc != 0"
   changed_when: false
@@ -16,7 +16,7 @@
 - name: Create Heapster Service Account
   command: >
     {{ openshift.common.client_binary }} create -f
-    /etc/openshift/cluster-metrics/heapster-serviceaccount.yaml
+    /etc/origin/cluster-metrics/heapster-serviceaccount.yaml
   register: oex_heapster_serviceaccount
   failed_when: "'already exists' not in oex_heapster_serviceaccount.stderr and oex_heapster_serviceaccount.rc != 0"
   changed_when: false
@@ -35,7 +35,7 @@
 - name: Create Heapster Services
   command: >
     {{ openshift.common.client_binary }} create -f
-    /etc/openshift/cluster-metrics/heapster.yaml
+    /etc/origin/cluster-metrics/heapster.yaml
   register: oex_heapster_services
   failed_when: "'already exists' not in oex_heapster_services.stderr and oex_heapster_services.rc != 0"
   changed_when: false
@@ -43,7 +43,7 @@
 - name: Create Grafana Services
   command: >
     {{ openshift.common.client_binary }} create -f
-    /etc/openshift/cluster-metrics/grafana.yaml
+    /etc/origin/cluster-metrics/grafana.yaml
   register: oex_grafana_services
   failed_when: "'already exists' not in oex_grafana_services.stderr and oex_grafana_services.rc != 0"
   changed_when: false
diff --git a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2 b/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
index ac950b4e5..453a9a3b4 100644
--- a/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
+++ b/roles/oso_host_monitoring/templates/oso-rhel7-host-monitoring.service.j2
@@ -58,10 +58,10 @@ ExecStart=/usr/bin/docker run --name {{ osohm_host_monitoring }}
            -v /var/run/docker.sock:/var/run/docker.sock                                      \
            -v /var/run/openvswitch:/var/run/openvswitch                                      \
 {% if hostvars[inventory_hostname]['ec2_tag_host-type'] == 'master' %}
-           -v /etc/openshift/master/admin.kubeconfig:/etc/openshift/master/admin.kubeconfig  \
-           -v /etc/openshift/master/master.etcd-client.crt:/etc/openshift/master/master.etcd-client.crt \
-           -v /etc/openshift/master/master.etcd-client.key:/etc/openshift/master/master.etcd-client.key \
-           -v /etc/openshift/master/master-config.yaml:/etc/openshift/master/master-config.yaml \
+           -v /etc/origin/master/admin.kubeconfig:/etc/origin/master/admin.kubeconfig  \
+           -v /etc/origin/master/master.etcd-client.crt:/etc/origin/master/master.etcd-client.crt \
+           -v /etc/origin/master/master.etcd-client.key:/etc/origin/master/master.etcd-client.key \
+           -v /etc/origin/master/master-config.yaml:/etc/origin/master/master-config.yaml \
 {% endif %}
            {{ osohm_docker_registry_url }}{{ osohm_host_monitoring }}